From 4fd6f49cbaa2260975c81eea71ec7745443df186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Thu, 30 Sep 2021 18:27:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/lf-payPassword/lf-payPassword.vue | 10 +++++-----
 pages/aboutpay/confirmcash.vue               | 12 +++++++-----
 pages/order/cashier/cashier.vue              | 12 +++++++-----
 pages/shop/goodsdetail.vue                   | 16 +++++++++++++---
 4 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/components/lf-payPassword/lf-payPassword.vue b/components/lf-payPassword/lf-payPassword.vue
index de3e85e..da39c9b 100644
--- a/components/lf-payPassword/lf-payPassword.vue
+++ b/components/lf-payPassword/lf-payPassword.vue
@@ -9,16 +9,16 @@
 				<view class="lf-font-24 lf-m-r-10" style="color:#FF9D9D">
 					剩余支付时间
 				</view>
-				<countdown-timer :time="time" :autoStart="true" @finish="dateFinish">
+				<!-- <countdown-timer :time="time" :autoStart="true" @finish="dateFinish">
 					<template v-slot="{minute, second}">
-						<!-- <view>{{minute}}:{{second}}</view> -->
 						<view class="lf-flex">
 							<view class="lf-font-24" style="color:#FF9D9D">{{ minute >= 10 ? minute : "0" + minute }}</view>
 							<view class="lf-font-24" style="color:#FF9D9D">:</view>
 							<view class="lf-font-24" style="color:#FF9D9D">{{ second >= 10 ? second : "0" + second }}</view>
 						</view>
 					</template>
-				</countdown-timer>
+				</countdown-timer> -->
+				<countdown-time minute="5" second="0" :showDay="false" :showHour="false"></countdown-time>
 			</view>
 		</view>
 		<button class="btn" hover-class="lf-opacity" @click="comfirm">{{ buttonText }}</button>
@@ -26,12 +26,12 @@
 </template>
 
 <script>
-	import countdownTimer from '@/components/countdown-timer/countdown-timer';
+	import countdownTime from '@/components/uni-countdown/uni-countdown';
 	import lfJpCoded from '@/components/lf-jpCoded/lf-jpCoded.vue'
 	export default {
 		components: {
 			lfJpCoded,
-			countdownTimer
+			countdownTime
 		},
 		props: {
 			title: {
diff --git a/pages/aboutpay/confirmcash.vue b/pages/aboutpay/confirmcash.vue
index 328f49b..3e36dbc 100644
--- a/pages/aboutpay/confirmcash.vue
+++ b/pages/aboutpay/confirmcash.vue
@@ -11,16 +11,18 @@
 					<view class="lf-font-24 lf-m-r-10" style="color:#FF9D9D">
 						剩余支付时间
 					</view>
-					<countdown-timer :time="time" :autoStart="true" @finish="dateFinish">
+					<!-- <countdown-timer :time="time" :autoStart="true" @finish="dateFinish">
 						<template v-slot="{minute, second}">
-							<!-- <view>{{minute}}:{{second}}</view> -->
 							<view class="lf-flex">
 								<view class="lf-font-24" style="color:#FF9D9D">{{ minute >= 10 ? minute : "0" + minute }}</view>
 								<view class="lf-font-24" style="color:#FF9D9D">:</view>
 								<view class="lf-font-24" style="color:#FF9D9D">{{ second >= 10 ? second : "0" + second }}</view>
 							</view>
 						</template>
-					</countdown-timer>
+					</countdown-timer> -->
+					<countdown-time minute="5" second="0" :showDay="false" :showHour="false">
+						
+					</countdown-time>
 				</view>
 				<view>
 					<button class="confirmcash-btn" hover-class="lf-opacity" @click="confirm">确认</button>
@@ -32,11 +34,11 @@
 </template>
 
 <script>
-	import countdownTimer from '@/components/countdown-timer/countdown-timer';
+	import countdownTime from '@/components/uni-countdown/uni-countdown.vue';
 	import lfPayPassword from '@/components/lf-payPassword/lf-payPassword.vue'
 	export default {
 		components: {
-			countdownTimer,
+			countdownTime,
 			lfPayPassword
 		},
 		data() {
diff --git a/pages/order/cashier/cashier.vue b/pages/order/cashier/cashier.vue
index f603529..bf360be 100644
--- a/pages/order/cashier/cashier.vue
+++ b/pages/order/cashier/cashier.vue
@@ -11,16 +11,18 @@
 				<view class="tips">
 					<view>剩余支付时间：</view>
 					<view>
-						<countdown-timer :time="time" :autoStart="true" @finish="dateFinish">
+						<!-- <countdown-timer :time="time" :autoStart="true" @finish="dateFinish">
 							<template v-slot="{minute, second}">
-								<!-- <view>{{minute}}:{{second}}</view> -->
 								<view class="lf-flex">
 									<view>{{ minute >= 10 ? minute : "0" + minute }}</view>
 									<view>:</view>
 									<view>{{ second >= 10 ? second : "0" + second }}</view>
 								</view>
 							</template>
-						</countdown-timer>
+						</countdown-timer> -->
+						<countdown-time minute="5" second="0" :showDay="false" :showHour="false">
+							
+						</countdown-time>
 					</view>
 				</view>
 			</view>
@@ -41,11 +43,11 @@
 </template>
 
 <script>
-	import countdownTimer from '@/components/countdown-timer/countdown-timer';
+	import countdownTime from '@/components/uni-countdown/uni-countdown.vue';
 	import lfPayPassword from '@/components/lf-payPassword/lf-payPassword.vue'
 	export default {
 		components: {
-			countdownTimer,
+			countdownTime,
 			lfPayPassword
 		},
 		data(){
diff --git a/pages/shop/goodsdetail.vue b/pages/shop/goodsdetail.vue
index 6cec3d0..76a0269 100644
--- a/pages/shop/goodsdetail.vue
+++ b/pages/shop/goodsdetail.vue
@@ -9,7 +9,7 @@
 						<image mode="aspectFill" :src="item" style="width: 100%; height: 100%;" @click="lookImg(index)"></image>
 						<view class="seckill-box" v-if="type == 'seckill'">
 							<view>距离结束还剩余</view>
-							<view v-if="$isRight(time)">
+							<!-- <view v-if="$isRight(time)">
 								<countdown-timer :time="time" :autoStart="true" @finish="dateFinish">
 									<template v-slot="{day, hour, minute, second}">
 										<view class="lf-flex">
@@ -24,7 +24,17 @@
 										</view>
 									</template>
 								</countdown-timer>
+							</view> -->
+							
+							<view v-if="$isRight(seckill)">
+								<countdown-time 
+									:day="seckill.seckill.end_left_time[0]" 
+									:hour="seckill.seckill.end_left_time[1]" 
+									:minute="seckill.seckill.end_left_time[2]" 
+									:second="seckill.seckill.end_left_time[3]">
+								</countdown-time>
 							</view>
+							
 						</view>
 					</swiper-item>
 				</swiper>
@@ -242,10 +252,10 @@
 </template>
 
 <script>
-	import countdownTimer from '@/components/countdown-timer/countdown-timer';
+	import countdownTime from '@/components/uni-countdown/uni-countdown.vue';
 	export default {
 		components: {
-			countdownTimer
+			countdownTime
 		},
 		data(){
 			return {