diff --git a/config/config.js b/config/config.js index 11113ba..9624a59 100644 --- a/config/config.js +++ b/config/config.js @@ -6,7 +6,7 @@ export default { downloadLink: "https://pickmall.cn/download-page/index.html", //下载地址,下载app的地址 shareLink: "https://m-b2b2c.pickmall.cn", //分享地址,也就是在h5中默认的复制地址 appid: "wx6f10f29075dc1b0b", //小程序唯一凭证,即 AppID,可在「微信公众平台 - 设置 - 开发设置」页中获得。(需要已经成为开发者,且帐号没有异常状态) - aMapKey: "d649892b3937a5ad20b76dacb2bcb5bd", //在高德中申请web端key + aMapKey: "d649892b3937a5ad20b76dacb2bcb5bd", //在高德中申请Web服务key scanAuthNavigation:['https://m-b2b2c.pickmall.cn/'], //扫码认证跳转域名配置 会根据此处配置的路由进行跳转 iosAppId:"id1564638363", //AppStore的应用地址id 具体在分享->拷贝链接中查看 logo:"https://lilishop-oss.oss-cn-beijing.aliyuncs.com/4c864e133c2944efad1f7282ac8a3b9e.png", //logo地址 diff --git a/manifest.json b/manifest.json index 05cd6a4..8bc9ebd 100644 --- a/manifest.json +++ b/manifest.json @@ -195,10 +195,6 @@ } }, "plugins" : { - "myPlugin" : { - "version" : "1.1.0", - "provider" : "wx738958e0f4c894f9" - }, "live-player-plugin" : { "version" : "1.3.0", "provider" : "wx2b03c6e691cd7370" diff --git a/pages/mine/point/myPoint.vue b/pages/mine/point/myPoint.vue index f6df627..4753686 100644 --- a/pages/mine/point/myPoint.vue +++ b/pages/mine/point/myPoint.vue @@ -11,11 +11,11 @@ 累计获得: - {{ pointData.point || 0 }} + {{ pointData.totalPoint || 0 }} - 未使用: - {{ pointData.variablePoint || 0 }} + 剩余积分: + {{ pointData.point || 0 }} diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue index 103595a..fccdc14 100644 --- a/pages/order/myOrder.vue +++ b/pages/order/myOrder.vue @@ -323,7 +323,7 @@ export default { } else { this.initData(0); } - this.loadData(this.status); + // this.loadData(this.status); }, onShow() { if (this.tabCurrentIndex) { @@ -331,7 +331,7 @@ export default { } else { this.initData(0); } - this.loadData(this.status); + // this.loadData(this.status); }, onLoad(options) { @@ -342,9 +342,9 @@ export default { let status = Number(options.status); this.status = status; this.tabCurrentIndex = status; - if (status == 0) { - this.loadData(status); - } + // if (status == 0) { + // this.loadData(status); + // } }, watch: { diff --git a/pages/product/product/promotion/-promotion-coupon.vue b/pages/product/product/promotion/-promotion-coupon.vue index 4b1efae..0948a1e 100644 --- a/pages/product/product/promotion/-promotion-coupon.vue +++ b/pages/product/product/promotion/-promotion-coupon.vue @@ -1,184 +1,184 @@ - - - - -