Commit 4830f68d authored by hujun's avatar hujun

user_nick to user_name

parent 98718b4e
...@@ -85,7 +85,7 @@ class Remark extends Basic ...@@ -85,7 +85,7 @@ class Remark extends Basic
$where['b.district_id'] = $this->params['remark_district_id']; $where['b.district_id'] = $this->params['remark_district_id'];
} }
$field = 'c.id,a.create_time,a.content,b.name as admin,d.name as label_name,c.user_nick,c.user_phone,a.user_status'; $field = 'c.id,a.create_time,a.content,b.name as admin,d.name as label_name,c.user_name,c.user_phone,a.user_status';
$data['data']['list'] = $u_phone_follow->getFollowList($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where); $data['data']['list'] = $u_phone_follow->getFollowList($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
$data['data']['total'] = $u_phone_follow->getFollowTotal($where); $data['data']['total'] = $u_phone_follow->getFollowTotal($where);
return $this->response(200,'成功',$data); return $this->response(200,'成功',$data);
......
...@@ -18,7 +18,11 @@ ...@@ -18,7 +18,11 @@
[%= it[item]['content'] %] [%= it[item]['content'] %]
</td> </td>
<td>[%= it[item]['admin'] %]</td> <td>[%= it[item]['admin'] %]</td>
<td>[%= it[item]['user_nick'] %]</td> <td>
[% if(it[item]['user_name']) { %]
[%= it[item]['user_name'] %]
[% } %]
</td>
<td>[%= it[item]['user_phone'] %]</td> <td>[%= it[item]['user_phone'] %]</td>
<td> <td>
<a class="btn1 btn-success caozuo" href="#modal-record" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详细信息</a> <a class="btn1 btn-success caozuo" href="#modal-record" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详细信息</a>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment