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

index.php

@@ -79,13 +79,8 @@ class run extends publicBase {
         $this->view['_shopinfo'] = $this->para['_shopinfo'] = $shopinfo;
 
         $obj = new mOrder();
-        $wait_deliver_count = $obj->getOrdersCount($shopinfo['uid'], $shopinfo['id'], ORDER_STATUS_WAIT_DELIVER_GOODS, REFUND_STATUS_NO_AFTER_SALES)+0;
+        $this->view['_wait_deliver_count'] = $this->para['_wait_deliver_count'] = $obj->getOrdersCount($shopinfo['uid'], $shopinfo['id'], ORDER_STATUS_WAIT_DELIVER_GOODS, REFUND_STATUS_NO_AFTER_SALES)+0;
-        $wait_deliver_count = $wait_deliver_count>99 ? '99+' : $wait_deliver_count;
+        $this->view['_after_sale_count'] = $this->para['_after_sale_count'] = $obj->getOrdersCount($shopinfo['uid'], $shopinfo['id'], 0, REFUND_STATUS_AFTER_SALE_ING)+0;
-        $this->view['_wait_deliver_count'] = $this->para['_wait_deliver_count'] = $wait_deliver_count;
-
-        $after_sale_count = $obj->getOrdersCount($shopinfo['uid'], $shopinfo['id'], 0, REFUND_STATUS_AFTER_SALE_ING)+0;
-        $after_sale_count = $after_sale_count>99 ? '99+' : $after_sale_count;
-        $this->view['_after_sale_count'] = $this->para['_after_sale_count'] = $after_sale_count;
     }
 
     private function action() {

view/templates/include/admin_leftmenu.html

@@ -30,9 +30,11 @@
                 <span class="icon-uniE90A admin-no-select menu-left-icon-img menu-left-icon-img-15"></span>
                 <span class="icon-1 admin-select menu-left-icon-img menu-left-icon-img-15"></span>
                 发货提醒
+                {if $_wait_deliver_count>0}
                 <div class="admin-tip-order-nums" >
-                  <span>{$_wait_deliver_count}</span>
+                  <span>{if $_wait_deliver_count > 99}99+{else}{$_wait_deliver_count}{/if}</span>
                 </div>
+                {/if}
               </a>
             </dd>
             <dd class="{if $menu_page == 'after_sale_list'}layui-this{/if}">
@@ -40,9 +42,11 @@
                 <span class="icon--6 admin-no-select menu-left-icon-img menu-left-icon-img-16"></span>
                 <span class="icon--6-2 admin-select menu-left-icon-img menu-left-icon-img-16"></span>
                 售后监控
+                {if $_after_sale_count>0}
                 <div class="admin-tip-order-nums" >
-                  <span>{$_after_sale_count}</span>
+                  <span>{if $_after_sale_count > 99}99+{else}{$_after_sale_count}{/if}</span>
                 </div>
+                {/if}
               </a>
             </dd>
             <dd class="{if $menu_page == 'order_list'}layui-this{/if}">