Merge branch 'test'

application/index/service/UserLogService.php

@@ -242,13 +242,14 @@ class  UserLogService
     {
 
         //查询客户详情
-        $field = 'id as user_id,sex,user_pic,user_nick,user_name,user_phone,site_ids,agent_id,user_label,industry_type,price_demand,area_demand,vip,user_status';
+        $field = 'id as user_id,sex,user_pic,other_pic,user_nick,user_name,user_phone,site_ids,agent_id,user_label,industry_type,price_demand,area_demand,vip,user_status';
         $result = $this->userModel->getUserDetailStreamline($user_id,$field);
 
         if (count($result) <= 0) {
             return ["code" => 101, "msg" => "没找到此条用户信息"];
         }
-        $result['user_pic'] = HEADERIMGURL . $result['user_pic'];
+        $result['user_pic'] = !empty($result["user_pic"]) ? HEADERIMGURL . $result["user_pic"] : $result["other_pic"];
+
         #判断是否纯房东 0:否 1：是
         $result['is_single_homeowner'] = $result['user_label'] == 2 ? 1 : 0 ;
 

public/resource/js/RemarkFollowIndex.js

@@ -1662,8 +1662,8 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
 			var end_time =date_end.getTime();
 			//时间差
 			var cha_time=end_time-start_time;
-			if(cha_time > 2678400000){
-				alert("跟进时间搜索控制在30天以内");
+			if(cha_time > 777600000){
+				alert("跟进时间搜索控制在10天以内");
 				return;
 			}
 			//客户跟进列表 搜索时 防重复提交