diff --git a/components/order-item/index.vue b/components/order-item/index.vue index a7988f2..d6fb887 100644 --- a/components/order-item/index.vue +++ b/components/order-item/index.vue @@ -14,7 +14,7 @@ 已退款订单 商家同意 商家拒绝 - 待支付 + 待支付订单 {{info.extend_order_goods[0].goods_name}} diff --git a/pages/index/details.vue b/pages/index/details.vue index 6a85706..117aa0d 100644 --- a/pages/index/details.vue +++ b/pages/index/details.vue @@ -23,7 +23,7 @@ 共{{ list.goods_num }}件商品 - 实付 + {{ type == 10 ? "待支付" : "实付" }} ¥{{ list.goods_pay_price }} diff --git a/pages/user/index.vue b/pages/user/index.vue index c80bfd3..9901c74 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -61,7 +61,6 @@ export default { }, onLoad() { this.getCache(); - console.log(222); }, onShow() { this.getmyinfo() diff --git a/pages/user/info.vue b/pages/user/info.vue index a4447eb..d1d5158 100644 --- a/pages/user/info.vue +++ b/pages/user/info.vue @@ -87,7 +87,13 @@ export default { }, // 获取图片,上传图片 chooseImage(sourceType) { - let that = this + let that = this; + let photo_type = ""; + if (this.role == 2) { + photo_type = "store_avatar" + } else { + photo_type = "avatar" + } const token = uni.getStorageSync('token'); uni.chooseImage({ count: 1, @@ -98,9 +104,10 @@ export default { uni.uploadFile({ url: 'https://mall.dmygkeji.com/storeapi/Upload/uploadFile', filePath: tempFilePaths[0], - name: 'avatar', + name: photo_type, formData:{ - name:"avatar" + name: photo_type, + store_id: that.info.store_id }, header:{ Authorization:'Bearer' + " " + token @@ -111,7 +118,10 @@ export default { that.filename = obj.data.file_name that.num++ console.log(that.fileurl,that.filename) - } + }, + fail: (res) => { + console.log(res); + } }); } });