bug修改

application/app_broker/view/index/customerinfo_genjin.html

@@ -102,7 +102,7 @@
 			</div>
 		</div>
 
-		<script src="/app/js/libs/require.min.js" data-js="/app/js/customer_gj.js" data-main="/app/js/main" defer async="true"></script>
+		<script src="/app/js/libs/require.min.js" data-js="/app/js/customer_gj.js?new1" data-main="/app/js/main" defer async="true"></script>
 		<script type="text/x-template" id="imgShow1">
 			<div class="sc_img">
 				<img :src="data.url" class="preview">

public/app/js/customerinfo_details_new.js

@@ -8,10 +8,14 @@ $(function(){
 
 	if(_token !== null) {
 		h5PageC(_token, function(data) {
+			if(Number(localStorage.getItem('userid'))){
 				loadMain();
+			}else{
+				layerTipsX('登录信息有误，请重新登录');
+			}
 		});
 	} else {
-		loadMain();
+		layerTipsX('参数错误，请重新登录');
 	};
 
 	//返回键，和原生对接
@@ -45,7 +49,7 @@ function loadMain(){
 		_genjinCloseBtn = $('#close_btn'),//跟进模态框关闭按钮
 		_btnSave = $('#btn_save'),//跟进的保存按钮
 		_btnSaveTemp = $('#btn_save_temp'),//跟进保存按钮临时
-		_userId = localStorage.getItem('userid'),//当前用户id
+		_userId = Number(localStorage.getItem('userid')),//当前用户id
 		isCallFlag = true,//是否是电话跟进，默认不是
 		_addPhoneBtn = $('#add_phone_btn'),//添加电话按钮
 		_addPhoneListObj = $('#call_modal_phone_list'),//添加电话列表对象dom
@@ -54,9 +58,14 @@ function loadMain(){
 		_customerPhone = '',//当前客户的手机号
 		_backPhone = '';//绑定之后返回的号码
 	
+	if(_userId){
+		
+	}else{
+		layerTipsX('信息有误，请重新登录');
+	}
 	
 	//获取客户基本信息
-	$.ajax({
+	_userId && $.ajax({
 	    type: 'POST',
 	    url: '/broker/useraction_search',
 	    data: {
@@ -312,7 +321,7 @@ function loadMain(){
 	});
 	
 	//获取跟进标签列表信息
-	$.ajax({
+	_userId && $.ajax({
 	    type: 'GET',
 	    url: ServerHostTempC + '/broker/getULabelsListApp',
 	    data: {
@@ -382,14 +391,14 @@ function loadMain(){
 		e.preventDefault();
 		e.stopPropagation();
 		var _this = $(this);
-		if((_this.attr('data-markid') == '1') || (_this.attr('data-markid') == '4')){
-			//如果选择了未打通，或取消拨打，则直接关闭
-			if(_this.parent().parent().index() === 0){
-				//只有在.genjin-mark-area-putong,电话跟进特有,下的标签才会隐藏
-				_genjinModal.hide();//跟进模态框关闭
-				return false;
-			}
-		};
+//		if((_this.attr('data-markid') == '1') || (_this.attr('data-markid') == '4')){
+//			//如果选择了未打通，或取消拨打，则直接关闭
+//			if(_this.parent().parent().index() === 0){
+//				//只有在.genjin-mark-area-putong,电话跟进特有,下的标签才会隐藏
+//				_genjinModal.hide();//跟进模态框关闭
+//				return false;
+//			}
+//		};
 		if(!_this.hasClass('genjin-mark-active')){
 			_this.addClass('genjin-mark-active').siblings().removeClass('genjin-mark-active');
 		};
@@ -404,21 +413,26 @@ function loadMain(){
 			_genjinMarkOBj2 = $('.genjin-mark-area-putong .genjin-mark-active'),
 			_beizhuObjVal = $.trim(_beizhuObj.val()),
 			_isFreeFlag = true;//是否释放
+//取消自动关闭
+//		if((_genjinMarkOBj2.attr('data-markid') == '1') || (_genjinMarkOBj2.attr('data-markid') == '4')){
+//			//如果选择了未打通，或取消拨打，则直接关闭
+//			if(isCallFlag&&_isFreeFlag){
+//				//释放
+//	            freePhone();
+//			};
+//			_genjinModal.hide();//跟进模态框关闭
+//			return false;
+//		};
 		
 		if((_genjinMarkOBj2.attr('data-markid') == '1') || (_genjinMarkOBj2.attr('data-markid') == '4')){
-			//如果选择了未打通，或取消拨打，则直接关闭
-			if(isCallFlag&&_isFreeFlag){
-				//释放
-	            freePhone();
-			};
-			_genjinModal.hide();//跟进模态框关闭
-			return false;
-		};
 			
+		}else{
 			if(_genjinMarkOBj.length == 0){
 				layerTipsX('请选择状态跟进标签');
 				return false;
 			};
+		};
+		
 		var _data = {
 	    	'AuthToken': _token,
 	    	'content': _beizhuObjVal,
@@ -446,11 +460,6 @@ function loadMain(){
 			}
 		};
 		
-		if(isCallFlag && ((_genjinMarkOBj2.attr('data-markid') == '1') || (_genjinMarkOBj2.attr('data-markid') == '4'))){
-			if(_isFreeFlag) {
-				freePhone();
-			};
-		}else{
 		$.ajax({
 		    type: 'POST',
 		    url: ServerHostTempC + '/broker/add_phone_follow_up',
@@ -496,7 +505,6 @@ function loadMain(){
 		        };
 		    }
 		});
-		}
 		
 	});
 	
@@ -545,7 +553,7 @@ function loadMain(){
 	};
 	
 	//拨打电话模态框，获取电话列表
-	$.ajax({
+	_userId && $.ajax({
 	    type: 'GET',
 	    url: ServerHostTempC + '/broker/agentsPhone',
 	    data: {