|
|
@@ -13,9 +13,9 @@ use bizGhs\base\classes\BaseClass;
|
|
|
|
|
|
class OrderClass extends BaseClass
|
|
|
{
|
|
|
-
|
|
|
+
|
|
|
public static $baseFile = '\bizGhs\order\models\Order';
|
|
|
-
|
|
|
+
|
|
|
//已完成
|
|
|
const ORDER_STATUS_COMPLETE = 6;
|
|
|
//已取消
|
|
|
@@ -84,7 +84,7 @@ class OrderClass extends BaseClass
|
|
|
}
|
|
|
|
|
|
//整合订单员工和供货商等信息 shish 2021.1.19
|
|
|
- public static function groupOrder($list, $showButton = false)
|
|
|
+ public static function groupOrder($list, $showButton = false, $showProgress = false)
|
|
|
{
|
|
|
if (empty($list)) {
|
|
|
return $list;
|
|
|
@@ -104,9 +104,9 @@ class OrderClass extends BaseClass
|
|
|
$list[$key]['customAvatar'] = $customInfo[$customId]['smallAvatar'] ?? '';
|
|
|
if ($showButton) {
|
|
|
$list[$key]['buttonList'] = [
|
|
|
- ['type' => 'item', 'status' => 0],
|
|
|
- ['type' => 'send', 'status' => 1],
|
|
|
- ['type' => 'selfGet', 'status' => 1],
|
|
|
+ ['type' => 'item', 'show' => 1, 'status' => 0],
|
|
|
+ ['type' => 'send', 'show' => 1, 'status' => 1],
|
|
|
+ ['type' => 'selfGet', 'show' => 1, 'status' => 1],
|
|
|
];
|
|
|
}
|
|
|
}
|