Merge branch 'master' of https://git.dayouqiantu.cn/develop/yshop-uniapp

components/CountDown.vue

@@ -13,92 +13,108 @@
 </template>
 <script>
 export default {
-    name: "CountDown",
+  name: 'CountDown',
   props: {
     //距离开始提示文字
     tipText: {
       type: String,
-        default: "倒计时"
+      default: '倒计时',
     },
     dayText: {
       type: String,
-        default: "天"
+      default: '天',
     },
     hourText: {
       type: String,
-        default: "时"
+      default: '时',
     },
     minuteText: {
       type: String,
-        default: "分"
+      default: '分',
     },
     secondText: {
       type: String,
-        default: "秒"
-      },
-      datatime: {
-        type: Number,
-        default: 0
+      default: '秒',
     },
+    datatime: {},
     isDay: {
       type: Boolean,
-        default: true
-      }
+      default: true,
+    },
   },
   data: function () {
     return {
-        day: "00",
-        hour: "00",
-        minute: "00",
-        second: "00"
-      };
+      time: null,
+      day: '00',
+      hour: '00',
+      minute: '00',
+      second: '00',
+    }
   },
   created: function () {
-      this.show_time();
+    this.show_time()
+  },
+  watch: {
+    datatime(val) {
+      clearInterval(this.timeInterval)
+      this.time = val
+      this.show_time()
+    },
   },
   mounted: function () {},
   methods: {
     show_time: function () {
-        let that = this;
+      let that = this
+
+      if (parseInt(this.time).length == 13) {
+        // 毫秒级
+        console.log('毫秒')
+        this.time = this.time / 1000
+      } else if (parseInt(this.time).length == 10) {
+        console.log('秒')
+        // 秒级
+      } else {
+        // 时间
+        console.log('时间')
+        console.log(this.time)
+        this.time = Date.parse(this.time) / 1000
+      }
+      console.log(that.time)
 
       function runTime() {
         //时间函数
-          let intDiff = that.datatime - Date.parse(new Date()) / 1000; //获取数据中的时间戳的时间差；
+        let intDiff = that.time - Date.parse(new Date()) / 1000 //获取数据中的时间戳的时间差；
         let day = 0,
           hour = 0,
           minute = 0,
-            second = 0;
+          second = 0
         if (intDiff > 0) {
           //转换时间
           if (that.isDay === true) {
-              day = Math.floor(intDiff / (60 * 60 * 24));
+            day = Math.floor(intDiff / (60 * 60 * 24))
           } else {
-              day = 0;
+            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;
+          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";
+          that.day = '00'
+          that.hour = '00'
+          that.minute = '00'
+          that.second = '00'
         }
       }
-        runTime();
-        setInterval(runTime, 1000);
-      }
+      runTime()
+      this.timeInterval = setInterval(runTime, 1000)
+    },
+  },
 }
-  };
 </script>

pages/Loading/index.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="lottie-bg">
     <view id="lottie">
-      <image src="@/static/live-logo.gif" rel="preload" mode="widthFix" style="width: 100%;" />
+      <image src="@/static/live-logo.gif" rel="preload" mode="widthFix" style="width: 100%" />
     </view>
   </view>
 </template>
@@ -61,11 +61,11 @@ export default {
       console.log('loading home')
       this.changeAuthorization(false)
       let redirect = cookie.get('redirect').replace(/\ /g, '')
+      cookie.remove('redirect')
       if (redirect && redirect.indexOf('/pages') != -1) {
         this.$yrouter.replace({
           path: '/pages' + redirect.split('/pages')[1],
         })
-        cookie.remove('redirect')
       } else {
         this.$yrouter.switchTab({
           path: '/pages/home/index',

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">
             已砍至

pages/activity/DargainDetails/index.vue

@@ -213,8 +213,6 @@ export default {
         // url未携带用户uid，填上登录用户uid，跳转
         that.bargainUid = that.userInfo.uid
       }
-      console.log(this)
-
       // 获取商品详情
       that.getBargainDetail()
       // 砍价数据统计
@@ -310,9 +308,9 @@ export default {
         .then(res => {
           uni.hideLoading()
           that.goodsDetail = res.data.bargain
+          console.log(that.goodsDetail)
           that.goodsDetail.description = that.goodsDetail.description.replace(/\<img/gi, '<img style="max-width:100%;height:auto;"')
           that.goodsDetail.rule = that.goodsDetail.rule.replace(/\<img/gi, '<img style="max-width:100%;height:auto;"')
-          that.goodsDetail.stopTime = that.goodsDetail.stopTime / 1000
           that.getBargainHelpCount()
         })
         .catch(res => {

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)">
               去拼单

pages/activity/GroupRule/index.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="group-con">
-    <view class="tui-goods-item">
+    <view class="tui-goods-item" v-if="storeCombination">
       <image :src="storeCombination.image" class="tui-goods-img"></image>
       <view class="tui-goods-center">
         <view class="tui-goods-name">{{ storeCombination.title }}</view>
@@ -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">

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