coupon.xp.yn.cn / coupon_backend · 提交

转到一个项目

作者 chencheng
提交 65d6b4bccb3832df3e2c7d9422793527cac55293 1 个父辈 bbc69679

kaquan-10

内嵌 并排对比
正在显示 6 个修改的文件 包含 6 行增加 和 4 行删除
@@ -49,7 +49,7 @@ class Order extends Backend @@ -49,7 +49,7 @@ class Order extends Backend
49 return $this->selectpage(); 49 return $this->selectpage();
50 } 50 }
51 list($where, $sort, $order, $offset, $limit) = $this->buildparams(); 51 list($where, $sort, $order, $offset, $limit) = $this->buildparams();
52 - 52 +
53 $list = $this->model 53 $list = $this->model
54 ->with(['store','coupon','activity','user']) 54 ->with(['store','coupon','activity','user'])
55 ->where($where) 55 ->where($where)
@@ -48,7 +48,7 @@ class Store extends Backend @@ -48,7 +48,7 @@ class Store extends Backend
48 return $this->selectpage(); 48 return $this->selectpage();
49 } 49 }
50 list($where, $sort, $order, $offset, $limit) = $this->buildparams(); 50 list($where, $sort, $order, $offset, $limit) = $this->buildparams();
51 - 51 +
52 $list = $this->model 52 $list = $this->model
53 ->with(['coupon']) 53 ->with(['coupon'])
54 ->where($where) 54 ->where($where)
@@ -11,6 +11,6 @@ return [ @@ -11,6 +11,6 @@ return [
11 'AppSecret' => 'appSecret', 11 'AppSecret' => 'appSecret',
12 'AppId' => 'appId', 12 'AppId' => 'appId',
13 'Phone' => '联系电话', 13 'Phone' => '联系电话',
14 - 'Verification_coupon_id' => '优惠券', 14 + 'Verification_coupon_id' => '礼品券',
15 'Image' => '门店图片' 15 'Image' => '门店图片'
16 ]; 16 ];
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 <div class="form-group"> 51 <div class="form-group">
52 <label class="control-label col-xs-12 col-sm-2">{:__('Verification_coupon_id')}:</label> 52 <label class="control-label col-xs-12 col-sm-2">{:__('Verification_coupon_id')}:</label>
53 <div class="col-xs-12 col-sm-8"> 53 <div class="col-xs-12 col-sm-8">
54 - <input id="c-cerification_coupon_id" data-rule="required" data-source="verification/coupon/index" class="form-control selectpage" name="row[verification_coupon_id]" type="text" value="{$row.verification_coupon_id|htmlentities}"> 54 + <input id="c-cerification_coupon_id" data-rule="required" data-source="verification/coupon/index?verification_store_id={$row.id}" class="form-control selectpage" name="row[verification_coupon_id]" type="text" value="{$row.verification_coupon_id|htmlentities}">
55 </div> 55 </div>
56 </div> 56 </div>
57 <div class="form-group"> 57 <div class="form-group">
@@ -26,6 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -26,6 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
26 [ 26 [
27 {checkbox: true}, 27 {checkbox: true},
28 {field: 'id', title: __('Id')}, 28 {field: 'id', title: __('Id')},
  29 + {field: 'verification_store_id', title: __('verification_store_id')},
29 {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, 30 {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
30 {field: 'store.name', title: __('Store.name'), operate: 'LIKE'}, 31 {field: 'store.name', title: __('Store.name'), operate: 'LIKE'},
31 {field: 'staff.name', title: __('Staff.name'), operate: 'LIKE'}, 32 {field: 'staff.name', title: __('Staff.name'), operate: 'LIKE'},
@@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
28 [ 28 [
29 {checkbox: true}, 29 {checkbox: true},
30 {field: 'id', title: __('Id')}, 30 {field: 'id', title: __('Id')},
  31 + {field: 'verification_store_id', title: __('Verification_store_id')},
31 {field: 'type', title: __('Type'), searchList: {"0":__('Type 0'),"1":__('Type 1'),"2":__('Type 2')}, formatter: Table.api.formatter.normal}, 32 {field: 'type', title: __('Type'), searchList: {"0":__('Type 0'),"1":__('Type 1'),"2":__('Type 2')}, formatter: Table.api.formatter.normal},
32 {field: 'closetime', title: __('Closetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, 33 {field: 'closetime', title: __('Closetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
33 {field: 'receive_no', title: __('Receive_no'), operate: 'LIKE'}, 34 {field: 'receive_no', title: __('Receive_no'), operate: 'LIKE'},