user_nick to user_name

application/index/controller/Remark.php

@@ -85,7 +85,7 @@ class Remark extends Basic
             $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']['total'] = $u_phone_follow->getFollowTotal($where);
         return $this->response(200,'成功',$data);

public/resource/template/remark_follow_template_tpl.html

@@ -18,7 +18,11 @@
             [%= it[item]['content'] %]
         </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>
             <a class="btn1 btn-success caozuo" href="#modal-record" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详细信息</a>