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 @@
   </view>
 </template>
 <script>
-  export default {
-    name: "CountDown",
-    props: {
-      //距离开始提示文字
-      tipText: {
-        type: String,
-        default: "倒计时"
-      },
-      dayText: {
-        type: String,
-        default: "天"
-      },
-      hourText: {
-        type: String,
-        default: "时"
-      },
-      minuteText: {
-        type: String,
-        default: "分"
-      },
-      secondText: {
-        type: String,
-        default: "秒"
-      },
-      datatime: {
-        type: Number,
-        default: 0
-      },
-      isDay: {
-        type: Boolean,
-        default: true
-      }
+export default {
+  name: 'CountDown',
+  props: {
+    //距离开始提示文字
+    tipText: {
+      type: String,
+      default: '倒计时',
+    },
+    dayText: {
+      type: String,
+      default: '天',
+    },
+    hourText: {
+      type: String,
+      default: '时',
     },
-    data: function () {
-      return {
-        day: "00",
-        hour: "00",
-        minute: "00",
-        second: "00"
-      };
+    minuteText: {
+      type: String,
+      default: '分',
     },
-    created: function () {
-      this.show_time();
+    secondText: {
+      type: String,
+      default: '秒',
     },
-    mounted: function () {},
-    methods: {
-      show_time: function () {
-        let that = this;
+    datatime: {},
+    isDay: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data: function () {
+    return {
+      time: null,
+      day: '00',
+      hour: '00',
+      minute: '00',
+      second: '00',
+    }
+  },
+  created: function () {
+    this.show_time()
+  },
+  mounted: function () {},
+  methods: {
+    show_time: function () {
+      let that = this
 
-        function runTime() {
-          //时间函数
-          let intDiff = that.datatime - Date.parse(new Date()) / 1000; //获取数据中的时间戳的时间差；
-          let day = 0,
-            hour = 0,
-            minute = 0,
-            second = 0;
-          if (intDiff > 0) {
-            //转换时间
-            if (that.isDay === true) {
-              day = Math.floor(intDiff / (60 * 60 * 24));
-            } else {
-              day = 0;
-            }
-            hour = Math.floor(intDiff / (60 * 60)) - day * 24;
-            minute = Math.floor(intDiff / 60) - day * 24 * 60 - hour * 60;
-            second =
-              Math.floor(intDiff) -
-              day * 24 * 60 * 60 -
-              hour * 60 * 60 -
-              minute * 60;
-            if (hour <= 9) hour = "0" + hour;
-            if (minute <= 9) minute = "0" + minute;
-            if (second <= 9) second = "0" + second;
-            that.day = day;
-            that.hour = hour;
-            that.minute = minute;
-            that.second = second;
+      if (parseInt(this.datatime).length == 13) {
+        // 毫秒级
+        console.log('毫秒')
+        this.datatime = this.datatime / 1000
+      } else if (parseInt(this.datatime).length == 10) {
+        console.log('秒')
+        // 秒级
+      } else {
+        // 时间
+        console.log('时间')
+        this.datatime = Date.parse(this.datatime) / 1000
+      }
+
+      function runTime() {
+        console.log(that.datatime)
+        //时间函数
+        let intDiff = that.datatime - Date.parse(new Date()) / 1000 //获取数据中的时间戳的时间差；
+        let day = 0,
+          hour = 0,
+          minute = 0,
+          second = 0
+        if (intDiff > 0) {
+          //转换时间
+          if (that.isDay === true) {
+            day = Math.floor(intDiff / (60 * 60 * 24))
           } else {
-            that.day = "00";
-            that.hour = "00";
-            that.minute = "00";
-            that.second = "00";
+            day = 0
           }
+          hour = Math.floor(intDiff / (60 * 60)) - day * 24
+          minute = Math.floor(intDiff / 60) - day * 24 * 60 - hour * 60
+          second = Math.floor(intDiff) - day * 24 * 60 * 60 - hour * 60 * 60 - minute * 60
+          if (hour <= 9) hour = '0' + hour
+          if (minute <= 9) minute = '0' + minute
+          if (second <= 9) second = '0' + second
+          that.day = day
+          that.hour = hour
+          that.minute = minute
+          that.second = second
+        } else {
+          that.day = '00'
+          that.hour = '00'
+          that.minute = '00'
+          that.second = '00'
         }
-        runTime();
-        setInterval(runTime, 1000);
       }
-    }
-  };
+      runTime()
+      setInterval(runTime, 1000)
+    },
+  },
+}
 </script>
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"
           ></count-down>
           <view class="money font-color-red">
             已砍至
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 @@
                 <text class="font-color-red" v-text="item.count"></text>
                 <text>人成团</text>
               </view>
-              <count-down :isDay="true" :tipText="'剩余 '" :dayText="' 天 '" :hourText="' : '" :minuteText="' : '" :secondText="' '" :datatime="item.stopTime / 1000"></count-down>
+              <count-down :isDay="true" :tipText="'剩余 '" :dayText="' 天 '" :hourText="' : '" :minuteText="' : '" :secondText="' '" :datatime="item.stopTime"></count-down>
             </view>
             <view class="spellBnt" @click="groupRule(item.id)">
               去拼单
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 @@
     <view class="tui-group__box tui-mtop__20">
       <tui-divider backgroundColor="#fff" width="70%" gradual >
         <view class="tui-divider__content">
-          <text v-if="pinkBool == 0">拼团失败</text>
+          <text v-if="pinkBool == 0">进行中</text>
           <text v-if="pinkBool == 1">拼团成功</text>
+          <text v-if="pinkBool == -1">拼团失败</text>
         </view>
       </tui-divider>
       <view class="tui-group__title" v-if="pinkBool == 0">
@@ -30,7 +31,7 @@
       </view>
       <view class="tui-group-countdown" v-if="pinkBool == 0">
         <view class="tui-countdown-right">剩余</view>
-        <count-down :isDay="true" :tipText="'倒计时 '" :dayText="' 天 '" :hourText="' 时 '" :minuteText="' 分 '" :secondText="' 秒'" :datatime="pinkT.stopTime / 1000"></count-down>
+        <count-down :isDay="true" :tipText="'倒计时 '" :dayText="' 天 '" :hourText="' 时 '" :minuteText="' 分 '" :secondText="' 秒'" :datatime="pinkT.stopTime"></count-down>
         <view class="tui-countdown-left">结束</view>
       </view>
       <view class="tui-user__box">
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',