diff --git a/config/api.js b/config/api.js index 9308538..cf3473b 100644 --- a/config/api.js +++ b/config/api.js @@ -4,12 +4,8 @@ */ // 开发环境 const dev = { - common: "http://192.168.0.100:8890", - buyer: "http://192.168.0.100:8888", - // common: "https://common-api.pickmall.cn", - // buyer: "https://buyer-api.pickmall.cn", - // common: 'http://192.168.0.109:8890', - // buyer: 'http://192.168.0.109:8888', + common: "https://common-api.pickmall.cn", + buyer: "https://buyer-api.pickmall.cn", }; // 生产环境 const prod = { diff --git a/pages/mine/distribution/list.vue b/pages/mine/distribution/list.vue index 101634d..8c668e2 100644 --- a/pages/mine/distribution/list.vue +++ b/pages/mine/distribution/list.vue @@ -156,9 +156,7 @@ export default { this.routers = options; }, watch: { - showFlag(val) { - - }, + showFlag(val) {}, }, onShow() { this.goodsList = []; @@ -172,27 +170,34 @@ export default { }, async handleLink(goods) { + uni.showToast({ + title: "请请按住保存图片", + duration: 2000, + icon: "none", + }); let page = `pages/product/goods`; let scene = `${goods.skuId},${goods.id},${this.routers.id}`; let result = await getMpCode({ page, scene }); - if(result.data.success){ - let callback = result.data.result; - this.res.container.title = `${goods.goodsName}`; - this.res.bottom.code = `data:image/png;base64,${callback}`; - this.res.bottom.price = this.$options.filters.unitPrice(goods.price, "¥"); - this.res.bottom.desc = `${goods.goodsName}`; - this.res.bottom.img = `${goods.thumbnail}`; + if (result.data.success) { + let callback = result.data.result; + this.res.container.title = `${goods.goodsName}`; + this.res.bottom.code = `data:image/png;base64,${callback}`; + this.res.bottom.price = this.$options.filters.unitPrice( + goods.price, + "¥" + ); + this.res.bottom.desc = `${goods.goodsName}`; + this.res.bottom.img = `${goods.thumbnail}`; - if (this.showFlag) { - this.$refs.drawCanvas.init(); - } - this.showFlag = true; - } - else{ + if (this.showFlag) { + this.$refs.drawCanvas.init(); + } + this.showFlag = true; + } else { uni.showToast({ title: `制作二维码失败!请稍后重试`, duration: 2000, - icon:"none" + icon: "none", }); } }, diff --git a/pages/order/afterSales/afterSalesDetail.vue b/pages/order/afterSales/afterSalesDetail.vue index 821d09a..20a9f73 100644 --- a/pages/order/afterSales/afterSalesDetail.vue +++ b/pages/order/afterSales/afterSalesDetail.vue @@ -149,7 +149,7 @@ export default { customStyle: { backgroundColor: this.$lightColor, }, - applyInfo: {}, + applyInfo: {}, form: { orderItemSn: "", // 订单sn skuId: "", diff --git a/pages/order/afterSales/afterSalesSelect.vue b/pages/order/afterSales/afterSalesSelect.vue index d16f5b1..779eca3 100644 --- a/pages/order/afterSales/afterSalesSelect.vue +++ b/pages/order/afterSales/afterSalesSelect.vue @@ -26,7 +26,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -56,14 +56,17 @@