From 8c4ce333846993c6d4b89e153bc83bdd07cfb291 Mon Sep 17 00:00:00 2001 From: xman <1946321327@qq.com> Date: Mon, 24 Mar 2025 21:40:45 +0800 Subject: [PATCH] sth --- application/admin/behavior/OrderLog.php | 5 ++ .../admin/controller/orders/Dispatch.php | 5 +- application/admin/model/OrderDispatch.php | 2 +- .../admin/view/aftersales/aftersale/add.html | 68 +++++++------------ .../admin/view/aftersales/aftersale/edit.html | 43 +++++------- .../admin/view/orders/dispatch/edit.html | 58 +++------------- public/assets/js/addons.js | 20 +++--- 7 files changed, 68 insertions(+), 133 deletions(-) diff --git a/application/admin/behavior/OrderLog.php b/application/admin/behavior/OrderLog.php index aae000c..fbb0e40 100644 --- a/application/admin/behavior/OrderLog.php +++ b/application/admin/behavior/OrderLog.php @@ -2,11 +2,16 @@ namespace app\admin\behavior; +use think\Lang; + class OrderLog { //记录订单日志 public function run(&$response) { + + Lang::load(APP_PATH . 'admin/lang/zh-cn/order.php'); + $Model = new \app\admin\model\Order(); $statusList = $Model->getStatusList(); $order = $response['order']; //订单对象 diff --git a/application/admin/controller/orders/Dispatch.php b/application/admin/controller/orders/Dispatch.php index b5450e2..5881da5 100644 --- a/application/admin/controller/orders/Dispatch.php +++ b/application/admin/controller/orders/Dispatch.php @@ -52,9 +52,6 @@ class Dispatch extends Backend */ public function index() { - - $orderModel = new Order(); - //当前是否为关联查询 $this->relationSearch = true; //设置过滤方法 @@ -76,7 +73,7 @@ class Dispatch extends Backend $row->btn_edit = (in_array($row->status, $this->model->btnActiveStatusList('btn_edit'))) ? true : false; $row->btn_cancel = (in_array($row->status, $this->model->btnActiveStatusList('btn_cancel'))) ? true : false; $row->btn_abnormal = (in_array($row->status, $this->model->btnActiveStatusList('btn_abnormal'))) ? true : false; - $row->btn_income = (in_array($row->status, $this->model->btnActiveStatusList('btn_income')) && in_array($row->order->status, $orderModel->incomeBtnStatus())) ? true : false; + // $row->btn_income = (in_array($row->status, $this->model->btnActiveStatusList('btn_income')) && in_array($row->order->status, $orderModel->incomeBtnStatus())) ? true : false; } $result = array("total" => $list->total(), "rows" => $list->items()); diff --git a/application/admin/model/OrderDispatch.php b/application/admin/model/OrderDispatch.php index 5c80de9..00cec31 100644 --- a/application/admin/model/OrderDispatch.php +++ b/application/admin/model/OrderDispatch.php @@ -126,7 +126,7 @@ class OrderDispatch extends Model self::STATUS_PLANIT, self::STATUS_CLOCK, ], - 'btn_income' => [ + 'btn_finished' => [ self::STATUS_TOGET, self::STATUS_GOTIT, self::STATUS_PLANIT, diff --git a/application/admin/view/aftersales/aftersale/add.html b/application/admin/view/aftersales/aftersale/add.html index ccb7a53..46dec49 100644 --- a/application/admin/view/aftersales/aftersale/add.html +++ b/application/admin/view/aftersales/aftersale/add.html @@ -3,21 +3,10 @@
- +
-
- -
- -
- {foreach name="statusList" item="vo"} - - {/foreach} -
-
-
@@ -93,7 +82,7 @@
- +
@@ -119,57 +108,48 @@
- -
-
-
- -
- -
-
-
- -
- +
+
+ +
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
+ + + +
+ +
+ +
+ +
+ {foreach name="statusList" item="vo"} + + {/foreach} +
+ +
+
+
diff --git a/application/admin/view/aftersales/aftersale/edit.html b/application/admin/view/aftersales/aftersale/edit.html index 93db8f2..f56e3a4 100644 --- a/application/admin/view/aftersales/aftersale/edit.html +++ b/application/admin/view/aftersales/aftersale/edit.html @@ -3,21 +3,10 @@
- +
-
- -
- -
- {foreach name="statusList" item="vo"} - - {/foreach} -
-
-
@@ -93,7 +82,7 @@
- +
@@ -122,18 +111,7 @@
-
- -
- -
-
-
- -
- -
-
+
@@ -170,6 +148,21 @@
+ + +
+ +
+ +
+ {foreach name="statusList" item="vo"} + + {/foreach} +
+ +
+
+
diff --git a/application/admin/view/orders/dispatch/edit.html b/application/admin/view/orders/dispatch/edit.html index d3a33ff..4464e69 100644 --- a/application/admin/view/orders/dispatch/edit.html +++ b/application/admin/view/orders/dispatch/edit.html @@ -1,27 +1,23 @@
+ + + + + + +
- +
-
- -
- - -
-
- +
@@ -48,42 +44,8 @@
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
+
diff --git a/public/assets/js/addons.js b/public/assets/js/addons.js index e814dbb..349ccac 100755 --- a/public/assets/js/addons.js +++ b/public/assets/js/addons.js @@ -1,6 +1,7 @@ define([], function () { require([], function () { //绑定data-toggle=addresspicker属性点击事件 + console.log('111'); $(document).on('click', "[data-toggle='addresspicker']", function () { var that = this; @@ -11,18 +12,15 @@ define([], function () { var zoom_id = $(that).data("zoom-id") ? $(that).data("zoom-id") : ""; var lat = lat_id ? $("#" + lat_id).val() : ''; var lng = lng_id ? $("#" + lng_id).val() : ''; - var city_code = $("#area_name").val(); + var city_code = $("#area_id").val(); var zoom = zoom_id ? $("#" + zoom_id).val() : ''; - var url = "/addons/address/index/select"; - var parmas = (lat && lng) ? '&lat=' + lat + '&lng=' + lng + (input_id ? "&address=" - + $("#" + input_id).val() : "") + (zoom ? "&zoom=" + zoom : "") : ''; - url += parmas; + var url = "/addons/address/index/select?1=1"; + url += (lat && lng) ? 'lat=' + lat + '&lng=' + lng + + (input_id ? "&address=" + $("#" + input_id).val() : "") + +(zoom ? "&zoom=" + zoom : "") : '' + ; if (city_code){ - if (parmas === ''){ - url += city_code ? "?city_code=" + city_code : ""; - }else { - url += city_code ? "&city_code=" + city_code : ""; - } + url += city_code ? "&city_code=" + city_code : ""; } console.log(url); Fast.api.open(url, '位置选择', { @@ -43,7 +41,7 @@ define([], function () { } }); }); - }); +}); if (typeof Config.upload.storage !== 'undefined' && Config.upload.storage === 'alioss') { require(['upload'], function (Upload) {