Merge branch 'test' into chat_0705

application/index/controller/Remark.php

@@ -87,6 +87,11 @@ class Remark extends Basic
 
         $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);
+
+        foreach ($data['data']['list'] as $k=>$v) {
+            $data['data']['list'][$k]['user_phone'] = hide_customer_phone($data['data']['list'][$k]['user_phone']);
+        }
+        
         $data['data']['total'] = $u_phone_follow->getFollowTotal($where);
         return $this->response(200,'成功',$data);
     }

application/model/GHouses.php

@@ -827,8 +827,8 @@ class GHouses extends BaseModel
         if (isset($params["status"])) {
             $where_["a.status"] = $params["status"];
         }
-        if (isset($params["create_time"])) {
-            $where_["a.create_time"] = $params["create_time"];
+        if (isset($params["update_time"])) {
+            $where_["a.update_time"] = $params["update_time"];
         }
         if (isset($params["is_execute"])) {
             $where_["a.is_execute"] = $params["is_execute"];

public/resource/template/remark_follow_template_tpl.html

@@ -23,7 +23,8 @@
                 [%= it[item]['user_name'] %]
             [% } %]
         </td>
-        <td>[%= it[item]['user_phone'] %]</td>
+        <!--<td>[%= it[item]['user_phone'] %]</td>-->
+        <td>[%= hideTel(it[item]['user_phone']) %]</td>
         <td>
             <a class="btn1 btn-success caozuo" href="#modal-record" data-toggle="modal" data-id='[%= it[item]["id"] %]'>详细信息</a>
         </td>