diff --git a/admin/controllers/receiver/orderv2/Orders.php b/admin/controllers/receiver/orderv2/Orders.php index 7d9c6ea3..9f5de730 100644 --- a/admin/controllers/receiver/orderv2/Orders.php +++ b/admin/controllers/receiver/orderv2/Orders.php @@ -16,6 +16,7 @@ class Orders extends HD_Controller $this->load->model('receiver/order/receiver_order_agents_model', 'order_agents_model'); $this->load->model('receiver/order/receiver_order_deliverys_model', 'order_deliverys_model'); $this->load->model('receiver/order/receiver_order_contracts_model', 'order_contracts_model'); + $this->load->model('receiver/order/receiver_order_oplogs_model','order_oplogs_model'); $this->load->model('receiver/receiver_customers_model', 'customers_model'); $this->load->model('auto/auto_series_model'); $this->load->model('auto/auto_brand_model'); @@ -283,8 +284,14 @@ class Orders extends HD_Controller $admin_name = $row_admin ? "{$row_biz['biz_name']} {$row_admin['uname']}" : ""; $row['admin_name'] = $admin_name; } + //日志 + $where = [ + 'order_id' => $row['id'] + ]; + $logs = $this->order_oplogs_model->select($where,'id desc',1,30,'uname,log,c_time'); $info = $row; $this->data['info'] = $info; + $this->data['logs'] = $logs; $this->data['_title'] = '订单详情'; return $this->show_view('receiver/orderv2/get/index', true); diff --git a/admin/views/receiver/orderv2/get/ckinfo.php b/admin/views/receiver/orderv2/get/ckinfo.php index 7ffcc0e3..3ea054f9 100644 --- a/admin/views/receiver/orderv2/get/ckinfo.php +++ b/admin/views/receiver/orderv2/get/ckinfo.php @@ -289,26 +289,27 @@ - + $.post("/receiver/orderv2/orders/edit_imgs", { + 'id': , + 'filed': field, + 'value': value, + }, function (data) { + if (data.code) { + layer.msg(data.msg, {time: 2000, icon: 1}, function () { + $.form.reload(); + }); + } else { + layer.msg(data.msg, {icon: 2}); + } + }, 'json'); + } + diff --git a/admin/views/receiver/orderv2/get/index.php b/admin/views/receiver/orderv2/get/index.php index 59e3021f..ad157b23 100644 --- a/admin/views/receiver/orderv2/get/index.php +++ b/admin/views/receiver/orderv2/get/index.php @@ -301,6 +301,8 @@ + + load->view("receiver/orderv2/get/log"); ?>