正在显示
2 个修改的文件
包含
10 行增加
和
10 行删除
@@ -12,7 +12,7 @@ use app\common\controller\Backend; | @@ -12,7 +12,7 @@ use app\common\controller\Backend; | ||
12 | class Staff extends Backend | 12 | class Staff extends Backend |
13 | { | 13 | { |
14 | 14 | ||
15 | - | 15 | + |
16 | /** | 16 | /** |
17 | * Staff模型对象 | 17 | * Staff模型对象 |
18 | * @var \app\admin\model\verification\Staff | 18 | * @var \app\admin\model\verification\Staff |
@@ -107,9 +107,9 @@ class Staff extends Backend | @@ -107,9 +107,9 @@ class Staff extends Backend | ||
107 | ->where($where) | 107 | ->where($where) |
108 | ->order('a.id desc') | 108 | ->order('a.id desc') |
109 | ->paginate($limit); | 109 | ->paginate($limit); |
110 | - | 110 | + |
111 | $row = $list->items(); | 111 | $row = $list->items(); |
112 | - | 112 | + |
113 | foreach($row as $k=>$v){ | 113 | foreach($row as $k=>$v){ |
114 | $row[$k]['send_createtime'] = date('Y-m-d H:i:s',$v['send_createtime']); | 114 | $row[$k]['send_createtime'] = date('Y-m-d H:i:s',$v['send_createtime']); |
115 | $row[$k]['send_result_text'] = $v['send_result']==1?'成功':'失败'; | 115 | $row[$k]['send_result_text'] = $v['send_result']==1?'成功':'失败'; |
@@ -130,25 +130,24 @@ class Staff extends Backend | @@ -130,25 +130,24 @@ class Staff extends Backend | ||
130 | { | 130 | { |
131 | $verification_store_id = request()->param('verification_store_id'); | 131 | $verification_store_id = request()->param('verification_store_id'); |
132 | $send_user_id = request()->param('send_user_id'); | 132 | $send_user_id = request()->param('send_user_id'); |
133 | - | ||
134 | 133 | ||
135 | $this->request->filter(['strip_tags', 'trim']); | 134 | $this->request->filter(['strip_tags', 'trim']); |
136 | if ($this->request->isAjax()) { | 135 | if ($this->request->isAjax()) { |
137 | - | 136 | + |
138 | $where['a.pid'] = $send_user_id; | 137 | $where['a.pid'] = $send_user_id; |
139 | $where['a.verification_store_id'] = $verification_store_id; | 138 | $where['a.verification_store_id'] = $verification_store_id; |
140 | $field = "a.*"; | 139 | $field = "a.*"; |
141 | - | 140 | + |
142 | $list = \think\Db::name('user') | 141 | $list = \think\Db::name('user') |
143 | ->alias('a') | 142 | ->alias('a') |
144 | ->field($field) | 143 | ->field($field) |
145 | - | 144 | + |
146 | ->where($where) | 145 | ->where($where) |
147 | ->order('a.id desc') | 146 | ->order('a.id desc') |
148 | ->paginate(); | 147 | ->paginate(); |
149 | - | 148 | + |
150 | $row = $list->items(); | 149 | $row = $list->items(); |
151 | - | 150 | + |
152 | foreach($row as $k=>$v){ | 151 | foreach($row as $k=>$v){ |
153 | $row[$k]['updatetime'] = date('Y-m-d H:i:s',$v['updatetime']); | 152 | $row[$k]['updatetime'] = date('Y-m-d H:i:s',$v['updatetime']); |
154 | } | 153 | } |
@@ -39,7 +39,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin | @@ -39,7 +39,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin | ||
39 | {field: 'phone', title: __('Phone'), operate: 'LIKE'}, | 39 | {field: 'phone', title: __('Phone'), operate: 'LIKE'}, |
40 | {field: 'store.name', title: __('Store.name'), operate: 'LIKE'}, | 40 | {field: 'store.name', title: __('Store.name'), operate: 'LIKE'}, |
41 | {field: 'coupon.name', title: __('Coupon.name'), operate: 'LIKE'}, | 41 | {field: 'coupon.name', title: __('Coupon.name'), operate: 'LIKE'}, |
42 | - {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1')}, formatter: Table.api.formatter.toggle,yes:"0",no:"1"}, | 42 | + {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1')}, formatter: Table.api.formatter.normal}, |
43 | + | ||
43 | {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} | 44 | {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} |
44 | ] | 45 | ] |
45 | ] | 46 | ] |
-
请 注册 或 登录 后发表评论