|
@@ -89,7 +89,7 @@ class Common extends AuthController
|
|
|
} else {
|
|
|
$data[$key]['type'] = 0;
|
|
|
}
|
|
|
- $data[$key]['menu_path'] = preg_replace('/^\/cashier/', '', $item['menu_path']);
|
|
|
+ $data[$key]['menu_path'] = preg_replace('/^\/cashier/', '', $item['menu_path']);
|
|
|
}
|
|
|
return $this->success(sort_list_tier($data));
|
|
|
}
|
|
@@ -106,6 +106,7 @@ class Common extends AuthController
|
|
|
], true);
|
|
|
$time = $orderServices->timeHandle($time, true);
|
|
|
$data = $orderServices->homeStatics((int)$this->supplierId, $time);
|
|
|
+ $data['supplier'] = $this->supplierInfo;
|
|
|
return $this->success($data);
|
|
|
}
|
|
|
|
|
@@ -163,9 +164,9 @@ class Common extends AuthController
|
|
|
/** @var StoreOrderServices $orderServices */
|
|
|
$orderServices = app()->make(StoreOrderServices::class);
|
|
|
$orderNum = $orderServices->storeOrderCount((int)$this->supplierId, -1, 'supplier_id');
|
|
|
- /** @var StoreOrderRefundServices $refundServices */
|
|
|
- $refundServices = app()->make(StoreOrderRefundServices::class);
|
|
|
- $orderRefundNum = $refundServices->count(['is_cancel' => 0, 'refund_type' => [1, 2, 4, 5], 'supplier_id' => $this->supplierId]);
|
|
|
+ /** @var StoreOrderRefundServices $refundServices */
|
|
|
+ $refundServices = app()->make(StoreOrderRefundServices::class);
|
|
|
+ $orderRefundNum = $refundServices->count(['is_cancel' => 0, 'refund_type' => [1, 2, 4, 5], 'supplier_id' => $this->supplierId]);
|
|
|
|
|
|
$value = [];
|
|
|
if ($orderNum > 0) {
|
|
@@ -175,7 +176,7 @@ class Common extends AuthController
|
|
|
'url' => '/' . config('admin.supplier_prefix') . '/order/list?type=7&status=1'
|
|
|
];
|
|
|
}
|
|
|
- if ($orderRefundNum) {
|
|
|
+ if ($orderRefundNum) {
|
|
|
$value[] = [
|
|
|
'title' => '您有' . $orderRefundNum . '个售后订单待处理',
|
|
|
'type' => 'bulb',
|
|
@@ -256,9 +257,9 @@ class Common extends AuthController
|
|
|
} catch (\Throwable $e) {
|
|
|
$copyright = ['copyrightContext' => '', 'copyrightImage' => ''];
|
|
|
}
|
|
|
- $copyright['version'] = get_crmeb_version();
|
|
|
- $copyright['extract_min_price'] = sys_config('supplier_extract_min_price');
|
|
|
- $copyright['extract_max_price'] = sys_config('supplier_extract_max_price');
|
|
|
+ $copyright['version'] = get_crmeb_version();
|
|
|
+ $copyright['extract_min_price'] = sys_config('supplier_extract_min_price');
|
|
|
+ $copyright['extract_max_price'] = sys_config('supplier_extract_max_price');
|
|
|
return $this->success($copyright);
|
|
|
}
|
|
|
}
|