shish пре 5 година
родитељ
комит
7c2e5a3305
1 измењених фајлова са 17 додато и 8 уклоњено
  1. 17 8
      biz-ghs/order/classes/OrderClass.php

+ 17 - 8
biz-ghs/order/classes/OrderClass.php

@@ -14,6 +14,7 @@ use bizGhs\stat\classes\StatOrderCountClass;
 use bizGhs\stat\classes\StatYjClass;
 use bizHd\stat\classes\StatIncomeClass;
 use bizHd\stat\classes\StatOrderClass;
+use common\components\httpUtil;
 use common\components\imgUtil;
 use common\components\orderSn;
 use common\components\stringUtil;
@@ -153,9 +154,16 @@ class OrderClass extends BaseClass
         if ($showButton == false) {
             return [];
         }
+
+        $print = ['type' => 'print', 'show' => 1, 'disable' => 0, 'name' => '打印'];
+        //小程序端不显示打印
+        if (httpUtil::isMiniProgram()) {
+            $print['show'] = 0;
+        }
+
         if ($isList) {
 
-            //列表页显示的按钮
+            //订单列表页显示的按钮
 
             $item = ['type' => 'item', 'show' => 0, 'disable' => 1, 'name' => '改花材'];
             $send = ['type' => 'send', 'show' => 1, 'disable' => 0, 'name' => '发货'];
@@ -165,20 +173,24 @@ class OrderClass extends BaseClass
                 $item['disable'] = 0;
                 $send['disable'] = 1;
                 $selfGet['disable'] = 1;
+                $print['disable'] = 1;
             }
             if ($order['status'] == self::ORDER_STATUS_UN_SEND) {
                 //待配送订单,改花材按钮不可点,自取可点
                 $item['disable'] = 1;
                 $selfGet['disable'] = 0;
+                $print['disable'] = 0;
             }
             //自取订单发货按钮置灰
             if ($order['sendType'] == self::SEND_TYPE_NO) {
                 $send['disable'] = 1;
+                $print['disable'] = 1;
             }
-            return [$item, $send, $selfGet];
+            return [$item, $send, $selfGet, $print];
+
         } else {
 
-            //详情页显示的按钮
+            //订单详情页显示的按钮
 
             //待确认订单显示延期付和已付款
             if ($order['status'] == OrderClass::ORDER_STATUS_UN_PAY) {
@@ -189,15 +201,13 @@ class OrderClass extends BaseClass
 
             //待配送订单显示打印、发货和自取
             if ($order['status'] == OrderClass::ORDER_STATUS_UN_SEND) {
-                //没有花材的订单按钮全部置灰色不可点
-                $print = ['type' => 'print', 'show' => 0, 'disable' => 1];
+
                 $item = ['type' => 'item', 'show' => 0, 'disable' => 1];
                 $selfGet = ['type' => 'selfGet', 'show' => 1, 'disable' => 1];
                 $send = ['type' => 'send', 'show' => 1, 'disable' => 1];
                 if ($order['hasItem'] == 2) {
                     return [$print, $item, $selfGet, $send];
                 }
-                $print['disable'] = 0;
                 $selfGet['disable'] = 0;
                 $send['disable'] = 0;
                 $item['disable'] = 0;
@@ -205,13 +215,11 @@ class OrderClass extends BaseClass
             }
             //配送中显示按钮
             if ($order['status'] == OrderClass::ORDER_STATUS_SENDING) {
-                $print = ['type' => 'print', 'show' => 0, 'disable' => 1];
                 $send = ['type' => 'send', 'show' => 1, 'disable' => 0];
                 return [$print, $send];
             }
             //完成
             if ($order['status'] == OrderClass::ORDER_STATUS_COMPLETE) {
-                $print = ['type' => 'print', 'show' => 0, 'disable' => 1];
                 $send = ['type' => 'send', 'show' => 1, 'disable' => 0];
                 //自取订单不显示发货按钮
                 if ($order['sendType'] == self::SEND_TYPE_NO) {
@@ -285,6 +293,7 @@ class OrderClass extends BaseClass
             $adminId = $val['adminId'] ?? 0;
             $list[$key]['adminName'] = $adminInfo[$adminId]['name'] ?? '';
             $list[$key]['customAddress'] = $val['fullAddress'] ?? '';
+
             //显示列表页的操作按钮
             $list[$key]['buttonList'] = self::getShowButton($showButton, $isList, $val);