hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge Request: 城市选择

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/9?initial=true
This commit is contained in:
todayswind 2025-03-10 15:51:29 +08:00 committed by Coding
commit 93fb6a1b9c
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/admin/controller/Order.php
View File

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

2
application/admin/view/order/add.html
View File

@ -24,10 +24,8 @@
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-3">{:__('Area_id')}:</label> <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'>
<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="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="" /> <input id="area_id" style="display: none" class="form-control" name="row[area_id]" hidden type="text" value="" />
</div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

1
public/assets/js/backend/order.js
View File

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