Merge branch '20220729_newtpl' of gitea.intra.yunpaper.com:application/kuaileorder into 20220729_newtpl

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;
         }

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:'支付金额(元)'}