Merge branch 'test'

application/index/service/UserService.php

@@ -621,28 +621,10 @@ class UserService
         $nuser_info = $this->user->getUserById($field = 'bind_id', $now_user_id);
         if($nuser_info['bind_id'] == 0){
             $this->user->updateUsers($user_id,$params_);
-            $this->userDoLog($user_id,$nuser_info['bind_id'],$agent_id);
         }else{
             $this->user->updateUsers($now_user_id,$params_);
-            $this->userDoLog($user_id,$now_user_id,$agent_id);
         }
-
-        // 客户bind_id不等于0才能解绑并记录日志
-        // $user_info = $this->user->getUserById($field = 'bind_id', $user_id);
-        // if($user_info['bind_id'] == 0){
-        //     $band_count = $this->user->getUserCountByBandId($field = 'id', $user_id);
-        //     if($band_count == 1){
-        //         $params_['bind_id'] = 0;
-        //         $this->user->updateUsers($now_user_id,$params_);
-        //         return 0;
-        //     }
-        //     return 3;
-        // }else{
-        //     // 解绑操作记录
-        //     $this->userDoLog($user_id,$user_info['bind_id'],$agent_id);
-        // }
-        // $this->userDoLog($user_id,$user_info['bind_id'],$agent_id);
-
+        $this->userDoLog($user_id,$now_user_id,$agent_id);
         return 0;
     }
 

application/index/view/global/footer_tpl.html

-<script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=20190666882' charset='utf-8'></script>
+<script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=20190666888' charset='utf-8'></script>

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 > 777600000){
-				alert("跟进时间搜索控制在10天以内");
+			if(cha_time > 777600000*3){
+				alert("跟进时间搜索控制在30天以内");
 				return;
 			}
 			//客户跟进列表 搜索时 防重复提交