Accept Merge Request #9: (feature/hant -> develop)

Merge Request: 城市选择

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/9?initial=true

application/admin/controller/Order.php

@@ -120,7 +120,7 @@ class Order extends Backend
         $list = $this->model
             ->field(['id','order_no','admin_id','customer','tel','status','area_id','address',
                 'source','source_shop','source_uid','source','item_title','item_id','work_tel_id',
-                'detail','remark','images','create_time','update_time'])
+                'detail','remark','images','create_time','update_time','admin_id'])
             ->where($where)
             ->with(['user' => function($q){
                 $q->field('id,nickname');
@@ -165,7 +165,7 @@ class Order extends Backend
             $items = array_column($items,'title','id');
             $params['source_shop'] = $sources[$params['source']] ?? null;
             $params['item_title'] = $items[$params['item_id']] ?? null;
-            $params['user_id'] = $this->auth->id;
+            $params['admin_id'] = $this->auth->id;
             $params['status'] = 10;
             $params['order_no'] = $this->generateOrderNumber();
             $params['create_time'] = date('Y-m-d H:i:s');

application/admin/view/order/add.html

@@ -24,10 +24,8 @@
                         <div class="form-group">
                             <label class="control-label col-xs-12 col-sm-3">{:__('Area_id')}:</label>
                             <div class='col-xs-12 col-sm-8'>
-                                <div class="col-xs-12 col-sm-8">
                                     <input id="c-city" data-rule="required"  class="form-control" data-toggle="city-picker" name="row[address]" type="text" value="" />
                                     <input id="area_id" style="display: none" class="form-control" name="row[area_id]" hidden type="text" value="" />
-                                </div>
                             </div>
                         </div>
                         <div class="form-group">

public/assets/js/backend/order.js

@@ -204,6 +204,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             bindevent: function () {
                 Form.api.bindevent($("form[role=form]"),function (success,ret) {
                     clearInfo();
+                    Toastr.success('录入成功');
                     return false;
                 },);
             }