修改团购和秒杀倒计时为0的问题

components/CountDown.vue

@@ -1,104 +1,100 @@
 <template>
-  <view class="time">
+	<view class="time">
-    {{ tipText }}
+		{{ tipText }}
-    <text class="styleAll" v-if="isDay === true">{{ day }}</text>
+		<text class="styleAll" v-if="isDay === true">{{ day }}</text>
-    <text class="timeTxt">{{ dayText }}</text>
+		<text class="timeTxt">{{ dayText }}</text>
-    <text class="styleAll">{{ hour }}</text>
+		<text class="styleAll">{{ hour }}</text>
-    <text class="timeTxt">{{ hourText }}</text>
+		<text class="timeTxt">{{ hourText }}</text>
-    <text class="styleAll">{{ minute }}</text>
+		<text class="styleAll">{{ minute }}</text>
-    <text class="timeTxt">{{ minuteText }}</text>
+		<text class="timeTxt">{{ minuteText }}</text>
-    <text class="styleAll">{{ second }}</text>
+		<text class="styleAll">{{ second }}</text>
-    <text class="timeTxt">{{ secondText }}</text>
+		<text class="timeTxt">{{ secondText }}</text>
-  </view>
+	</view>
 </template>
 <script>
-  export default {
+export default {
-    name: "CountDown",
+	name: 'CountDown',
-    props: {
+	props: {
-      //距离开始提示文字
+		//距离开始提示文字
-      tipText: {
+		tipText: {
-        type: String,
+			type: String,
-        default: "倒计时"
+			default: '倒计时'
-      },
+		},
-      dayText: {
+		dayText: {
-        type: String,
+			type: String,
-        default: "天"
+			default: '天'
-      },
+		},
-      hourText: {
+		hourText: {
-        type: String,
+			type: String,
-        default: "时"
+			default: '时'
-      },
+		},
-      minuteText: {
+		minuteText: {
-        type: String,
+			type: String,
-        default: "分"
+			default: '分'
-      },
+		},
-      secondText: {
+		secondText: {
-        type: String,
+			type: String,
-        default: "秒"
+			default: '秒'
-      },
+		},
-      datatime: {
+		datatime: {
-        type: Number,
+			type: Number,
-        default: 0
+			default: 0
-      },
+		},
-      isDay: {
+		isDay: {
-        type: Boolean,
+			type: Boolean,
-        default: true
+			default: true
-      }
+		}
-    },
+	},
-    data: function () {
+	data: function() {
-      return {
+		return {
-        day: "00",
+			day: '00',
-        hour: "00",
+			hour: '00',
-        minute: "00",
+			minute: '00',
-        second: "00"
+			second: '00'
-      };
+		};
-    },
+	},
-    created: function () {
+	created: function() {
-      this.show_time();
+		this.show_time();
-    },
+	},
-    mounted: function () {},
+	mounted: function() {},
-    methods: {
+	methods: {
-      show_time: function () {
+		show_time: function() {
-        let that = this;
+			let that = this;
 
-        function runTime() {
+			function runTime() {
-          //时间函数
+				//时间函数
-          let intDiff = that.datatime - Date.parse(new Date()) / 1000; //获取数据中的时间戳的时间差；
+				let intDiff = that.datatime - new Date() / 1000; //获取数据中的时间戳的时间差；
-          let day = 0,
+				let day = 0,
-            hour = 0,
+					hour = 0,
-            minute = 0,
+					minute = 0,
-            second = 0;
+					second = 0;
-          if (intDiff > 0) {
+				if (intDiff > 0) {
-            //转换时间
+					//转换时间
-            if (that.isDay === true) {
+					if (that.isDay === true) {
-              day = Math.floor(intDiff / (60 * 60 * 24));
+						day = Math.floor(intDiff / (60 * 60 * 24));
-            } else {
+					} else {
-              day = 0;
+						day = 0;
-            }
+					}
-            hour = Math.floor(intDiff / (60 * 60)) - day * 24;
+					hour = Math.floor(intDiff / (60 * 60)) - day * 24;
-            minute = Math.floor(intDiff / 60) - day * 24 * 60 - hour * 60;
+					minute = Math.floor(intDiff / 60) - day * 24 * 60 - hour * 60;
-            second =
+					second = Math.floor(intDiff) - day * 24 * 60 * 60 - hour * 60 * 60 - minute * 60;
-              Math.floor(intDiff) -
+					if (hour <= 9) hour = '0' + hour;
-              day * 24 * 60 * 60 -
+					if (minute <= 9) minute = '0' + minute;
-              hour * 60 * 60 -
+					if (second <= 9) second = '0' + second;
-              minute * 60;
+					that.day = day;
-            if (hour <= 9) hour = "0" + hour;
+					that.hour = hour;
-            if (minute <= 9) minute = "0" + minute;
+					that.minute = minute;
-            if (second <= 9) second = "0" + second;
+					that.second = second;
-            that.day = day;
+				} else {
-            that.hour = hour;
+					that.day = '00';
-            that.minute = minute;
+					that.hour = '00';
-            that.second = second;
+					that.minute = '00';
-          } else {
+					that.second = '00';
-            that.day = "00";
+				}
-            that.hour = "00";
+			}
-            that.minute = "00";
+			runTime();
-            that.second = "00";
+			setInterval(runTime, 1000);
-          }
+		}
-        }
+	}
-        runTime();
+};
-        setInterval(runTime, 1000);
+</script>
-      }
-    }
-  };
-</script>

pages/activity/GoodsSeckill/index.vue

@@ -45,12 +45,12 @@
                 <view class="piece font-color-red" v-text="'仅剩' + itemSeckill.stock + '件'"></view>
               </view>
             </view>
-            <view class="grab bg-color-red" v-if="item.status === 1 && itemSeckill.stock > 0"
+            <view class="grab bg-color-red" v-if="item.status === 1 && itemSeckill.stock > 0" @click="goDetail(itemSeckill.id,item.status)">马上抢</view>
-              @click="goDetail(itemSeckill.id,item.status)">马上抢</view>
             <view class="grab" v-if="item.status === 1 && itemSeckill.stock <= 0">已售磬</view>
-            <view class="grab bg-color-red" @click="goDetail(itemSeckill.id,item.status)" v-if="item.status === 2">即将开始
+            <view class="grab bg-color-red" v-if="item.status === 2">即将开始</view>
-            </view>
+            <view class="grab bg-color-red" v-if="item.status === 0">已结束</view> 
-            <view class="grab bg-color-red" @click="goDetail(itemSeckill.id,item.status)" v-if="item.status === 0">已结束</view>
+			<!-- <view class="grab bg-color-red" @click="goDetail(itemSeckill.id,item.status)" v-if="item.status === 2">即将开始</view> -->
+            <!-- <view class="grab bg-color-red" @click="goDetail(itemSeckill.id,item.status)" v-if="item.status === 0">已结束</view> -->
           </view>
         </view>
         <view class="noCommodity" style="background-color: #f5f5f5;" v-if="seckillList.length === 0 && page > 1">

pages/activity/SeckillDetails/index.vue

@@ -20,7 +20,7 @@
             :hourText="' : '"
             :minuteText="' : '"
             :secondText="' '"
-            :datatime="datatime / 1000"
+            :datatime="datatime"
           ></count-down>
         </view>
         <view class="iconfont icon-jiantou"></view>