From 21447c6a6706bfa4205cbd8f65efbbb6f5a023b2 Mon Sep 17 00:00:00 2001
From: czm <2192718639@qq.com>
Date: Tue, 14 Jun 2022 20:31:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=AA=E6=9D=BF=E6=B5=81=E7=A8=8B-=E5=80=92?=
 =?UTF-8?q?=E8=AE=A1=E6=97=B6=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/orderState/index.module.scss   |  1 -
 .../order/components/orderState/index.tsx     | 23 ++++++++++---------
 src/pages/order/index.tsx                     |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/pages/order/components/orderState/index.module.scss b/src/pages/order/components/orderState/index.module.scss
index dbe0c48..0cc33d6 100644
--- a/src/pages/order/components/orderState/index.module.scss
+++ b/src/pages/order/components/orderState/index.module.scss
@@ -15,7 +15,6 @@
     }
     .order_status_item{
         position: relative;
-        // padding-left: 50px;
         &:nth-last-child(n+2) {
             padding-bottom: 30px;
         }
diff --git a/src/pages/order/components/orderState/index.tsx b/src/pages/order/components/orderState/index.tsx
index db0643f..60e724b 100644
--- a/src/pages/order/components/orderState/index.tsx
+++ b/src/pages/order/components/orderState/index.tsx
@@ -10,7 +10,8 @@ type List = {
     status: string,
     time: string,
     tag: string,
-    desc: string
+    desc: string,
+    expire_time: string
 }
 
 type Param = {
@@ -19,13 +20,12 @@ type Param = {
         logistics_details:List[], //订单状态列表
         payment_method: 0|PAYMENT_METHOD_PARAM, //支付方式
         status: number, //订单状态
-        expire_time: number 
     }
 }
 
 
 
-export default memo(({orderInfo = {logistics_details: [],payment_method: 0, status: 0, expire_time:0}, onRefresh}:Param) => {
+export default memo(({orderInfo = {logistics_details: [],payment_method: 0, status: 0}, onRefresh}:Param) => {
     
     const [showMore, setShowMore] = useState(false)
     const changeMore = () => {
@@ -46,23 +46,24 @@ export default memo(({orderInfo = {logistics_details: [],payment_method: 0, stat
 
 
     //倒计时
+    const [showTime, setShowTime] = useState('')
     const timeObj:any = useRef()
     useEffect(() => {
-        if(orderInfo.expire_time) {
+        if(orderInfo.status == SaleorderstatusWaitingPrePayment.value && orderInfo.logistics_details.length > 0) {
+            let  expire_time = orderInfo.logistics_details[0].expire_time
             timeObj.current = setInterval(() => {
-                count_down()
+                count_down(expire_time)
             }, 1000)
         }
         return () => {
             clearInterval(timeObj.current)
         }
-    }, [orderInfo.expire_time])
+    }, [orderInfo])
 
     
-    const count_down = () => {
+    const count_down = (time) => {
         var startData = dayjs();
-        var endDate = dayjs(orderInfo.expire_time);
-        console.log('endDate::', endDate.format('YYYY-MM-DD HH:mm'))
+        var endDate = dayjs(time);
         var _dd = endDate.diff(startData,'day');
         var _hh = endDate.diff(startData,'hour');
         var _mm = endDate.diff(startData,'minute');
@@ -71,7 +72,7 @@ export default memo(({orderInfo = {logistics_details: [],payment_method: 0, stat
         var hh = _hh - (_dd*24);
         var mm = _mm - (_hh*60);
         var ss = _ss - (_mm*60);
-        console.log(`${_dd} ${hh} ${mm} ${ss}`)
+        setShowTime(() => ` ${hh}:${mm}:${ss}`)
     }
 
     return (
@@ -88,7 +89,7 @@ export default memo(({orderInfo = {logistics_details: [],payment_method: 0, stat
                         </View>
                         <Text className={classnames(styles.order_status_des, (index == 0)&&styles.order_status_des_select)}>{item.desc}</Text>
                         {(orderInfo.status == SaleorderstatusWaitingPrePayment.value)&&<View className={styles.pay_time}>
-                            剩<Text>23:58:55</Text>支付关闭，订单自动取消
+                            剩<Text>{showTime}</Text>支付关闭，订单自动取消
                         </View>}
                     </View>)}
                 </View>
diff --git a/src/pages/order/index.tsx b/src/pages/order/index.tsx
index 0586039..3a1f520 100644
--- a/src/pages/order/index.tsx
+++ b/src/pages/order/index.tsx
@@ -190,7 +190,7 @@ import styles  from './index.module.scss'
 
     return (
         <View className={styles.order_main}>
-            <OrderState orderInfo={{logistics_details:orderDetail?.logistics_details, payment_method: orderDetail?.payment_method, status:orderDetail?.status, expire_time:orderDetail?.expire_time}}/>
+            <OrderState orderInfo={{logistics_details:orderDetail?.logistics_details, payment_method: orderDetail?.payment_method, status:orderDetail?.status}}/>
             <View >
                 <AddressInfoDetail orderInfo={addressInfoDetailData}  onSelect={getAddress} onChangeShipmentMode={getShipmentMode} ref={addressRef} defaultValue={defaultAddress} />
             </View>