'312'

@@ -57,7 +57,7 @@ class Coupon extends Backend
                     ->paginate($limit);
 
             foreach ($list as $row) {
-                $row->visible(['id','name','createtime','closetime','updatetime','type','voucher_amount','gift','consumption','reduction','consumption_name','image']);
+                $row->visible(['id','name','verification_store_id','createtime','closetime','updatetime','type','voucher_amount','gift','consumption','reduction','consumption_name','image']);
                 $row->visible(['store']);
 				$row->getRelation('store')->visible(['name']);
             }

@@ -65,7 +65,7 @@ class Order extends Backend
 				$row->visible(['activity']);
 				$row->getRelation('activity')->visible(['title']);
 				$row->visible(['user']);
-				$row->getRelation('user')->visible(['username']);
+				$row->getRelation('user')->visible(['nickname']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

@@ -65,7 +65,7 @@ class Receive extends Backend
 				$row->visible(['order']);
 				$row->getRelation('order')->visible(['order_no']);
 				$row->visible(['user']);
-				$row->getRelation('user')->visible(['username']);
+				$row->getRelation('user')->visible(['nickname']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

@@ -57,11 +57,11 @@ class Staff extends Backend
                     ->paginate($limit);
 
             foreach ($list as $row) {
-                $row->visible(['id','name','phone','verification_store_id','type']);
+                $row->visible(['id','name','phone','user_id','verification_store_id','type']);
                 $row->visible(['store']);
 				$row->getRelation('store')->visible(['name']);
 				$row->visible(['user']);
-				$row->getRelation('user')->visible(['username']);
+				$row->getRelation('user')->visible(['nickname']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

@@ -19,5 +19,5 @@ return [
     'Store.name'               => '门店名称',
     'Coupon.name'              => '卡卷名称',
     'Activity.title'           => '活动标题',
-    'User.username'            => '用户名'
+    'User.nickname'            => '用户名'
 ];

@@ -17,5 +17,5 @@ return [
     'Store.name'             => '门店名称',
     'Coupon.name'            => '卡卷名称',
     'Order.order_no'         => '订单编号',
-    'User.username'          => '用户名'
+    'User.nickname'          => '用户名'
 ];

@@ -13,5 +13,5 @@ return [
     'Type 3'                => '代理人&核销员',
     'Type 4'                => '电销',
     'Store.name'            => '门店名称',
-    'User.username'         => '用户名'
+    'User.nickname'         => '用户名'
 ];

@@ -39,7 +39,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'store.name', title: __('Store.name'), operate: 'LIKE'},
                         {field: 'coupon.name', title: __('Coupon.name'), operate: 'LIKE'},
                         {field: 'activity.title', title: __('Activity.title'), operate: 'LIKE'},
-                        {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
+                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]

@@ -31,12 +31,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {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'},
-                        {field: 'qr_code', title: __('Qr_code'), operate: 'LIKE'},
+                        {field: 'qr_code', title: __('Qr_code'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'store.name', title: __('Store.name'), operate: 'LIKE'},
                         {field: 'coupon.name', title: __('Coupon.name'), operate: 'LIKE'},
                         {field: 'order.order_no', title: __('Order.order_no'), operate: 'LIKE'},
-                        {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
+                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]

@@ -26,12 +26,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
+                        {field: 'user_id', title: __('User_id'), operate: 'LIKE'},
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
                         {field: 'phone', title: __('Phone'), operate: 'LIKE'},
                         {field: 'verification_store_id', title: __('Verification_store_id')},
                         {field: 'type', title: __('Type'), searchList: {"0":__('Type 0'),"1":__('Type 1'),"2":__('Type 2'),"3":__('Type 3'),"4":__('Type 4')}, formatter: Table.api.formatter.normal},
                         {field: 'store.name', title: __('Store.name'), operate: 'LIKE'},
-                        {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
+                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]