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',