+
{notempty name='row.audit_admin_id'}
diff --git a/application/admin/view/orders/dispatch2/edit.html b/application/admin/view/orders/dispatch2/edit.html
index 8e5ca56..f402e54 100644
--- a/application/admin/view/orders/dispatch2/edit.html
+++ b/application/admin/view/orders/dispatch2/edit.html
@@ -150,8 +150,7 @@
diff --git a/application/config.php b/application/config.php
index 4582b2d..ff66689 100755
--- a/application/config.php
+++ b/application/config.php
@@ -173,7 +173,7 @@ return [
// 日志保存目录
'path' => LOG_PATH,
// 日志记录级别
- 'level' => [],
+ 'level' => ['log','error'],
],
// +----------------------------------------------------------------------
// | Trace设置 开启 app_trace 后 有效
diff --git a/public/assets/js/backend/orders/configorder.js b/public/assets/js/backend/orders/configorder.js
index df3b4c8..4b740b7 100644
--- a/public/assets/js/backend/orders/configorder.js
+++ b/public/assets/js/backend/orders/configorder.js
@@ -49,6 +49,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'online_amount', title: __('Online_amount'), operate:'BETWEEN'},
{field: 'offline_amount', title: __('Offline_amount'), operate:'BETWEEN'},
+ {field: 'refund_amount', title: __('Refund_amount'), operate:'BETWEEN'},
+ {field: 'real_amount', title: __('Real_amount'), operate:'BETWEEN'},
+ {field: 'cost', title: __('Cost'), operate:'BETWEEN'},
+ {field: 'performance', title: __('Performance'), operate:'BETWEEN'},
+
// {field: 'dispatch_type', title: __('Dispatch_type')},
{field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
{field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
From 86a1df86de44ad36328d3e45c542f2289bee6ad1 Mon Sep 17 00:00:00 2001
From: xman <1946321327@qq.com>
Date: Mon, 31 Mar 2025 10:48:39 +0800
Subject: [PATCH 03/21] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/admin/controller/orders/Configorder.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/application/admin/controller/orders/Configorder.php b/application/admin/controller/orders/Configorder.php
index 819592b..fb193dd 100644
--- a/application/admin/controller/orders/Configorder.php
+++ b/application/admin/controller/orders/Configorder.php
@@ -58,7 +58,7 @@ class Configorder extends Backend
list($where, $sort, $order, $offset, $limit) = $this->buildparams();
$list = $this->model
->tab(Order::TAB_SETTING)
- ->auth($this->auth)
+ ->auth($this->auth,'dispatch_admin_id')
->areaauth($this->auth)
->with(['dispatch'])
->where($where)
From a36fd9805f50ef346518f9b8fe7bfc364b0e8872 Mon Sep 17 00:00:00 2001
From: xman <1946321327@qq.com>
Date: Mon, 31 Mar 2025 10:53:47 +0800
Subject: [PATCH 04/21] =?UTF-8?q?=E5=9B=9E=E8=AE=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../assets/js/backend/orders/revisitorder.js | 25 ++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/public/assets/js/backend/orders/revisitorder.js b/public/assets/js/backend/orders/revisitorder.js
index d38fbdc..f3decb2 100644
--- a/public/assets/js/backend/orders/revisitorder.js
+++ b/public/assets/js/backend/orders/revisitorder.js
@@ -8,7 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
index_url: 'orders/revisitorder/index' + location.search,
add_url: 'orders/revisitorder/add',
edit_url: 'orders/revisitorder/edit',
- del_url: 'orders/revisitorder/del',
+ // del_url: 'orders/revisitorder/del',
multi_url: 'orders/revisitorder/multi',
import_url: 'orders/revisitorder/import',
table: 'order',
@@ -26,7 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
fixedRightNumber: 1,
columns: [
[
- {checkbox: true},
+ // {checkbox: true},
{field: 'id', title: __('Id')},
{field: 'order_no', title: __('Order_no'), operate: 'LIKE'},
{field: 'customer', title: __('Customer'), operate: 'LIKE'},
@@ -57,7 +57,26 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
{field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
{field: 'delete_time', title: __('Delete_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
- {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+ {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate,
+ align:'left',
+ buttons:[
+ {
+ name: 'edit',
+ text:"回访",
+ title:"回访",
+ icon: 'fa fa-pencil',
+ //title: __('Edit'),
+ extend: 'data-toggle="tooltip" data-container="body"',
+ classname: 'btn btn-xs btn-info btn-editone',
+ visible:function(row){
+ if(row.revisit_id <= 0){
+ return true;
+ }
+ return false;
+ }
+ },
+ ]
+ }
]
]
});
From 7a4bafcc12eb66a64fb6e85160c96e212651762f Mon Sep 17 00:00:00 2001
From: xman <1946321327@qq.com>
Date: Mon, 31 Mar 2025 11:15:08 +0800
Subject: [PATCH 05/21] =?UTF-8?q?dispatch=20=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/controller/orders/Dispatch2.php | 14 +++++++-
application/admin/model/OrderDispatchLog.php | 36 +++++++++++++++++++
2 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 application/admin/model/OrderDispatchLog.php
diff --git a/application/admin/controller/orders/Dispatch2.php b/application/admin/controller/orders/Dispatch2.php
index 3a61efe..62d8628 100644
--- a/application/admin/controller/orders/Dispatch2.php
+++ b/application/admin/controller/orders/Dispatch2.php
@@ -4,6 +4,7 @@ namespace app\admin\controller\orders;
use app\admin\model\Order;
use app\admin\model\OrderDispatch;
+use app\admin\model\OrderDispatchLog;
use app\common\controller\Backend;
use app\common\Logic\OrderLogic;
use think\Db;
@@ -229,8 +230,19 @@ class Dispatch2 extends Backend
$row->validateFailException()->validate($validate);
}
if($row->worker_id != $params['worker_id']){ //更换了师傅
+ $worker = model('worker')->where('id',$params['worker_id'])->find();
+ $params ['worker_name'] = $worker->name;
+ $params ['worker_tel'] = $worker->tel;
-
+ //记录日志
+ OrderDispatchLog::create([
+ 'dispatch_id' => $row->id,
+ 'order_id' => $row->order_id,
+ 'worker_id' => $params['worker_id'],
+ 'status' => $row->status,
+ 'status_text' => $this->model->getStatusList()[$row->status],
+ 'remark' => '师傅由 ('.$row->worker_id.')'.$row->worker_name.' 更换为('.$params['worker_id'].')'.$worker->name
+ ]);
}
$result = $row->allowField(true)->save($params);
diff --git a/application/admin/model/OrderDispatchLog.php b/application/admin/model/OrderDispatchLog.php
new file mode 100644
index 0000000..b01cd48
--- /dev/null
+++ b/application/admin/model/OrderDispatchLog.php
@@ -0,0 +1,36 @@
+
Date: Mon, 31 Mar 2025 11:28:33 +0800
Subject: [PATCH 06/21] =?UTF-8?q?dispatch=20=E5=A2=9E=E5=8A=A0=E5=8F=98?=
=?UTF-8?q?=E6=9B=B4=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/behavior/OrderDispatchLog.php | 31 +++++++++++++++++++
.../admin/controller/orders/Dispatch2.php | 21 ++++++++-----
application/tags.php | 4 +++
3 files changed, 48 insertions(+), 8 deletions(-)
create mode 100644 application/admin/behavior/OrderDispatchLog.php
diff --git a/application/admin/behavior/OrderDispatchLog.php b/application/admin/behavior/OrderDispatchLog.php
new file mode 100644
index 0000000..87e815b
--- /dev/null
+++ b/application/admin/behavior/OrderDispatchLog.php
@@ -0,0 +1,31 @@
+getStatusList();
+ $dispatch = $response['dispatch']; //订单对象
+ $remark = $response['remark'] ?? ''; //备注
+
+ $data = [
+ 'dispatch_id' => $dispatch->id,
+ 'order_id' => $dispatch->order_id,
+ 'worker_id' => $dispatch->worker_id,
+ 'order_status' => $dispatch->status,
+ 'order_status_text' => $statusList[$dispatch->status],
+ 'remark' => $remark,
+ ];
+ \app\admin\model\OrderDispatchLog::create($data);
+ //(new \app\admin\model\OrderDispatchLog())->cre($data);
+ }
+}
diff --git a/application/admin/controller/orders/Dispatch2.php b/application/admin/controller/orders/Dispatch2.php
index 62d8628..107f4db 100644
--- a/application/admin/controller/orders/Dispatch2.php
+++ b/application/admin/controller/orders/Dispatch2.php
@@ -229,23 +229,28 @@ class Dispatch2 extends Backend
$validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
$row->validateFailException()->validate($validate);
}
+
+ $workerChange = false;
+ $remark = '';
if($row->worker_id != $params['worker_id']){ //更换了师傅
$worker = model('worker')->where('id',$params['worker_id'])->find();
$params ['worker_name'] = $worker->name;
$params ['worker_tel'] = $worker->tel;
//记录日志
- OrderDispatchLog::create([
- 'dispatch_id' => $row->id,
- 'order_id' => $row->order_id,
- 'worker_id' => $params['worker_id'],
- 'status' => $row->status,
- 'status_text' => $this->model->getStatusList()[$row->status],
- 'remark' => '师傅由 ('.$row->worker_id.')'.$row->worker_name.' 更换为('.$params['worker_id'].')'.$worker->name
- ]);
+ $remark = '师傅由 ('.$row->worker_id.')'.$row->worker_name.' 更换为('.$params['worker_id'].')'.$worker->name;
+ $workerChange = true;
+
}
$result = $row->allowField(true)->save($params);
+ if($workerChange){
+ $hookParams = [
+ 'dispatch' => $row,
+ 'remark' => $remark,
+ ];
+ Hook::listen('order_dispatch_change', $hookParams);
+ }
Db::commit();
} catch (ValidateException | PDOException | Exception $e) {
Db::rollback();
diff --git a/application/tags.php b/application/tags.php
index f51a20b..f1d6c53 100755
--- a/application/tags.php
+++ b/application/tags.php
@@ -43,4 +43,8 @@ return [
'app\\admin\\behavior\\OrderLog',
'app\\admin\\behavior\\OrderChangeAfter',
],
+
+ 'order_dispatch_change' => [
+ 'app\\admin\\behavior\\OrderDispatchLog',
+ ],
];
From 65aea577864c3ef72bb3d491d3447e0ea6a694a4 Mon Sep 17 00:00:00 2001
From: xman <1946321327@qq.com>
Date: Mon, 31 Mar 2025 11:33:44 +0800
Subject: [PATCH 07/21] =?UTF-8?q?dispatch=20=E5=A2=9E=E5=8A=A0=E5=8F=98?=
=?UTF-8?q?=E6=9B=B4=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/controller/orders/Dispatch2.php | 94 ++-----------------
application/common/Logic/OrderLogic.php | 7 ++
2 files changed, 16 insertions(+), 85 deletions(-)
diff --git a/application/admin/controller/orders/Dispatch2.php b/application/admin/controller/orders/Dispatch2.php
index 107f4db..1ff69b6 100644
--- a/application/admin/controller/orders/Dispatch2.php
+++ b/application/admin/controller/orders/Dispatch2.php
@@ -30,7 +30,7 @@ class Dispatch2 extends Backend
*/
protected $model = null;
- protected $searchFields = 'order.order_no,order.tel,order.customer,worker_name,worker_tel';
+ protected $searchFields = 'order.id,order.order_no,order.tel,order.customer,worker_name,worker_tel';
public function _initialize()
{
@@ -92,88 +92,6 @@ class Dispatch2 extends Backend
}
- /**
- * 添加
- *
- * @return string
- * @throws \think\Exception
- */
- public function add()
- {
- if (false === $this->request->isPost()) {
- $id = $this->request->param('order_id');
- $order = model('order')->where('id', $id)->find();
- if (!$order) {
- $this->error(__('No results were found'));
- }
-
- $items = Db::name('item')
- ->where('status',1)
- ->field(['id','title','key_word','pid'])
- ->order('pid','asc')
- ->order('sort','desc')
- ->select();
-
- $tree = $this->buildTree($items);
- $formattedTree = $this->formatTree($tree);
-
- $area_name = model('area')->getNameByCode($order->area_id);
- $order->area_name = str_replace(',','/',$area_name);
- $this->view->assign('items', $formattedTree);
- $this->view->assign('row', $order);
-
- return $this->view->fetch();
- }
- $params = $this->request->post('row/a');
- if (empty($params)) {
- $this->error(__('Parameter %s can not be empty', ''));
- }
- $params = $this->preExcludeFields($params);
-
- if ($this->dataLimit && $this->dataLimitFieldAutoFill) {
- $params[$this->dataLimitField] = $this->auth->id;
- }
- $result = false;
- Db::startTrans();
- try {
- //是否采用模型验证
- if ($this->modelValidate) {
- $name = str_replace("\\model\\", "\\validate\\", get_class($this->model));
- $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate;
- $this->model->validateFailException()->validate($validate);
- }
- $order = model('order')->where('id',$params['order_id'])->find();
- if (!$order){
- $this->error(__('No results were found'));
- }
- $insert = [
- 'admin_id' => $this->auth->id,
- 'admin_user' => $this->auth->nickname,
- 'order_id' => $params['order_id'],
- 'type' => 1,
- 'worker_id' => $params['worker_id'],
- 'plan_time' => $order['plan_time'],
- 'is_receipt' => $order['receive_type'] == 1
- ];
-
- $worker = model('worker')->where('id',$params['worker_id'])->find();
- $insert ['worker_name'] = $worker->name;
- $insert ['worker_tel'] = $worker->tel;
-
- $result = $this->model->allowField(true)->save($insert);
- $order->status = Order::STATUS_DISPATCHED;
- $order->save();
- Db::commit();
- } catch (ValidateException | PDOException | Exception $e) {
- Db::rollback();
- $this->error($e->getMessage());
- }
- if ($result === false) {
- $this->error(__('No rows were inserted'));
- }
- $this->success();
- }
-
/**
* 编辑
*
@@ -327,7 +245,7 @@ class Dispatch2 extends Backend
//修改订单状态
$OrderLogic = new OrderLogic();
- $OrderLogic -> dispachFinishAfter($row,['role'=>1,'auth'=>$this->auth]);
+ $OrderLogic -> dispachFinishAfter($row,['role'=>1,'auth'=>$this->auth,'remark'=>'后台操作，adminId:'.$this->auth->id]);
Db::commit();
} catch (ValidateException | PDOException | Exception $e) {
Db::rollback();
@@ -443,7 +361,7 @@ class Dispatch2 extends Backend
$this->error('订单状态已变更，请刷新后操作');
}
//取消
- $item->save(['status' => OrderDispatch::STATUS_CANCEL, 'remark' => $remark]);
+ $item->allowField(true)->save(['status' => OrderDispatch::STATUS_CANCEL, 'remark' => $remark]);
//回退订单状态
$order->allowField(true)->save(['status' => Order::STATUS_DISPATCHING]);
$params['order'] = $order;
@@ -454,6 +372,12 @@ class Dispatch2 extends Backend
$params['remark'] .= '，操作备注:' . $remark;
}
Hook::listen('order_change', $params);
+
+ $hookParams = [
+ 'dispatch' => $item,
+ 'remark' => '后台取消,adminId:'.$this->auth->id
+ ];
+ Hook::listen('order_dispatch_change', $hookParams);
}
Db::commit();
} catch (PDOException | Exception $e) {
diff --git a/application/common/Logic/OrderLogic.php b/application/common/Logic/OrderLogic.php
index 92a1b77..63c45ff 100644
--- a/application/common/Logic/OrderLogic.php
+++ b/application/common/Logic/OrderLogic.php
@@ -57,6 +57,13 @@ class OrderLogic
$params['remark'] = $roleInfo['remark'] ?? $orderDispatch->remark;
Hook::listen('order_change', $params);
+
+
+ $hookParams = [
+ 'dispatch' => $orderDispatch,
+ 'remark' => $roleInfo['remark'] ?? $orderDispatch->remark,
+ ];
+ Hook::listen('order_dispatch_change', $hookParams);
}
}
\ No newline at end of file
From 066c6fb584214894e69270646933bc64e540e198 Mon Sep 17 00:00:00 2001
From: xman <1946321327@qq.com>
Date: Mon, 31 Mar 2025 14:15:54 +0800
Subject: [PATCH 08/21] text
---
.../admin/controller/orders/Configorder.php | 6 ++--
application/admin/lang/en/orders/income.php | 2 +-
.../admin/lang/zh-cn/orders/auditorder.php | 5 +--
.../admin/lang/zh-cn/orders/configorder.php | 5 +--
.../admin/lang/zh-cn/orders/dispatch.php | 4 +--
.../admin/lang/zh-cn/orders/dispatch2.php | 4 +--
.../admin/lang/zh-cn/orders/income.php | 2 +-
.../admin/view/orders/configorder/edit.html | 32 +++++++++++--------
.../admin/view/orders/dispatch/add.html | 2 +-
.../admin/view/orders/dispatch2/add.html | 2 +-
.../admin/view/orders/dispatch2/edit.html | 8 ++---
public/assets/js/backend/orders/auditorder.js | 1 +
.../assets/js/backend/orders/configorder.js | 15 +++++----
13 files changed, 50 insertions(+), 38 deletions(-)
diff --git a/application/admin/controller/orders/Configorder.php b/application/admin/controller/orders/Configorder.php
index fb193dd..54b54d3 100644
--- a/application/admin/controller/orders/Configorder.php
+++ b/application/admin/controller/orders/Configorder.php
@@ -122,18 +122,20 @@ class Configorder extends Backend
$data = [
'status' => Order::STATUS_AUDITING,
+ 'online_amount_last' => $params['online_amount_last'],
'offline_amount' => $params['offline_amount'],
'refund_amount' => $params['refund_amount'],
'cost' => $params['cost'],
];
- $data['total'] = bcadd($row->online_amount,$params['offline_amount'],2);
+ $last_amount = bcadd($params['online_amount_last'],$params['offline_amount'],2);
+
+ $data['total'] = bcadd($row->online_amount,$last_amount,2);
$data['real_amount'] = bcsub($data['total'],$params['refund_amount'],2);
$data['performance'] = bcsub($data['real_amount'],$params['cost'],2);
$result = $row->allowField(true)->save($data);
//日志
-
$params['order'] = $row;
$params['role'] = 1;
$params['auth'] = $this->auth;
diff --git a/application/admin/lang/en/orders/income.php b/application/admin/lang/en/orders/income.php
index 2b58ba9..13dfad4 100644
--- a/application/admin/lang/en/orders/income.php
+++ b/application/admin/lang/en/orders/income.php
@@ -13,7 +13,7 @@ return [
'Amount' => '收款金额',
'Income_type' => '收款方式',
'Income_type 1' => '平台收款',
- 'Income_type 2' => '线下收款',
+ 'Income_type 2' => '线下尾款',
'Admin_id' => '创建人ID',
'Admin_user' => '创建人',
'Payment_time' => '收款时间',
diff --git a/application/admin/lang/zh-cn/orders/auditorder.php b/application/admin/lang/zh-cn/orders/auditorder.php
index 8cb14e3..c23df85 100644
--- a/application/admin/lang/zh-cn/orders/auditorder.php
+++ b/application/admin/lang/zh-cn/orders/auditorder.php
@@ -39,8 +39,9 @@ return [
'Plan_time' => '预约时间',
'Admin_id' => '录单员ID',
'Total' => '总收款',
- 'Online_amount' => '线上收款',
- 'Offline_amount' => '线下收款',
+ 'Online_amount' => '线上预付',
+ 'Online_amount_last' => '线上尾款',
+ 'Offline_amount' => '线下尾款',
'Discount_amount' => '优惠抵扣',
'Real_amount' => '实际收款',
'Refund_amount' => '退款金额',
diff --git a/application/admin/lang/zh-cn/orders/configorder.php b/application/admin/lang/zh-cn/orders/configorder.php
index 80e83dc..c565930 100644
--- a/application/admin/lang/zh-cn/orders/configorder.php
+++ b/application/admin/lang/zh-cn/orders/configorder.php
@@ -39,8 +39,9 @@ return [
'Admin_id' => '录单员ID',
'Coupon_id' => '优惠码id',
'Total' => '总收款',
- 'Online_amount' => '线上收款',
- 'Offline_amount' => '线下收款',
+ 'Online_amount' => '线上预付',
+ 'Online_amount_last' => '线上尾款',
+ 'Offline_amount' => '线下尾款',
'Discount_amount' => '优惠抵扣',
'Refund_amount' => '退款金额',
'Real_amount' => '实际收款',
diff --git a/application/admin/lang/zh-cn/orders/dispatch.php b/application/admin/lang/zh-cn/orders/dispatch.php
index 17e3b46..7e30552 100644
--- a/application/admin/lang/zh-cn/orders/dispatch.php
+++ b/application/admin/lang/zh-cn/orders/dispatch.php
@@ -65,8 +65,8 @@ return [
'Order.admin_id' => '录单员ID',
'Order.coupon_id' => '优惠码id',
'Order.total' => '总收款',
- 'Order.online_amount' => '线上收款',
- 'Order.offline_amount' => '线下收款',
+ 'Order.online_amount' => '线上预付',
+ 'Order.offline_amount' => '线下尾款',
'Order.discount_amount' => '优惠抵扣',
'Order.refund_amount' => '退款金额',
'Order.real_amount' => '实际收款',
diff --git a/application/admin/lang/zh-cn/orders/dispatch2.php b/application/admin/lang/zh-cn/orders/dispatch2.php
index 5d96287..dd75a8c 100644
--- a/application/admin/lang/zh-cn/orders/dispatch2.php
+++ b/application/admin/lang/zh-cn/orders/dispatch2.php
@@ -65,8 +65,8 @@ return [
'Order.admin_id' => '录单员ID',
'Order.coupon_id' => '优惠码id',
'Order.total' => '总收款',
- 'Order.online_amount' => '线上收款',
- 'Order.offline_amount' => '线下收款',
+ 'Order.online_amount' => '线上预付',
+ 'Order.offline_amount' => '线下尾款',
'Order.discount_amount' => '优惠抵扣',
'Order.refund_amount' => '退款金额',
'Order.real_amount' => '实际收款',
diff --git a/application/admin/lang/zh-cn/orders/income.php b/application/admin/lang/zh-cn/orders/income.php
index ffaca18..1731c83 100644
--- a/application/admin/lang/zh-cn/orders/income.php
+++ b/application/admin/lang/zh-cn/orders/income.php
@@ -19,7 +19,7 @@ return [
'Amount' => '收款金额',
'Income_type' => '收款方式',
'Income_type 1' => '平台收款',
- 'Income_type 2' => '线下收款',
+ 'Income_type 2' => '线下尾款',
'Admin_id' => '创建人ID',
'Admin_user' => '创建人',
'Payment_time' => '收款时间',
diff --git a/application/admin/view/orders/configorder/edit.html b/application/admin/view/orders/configorder/edit.html
index f364e58..a063836 100644
--- a/application/admin/view/orders/configorder/edit.html
+++ b/application/admin/view/orders/configorder/edit.html
@@ -1,5 +1,16 @@