From 40e4d10bd7f27c7e89752a9c547e0b6d3baf0198 Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Thu, 20 Aug 2020 16:54:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E8=BF=90?= =?UTF-8?q?=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pageC/cart/ConfirmOrder.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pageC/cart/ConfirmOrder.vue b/pageC/cart/ConfirmOrder.vue index 3f248f2..b8f5bd0 100644 --- a/pageC/cart/ConfirmOrder.vue +++ b/pageC/cart/ConfirmOrder.vue @@ -142,7 +142,7 @@ export default { return num; }, setFreight(freight, index) { - return freight[index]; + return freight[index] || '0.00'; } }, onLoad(option) { From d69486d1ab2c33140ca790d4734d6fd3aefba356 Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Thu, 20 Aug 2020 17:39:30 +0800 Subject: [PATCH 2/2] fixing bug --- pageC/components/merchant/list-item.vue | 5 +++- pageC/merchant/index.vue | 2 +- pageE/mine/EditUserInfo.vue | 4 +-- pageE/mine/MineInfo.vue | 2 +- pages/mine/index.vue | 38 +++---------------------- 5 files changed, 12 insertions(+), 39 deletions(-) diff --git a/pageC/components/merchant/list-item.vue b/pageC/components/merchant/list-item.vue index fda4ffc..c2fa52c 100644 --- a/pageC/components/merchant/list-item.vue +++ b/pageC/components/merchant/list-item.vue @@ -57,6 +57,9 @@ export default { } }, - props:['url','type'] + props:['url','type'], + created() { + console.log(this.url, this.type); + } } \ No newline at end of file diff --git a/pageC/merchant/index.vue b/pageC/merchant/index.vue index 52c6ade..0b0e467 100644 --- a/pageC/merchant/index.vue +++ b/pageC/merchant/index.vue @@ -46,7 +46,7 @@ - + diff --git a/pageE/mine/EditUserInfo.vue b/pageE/mine/EditUserInfo.vue index 5232045..1a7c8c8 100644 --- a/pageE/mine/EditUserInfo.vue +++ b/pageE/mine/EditUserInfo.vue @@ -136,7 +136,7 @@ export default { sizeType: ['original', 'compressed'], sourceType: ['album'], success: (res) => { - this.avatar = res.tempFilePaths[0]; + // this.avatar = res.tempFilePaths[0]; common.uploadFile({ url: url, name: 'avatar', @@ -144,7 +144,7 @@ export default { }).then(result => { // console.log(result); // this.$set(this, 'avatar', result.file_path); - // this.avatar = result.file_path; + this.avatar = result.file_path + "?" + new Date().getTime(); this.uploadPath = result.file_name; }, error => { this.$u.toast(error); diff --git a/pageE/mine/MineInfo.vue b/pageE/mine/MineInfo.vue index 74f885f..120ae70 100644 --- a/pageE/mine/MineInfo.vue +++ b/pageE/mine/MineInfo.vue @@ -1,7 +1,7 @@