Merge branch 'test'

application/api_broker/controller/Client.php

@@ -98,6 +98,9 @@ class Client extends Basic
                     case -3 :
                         $this->code = 101;
                         $this->msg  = '没有新增VIP权限';break;
+                    case -4 :
+                        $this->code = 101;
+                        $this->msg  = '客户信息错误，请检查!';break;
                 }
 
             } else {

application/api_broker/controller/HomePageLog.php

@@ -116,7 +116,7 @@ class HomePageLog extends Basic
         $pageNo   = empty($params['pageNo']) ? 1 : $params['pageNo'];
         $pageSize = empty($params['pageSize']) ? 15 : $params['pageSize'];
 
-        $field = "f.id,f.house_id,f.agent_id,f.follow_up_info,f.create_time,a.name,a.img,b.store_name";
+        $field = "f.id,f.house_id,f.agent_id,f.follow_up_info,f.create_time,a.name,a.img,b.store_name,c.internal_title";
 
         if (!empty($params["search_content"])) {
             $where_["f.follow_up_info"] = array( "like", "%" . trim($params['search_content']) . "%" );
@@ -133,6 +133,7 @@ class HomePageLog extends Basic
         $join   = [
             [ 'a_agents a', 'a.id=f.agent_id', 'left' ],
             [ 'a_store b', 'b.id=a.store_id', 'left' ],
+            [ 'g_houses c', 'f.house_id=c.id', 'left' ]
         ];
         $order  = "f.id desc";
         $result = $this->gHouseFollowUpModel->getSearch($pageNo, $pageSize, $order, $field, $join, $where_, "");

application/model/Users.php

@@ -249,6 +249,9 @@ class Users extends Model
             $insert_data['user_nick'] = $data['user_nick'];
         }
         if (!empty($data['user_phone']) && $id == 0) {
+            if (strlen($data['user_phone']) != 11) {
+                return -4;
+            }
             $insert_data['user_phone'] = $data['user_phone'];
         }
         if (!empty($data['sex'])) {

public/resource/template/followHouseUp_template_tpl.html

@@ -8,8 +8,8 @@
         <td>[%= it[item]['name'] %]</td>
         <td>[%= it[item]['house_id'] %]</td>
         <td>
-        	[% if(it[item]["store_name"] != null) { %]
-        	    [%= it[item]['store_name'] %]
+        	[% if(it[item]["internal_title"] != null) { %]
+        	    [%= it[item]['internal_title'] %]
             [% } %]
         	
         </td>