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

config/define.php

@@ -11,6 +11,7 @@
 
     date_default_timezone_set("Asia/Shanghai");
 
+    define('APPNAME', '快乐帮手');
     define('BEIAN', '鲁ICP备14002313号-1');
 
     define('LOG_PATH_BASE', DATACENTER_ROOT.'/logs/');

control/index.php

@@ -193,11 +193,14 @@ class index extends publicBase {
             $ninfo['order_status_desc'] = $GLOBALS['order_status'][$info['order_status']];
             $ninfo['refund_status_desc'] = $GLOBALS['refund_status'][$info['refund_status']];
             $ninfo['after_sales_status_desc'] = $GLOBALS['after_sales_status'][$info['after_sales_status']];
+
             $ninfo['goods_name'] = $goodsid2skuid2info[$info['goods_id']][$info['sku_id']]['goods_name'].' '.$goodsid2skuid2info[$info['goods_id']][$info['sku_id']]['sku_name'];
             $ninfo['goods_id'] = $info['goods_id'];
             $ninfo['sku_id'] = $info['sku_id'];
+
             $ninfo['order_status_class'] = $order_status2class[$info['order_status']];
             $ninfo['refund_status_class'] = $refund_status2class[$info['refund_status']];
+
             $ninfo['urge_shipping_time'] = $info['urge_shipping_time'];
             $ninfo['is_urge'] = $info['urge_shipping_time'] == '0000-00-00 00:00:00' ? false : true;
 

view/templates/include/admin_leftmenu.html

@@ -57,7 +57,7 @@
       </ul>
       <div class="admin-menuleft-footer">
         <img src="/images/menuleft_bottom_line.png" alt="">
-        <div>快乐分销v3.0</div>
+        <div>{$smarty.const.APPNAME}</div>
         <div>© Inc.All rights reserved.</div>
         <a href="https://beian.miit.gov.cn" target="_blank" style="color: #3D7FFF"><div>{$smarty.const.BEIAN}</div></a>
       </div>

view/templates/index/wait_deliver_list.html

@@ -28,8 +28,8 @@
       <div class="layui-col-lg12 deliver-remind-body-right admin-table-body">
         <div class="admin-table-list-header">
           <div><span>发货提醒/</span></div>
-          <div><span>发货列表</span></div>
+          <div><span>待发货列表</span></div>
-          <div><a href="/index/export_wait_deliver_goods_tids"><span>导出列表</span></a></div>
+          <div><a href="/index/export_wait_deliver_goods_tids"><span>导出待发货列表</span></a></div>
         </div>
         <table class="layui-hide" id="deliver_remind_list" lay-filter="deliver-remind-table"></table>
         <div class="admin-blank-table">