From 3b76e7754bb984dfd6829003b98c831692e4e9d3 Mon Sep 17 00:00:00 2001 From: anhaogxs <704041637@qq.com> Date: Wed, 12 May 2021 17:21:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=80=92=E8=AE=A1=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=EF=BC=8C=E4=BB=A5=E5=8F=8A=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E6=94=AF=E4=BB=98=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/CountDown.vue | 170 +++++++++++++------------ pages/activity/BargainRecord/index.vue | 2 +- pages/activity/GroupDetails/index.vue | 2 +- pages/activity/GroupRule/index.vue | 5 +- pages/order/OrderSubmission/index.vue | 9 +- 5 files changed, 98 insertions(+), 90 deletions(-) diff --git a/components/CountDown.vue b/components/CountDown.vue index 33093e0..ca830df 100644 --- a/components/CountDown.vue +++ b/components/CountDown.vue @@ -12,93 +12,101 @@ diff --git a/pages/activity/BargainRecord/index.vue b/pages/activity/BargainRecord/index.vue index c0b6bc8..4991a0b 100644 --- a/pages/activity/BargainRecord/index.vue +++ b/pages/activity/BargainRecord/index.vue @@ -14,7 +14,7 @@ :hourText="' 时 '" :minuteText="' 分 '" :secondText="' 秒'" - :datatime="item.datatime/1000" + :datatime="item.datatime" > 已砍至 diff --git a/pages/activity/GroupDetails/index.vue b/pages/activity/GroupDetails/index.vue index 35d473e..5cfd5c1 100644 --- a/pages/activity/GroupDetails/index.vue +++ b/pages/activity/GroupDetails/index.vue @@ -72,7 +72,7 @@ 人成团 - + 去拼单 diff --git a/pages/activity/GroupRule/index.vue b/pages/activity/GroupRule/index.vue index 6798fea..86e5701 100644 --- a/pages/activity/GroupRule/index.vue +++ b/pages/activity/GroupRule/index.vue @@ -19,8 +19,9 @@ - 拼团失败 + 进行中 拼团成功 + 拼团失败 @@ -30,7 +31,7 @@ 剩余 - + 结束 diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue index 9da39db..ba2aacf 100644 --- a/pages/order/OrderSubmission/index.vue +++ b/pages/order/OrderSubmission/index.vue @@ -306,15 +306,13 @@ export default { useIntegral() { this.computedPrice() }, - $yroute(n) { - if (n.name === NAME) this.getCartInfo() - }, shipping_type() { this.computedPrice() }, }, - onShow: function() { + onLoad: function() { let that = this + console.log('loadddddddd') this.$store.dispatch('getUser', true) that.getCartInfo() console.log(that.$yroute) @@ -402,7 +400,8 @@ export default { this.storeSelfMention = res.data.storeSelfMention this.computedPrice() }) - .catch(() => { + .catch((error) => { + console.log(error) uni.showToast({ title: '加载订单数据失败', icon: 'none',