diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php index 4320926..6b7ed8a 100644 --- a/application/admin/controller/Order.php +++ b/application/admin/controller/Order.php @@ -238,6 +238,8 @@ class Order extends Backend public function add() { +// $order = \app\admin\model\Order::get(257); +// $this->success(data:$order); if (false === $this->request->isPost()) { return $this->view->fetch(); } @@ -316,7 +318,7 @@ class Order extends Backend if ($result === false) { $this->error(__('No rows were inserted')); } - $this->success(data:$this->model); + $this->success(data:$order); } public function edit($ids = null) diff --git a/public/assets/js/backend/order.js b/public/assets/js/backend/order.js index e77da2e..2abc856 100644 --- a/public/assets/js/backend/order.js +++ b/public/assets/js/backend/order.js @@ -30,23 +30,23 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function function assembleOrderMessage(data) { let message = ''; if (!data.coupon) { - message = `订单编号: ${data.order_no} + message = `订单编号: ${data.order_no} (${data.source_shop}) 服务名称: ${data.item_title} 客户昵称: ${data.customer} 客户电话: ${data.tel} 客户地址: ${data.address} -${data.receive_type === 1 ? '已收定金' : '已收全款'} +${data.receive_type == 1 ? '已收定金' : '已收全款'} 下单金额: ¥${formatNumber(data.online_amount)} 订单备注: ${data.remark || '无'} 预约时间: ${data.plan_time || '无'} `; } else { - message = `订单编号: ${data.order_no} + message = `订单编号: ${data.order_no} (${data.source_shop}) 服务名称: ${data.item_title} 客户昵称: ${data.customer} 客户电话: ${data.tel} 客户地址: ${data.address} -${data.receive_type === 1 ? '已收定金' : '已收全款'} +${data.receive_type == 1 ? '已收定金' : '已收全款'} 下单金额: ¥${formatNumber(data.online_amount)} 优惠活动: ${data.coupon?.description || '无'} 订单备注: ${data.remark ||'无'} @@ -512,6 +512,7 @@ ${data.receive_type === 1 ? '已收定金' : '已收全款'} if (res) { Form.api.submit($("form[role=form]"), function (data) { copyToClipboard(assembleOrderMessage(data)); + return false; }); }