kaquan-10

@@ -49,7 +49,7 @@ class Order extends Backend
                 return $this->selectpage();
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
-
+           
             $list = $this->model
                     ->with(['store','coupon','activity','user'])
                     ->where($where)

@@ -48,7 +48,7 @@ class Store extends Backend
                 return $this->selectpage();
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
-
+            
             $list = $this->model
                 ->with(['coupon'])
                 ->where($where)

@@ -11,6 +11,6 @@ return [
     'AppSecret' => 'appSecret',
     'AppId' => 'appId',
     'Phone'   => '联系电话',
-    'Verification_coupon_id'   => '优惠券',
+    'Verification_coupon_id'   => '礼品券',
     'Image'   => '门店图片'
 ];

@@ -51,7 +51,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Verification_coupon_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <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}">
+            <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}">
         </div>
     </div>
     <div class="form-group">

@@ -26,6 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
+                        {field: 'verification_store_id', title: __('verification_store_id')},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'store.name', title: __('Store.name'), operate: 'LIKE'},
                         {field: 'staff.name', title: __('Staff.name'), operate: 'LIKE'},

@@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
+                        {field: 'verification_store_id', title: __('Verification_store_id')},
                         {field: 'type', title: __('Type'), searchList: {"0":__('Type 0'),"1":__('Type 1'),"2":__('Type 2')}, formatter: Table.api.formatter.normal},
                         {field: 'closetime', title: __('Closetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'receive_no', title: __('Receive_no'), operate: 'LIKE'},