From 1633e63cb1ca1eb848f5c97abd9601a690b999fc Mon Sep 17 00:00:00 2001
From: liuyu <33367671@qq.com>
Date: Wed, 3 Aug 2022 15:59:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 control/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/control/index.php b/control/index.php
index c4d9364..7d31a98 100644
--- a/control/index.php
+++ b/control/index.php
@@ -203,10 +203,10 @@ class index extends publicBase {
 
             $ninfo['is_show_count_down'] = $is_show_count_down = strtotime($info['last_ship_time'])-time()>0 ? true : false;
             if ($is_show_count_down) {
-                $count_down = $gobj->getHourMinuteSecondCountDown($info['last_ship_time'], date("Y-m-d H:i:s"));
-                $count_down_str = $count_down['hour'].':'.$count_down['minute'].':'.$count_down['second'];
+                $count_down = $gobj->getHourMinuteSecondCountDown(date("Y-m-d H:i:s"), $info['last_ship_time']);
+                $count_down_str = $count_down ? $count_down['hour'].':'.$count_down['minute'].':'.$count_down['second'] : '';
             }
-            $ninfo['count_down'] = $is_show_count_down ? $count_down_str : 0;
+            $ninfo['count_down'] = $is_show_count_down ? $count_down_str : '';
 
             $nlist[] = $ninfo;
         }

From b5dc7938060f2365cb8eae8f7a6fcfbc16db1295 Mon Sep 17 00:00:00 2001
From: liuyu <33367671@qq.com>
Date: Wed, 3 Aug 2022 16:01:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 view/templates/index/wait_deliver_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/templates/index/wait_deliver_list.html b/view/templates/index/wait_deliver_list.html
index 792b29d..21a93f3 100644
--- a/view/templates/index/wait_deliver_list.html
+++ b/view/templates/index/wait_deliver_list.html
@@ -86,7 +86,7 @@ layui.use(['element', 'layer', 'util', 'table'], function(){
       }}
       ,{field:'pay_time', title:'销售时间/倒计时'
       ,templet: function(d){
-        if(d.is_show_count_down == true) return '<label id="count_down_wait_'+d.order_sn+'" content="'+d.pay_time+'" class="count_down_wait">'+d.count_down+'</label>';
+        if(d.is_show_count_down == true) return '<label id="count_down_wait_'+d.order_sn+'" content="'+d.pay_time+'" class="count_down_wait">倒计时：'+d.count_down+'</label>';
         return '<span>'+d.pay_time+'</span>';
       }}
       ,{field:'pay_amount', title:'支付金额(元)'}