样式优化

application/index/view/cell_phone/index.html

@@ -365,8 +365,8 @@
 
 <!--客户详情 客户跟进  不可编辑-->
 <div class="modal fade" id="modal-record" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-	<div class="modal-dialog">
-		<div class="modal-content modal-body-details">
+	<div class="modal-dialog modal-body-details">
+		<div class="modal-content">
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
                     ×
@@ -376,8 +376,8 @@
                    <a href="javascript:;" class="btn btn-info caozuo-yue">约带看</a>
                 </h4>
 				<div class="user_up_con">
-					<span id="user_up" class="ld-Marheight text-primary ld-Marheight">上一条客户</span>
-					<span id="user_down" class="ld-Marheight text-primary ld-Marheight">下一条客户</span>
+					<!--<span id="user_up" class="ld-Marheight text-primary ld-Marheight">上一条客户</span>
+					<span id="user_down" class="ld-Marheight text-primary ld-Marheight">下一条客户</span>-->
 				</div>
 			</div>
 			<div class="modal-body modal-body1">

application/index/view/member/users_list.html

@@ -668,8 +668,8 @@
 
 <!--客户详情 客户跟进  不可编辑-->
 <div class="modal fade" id="modal-record" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-	<div class="modal-dialog">
-		<div class="modal-content modal-body-details">
+	<div class="modal-dialog modal-body-details">
+		<div class="modal-content">
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
                     ×
@@ -1126,8 +1126,8 @@
 </div>
 <!--客户编辑-->
 <div class="modal fade" id="modal-record-edit" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-	<div class="modal-dialog">
-		<div class="modal-content modal-body-details">
+	<div class="modal-dialog modal-body-details">
+		<div class="modal-content">
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
                     ×

application/index/view/myCollectionUser/myCollectionUserList.html

@@ -344,8 +344,8 @@
 </div>
 <!--客户详情 客户跟进  不可编辑-->
 <div class="modal fade" id="modal-record" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-	<div class="modal-dialog">
-		<div class="modal-content modal-body-details">
+	<div class="modal-dialog modal-body-details">
+		<div class="modal-content">
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
                     ×
@@ -355,8 +355,8 @@
                    <a href="javascript:;" class="btn btn-info caozuo-yue">约带看</a>
                 </h4>
 				<div class="user_up_con">
-					<span id="user_up" class="ld-Marheight text-primary ld-Marheight">上一条客户</span>
-					<span id="user_down" class="ld-Marheight text-primary ld-Marheight">下一条客户</span>
+					<!--<span id="user_up" class="ld-Marheight text-primary ld-Marheight">上一条客户</span>
+					<span id="user_down" class="ld-Marheight text-primary ld-Marheight">下一条客户</span>-->
 				</div>
 			</div>
 			<div class="modal-body modal-body1">
@@ -798,8 +798,8 @@
 </div>
 <!--客户编辑-->
 <div class="modal fade" id="modal-record-edit" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-	<div class="modal-dialog">
-		<div class="modal-content modal-body-details">
+	<div class="modal-dialog modal-body-details">
+		<div class="modal-content">
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
                     ×

application/index/view/realtime/realtimePerformance.html

@@ -4,15 +4,19 @@
 	.left{
 		float: left;
 	}
-	.modal-body-width{
-		width: 900px;
-		height: 800px;
+	.modal-body-width-w{
+		width: 850px;
+	}
+	.modal-body-width-h{
+		height: 680px;
 		overflow-y: scroll;
 	}
 	/*二级弹窗*/
-	.modal-body-width-two{
+	.modal-body-width-two-w{
 		width: 800px;
-		height: 700px;
+	}
+	.modal-body-width-two-h{
+		height: 600px;
 		overflow-y: scroll;
 	}
 	#rank_start_day,#rank_end_day,#performance_ranking{
@@ -90,8 +94,8 @@
 </div>
 <!-- 弹出框 门店业绩排行 详情 -->
 <div class="modal fade" id="modal-store" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-    <div class="modal-dialog">
-        <div class="modal-content modal-body-width">
+    <div class="modal-dialog modal-body-width-w">
+        <div class="modal-content modal-body-width-h">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
                     ×
@@ -113,8 +117,8 @@
 
 <!-- 弹出框 经纪人业绩排行 详情 -->
 <div class="modal fade" id="modal-agent" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-    <div class="modal-dialog">
-        <div class="modal-content modal-body-width">
+    <div class="modal-dialog modal-body-width-w">
+        <div class="modal-content modal-body-width-h">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
                     ×
@@ -136,8 +140,8 @@
 
 <!-- （点击门店名字）弹出框 经纪人业绩(二级)排行 详情 -->
 <div class="modal fade" id="modal-agent-two" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-    <div class="modal-dialog">
-        <div class="modal-content modal-body-width-two">
+    <div class="modal-dialog modal-body-width-two-w">
+        <div class="modal-content modal-body-width-two-h">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
                     ×

application/index/view/remark/remark_follow_index.html

@@ -393,8 +393,8 @@
 
 <!--客户详情 客户跟进  不可编辑-->
 <div class="modal fade" id="modal-record" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-	<div class="modal-dialog">
-		<div class="modal-content modal-body-details">
+	<div class="modal-dialog modal-body-details">
+		<div class="modal-content">
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
                     ×

public/resource/js/RemarkFollowIndex.js

@@ -687,27 +687,39 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'ckfinder', 'ckfinde
 				return false;
 			}
 
-			$.ajax({
-				url: '/index/pcAddFollow',
-				type: 'POST',
-				async: true,
-				data: {
-					"user_id": user.user_id,
-					"content": genj_text,
-					"user_status": user_status
-				},
-				dataType: 'json',
-				success: function(data) {
-					if(data.code == 200) {
-						alert('修改成功');
-						user.getGenjincon();
-						$('#genj_text').val('');
-//						$("#modal-record").modal('hide');
-					} else {
-						alert(data.msg);
-					}
-				}
-			});
+            if(!user.isAjaxSaving){
+					user.isAjaxSaving = true;
+					$.ajax({
+						url: '/index/pcAddFollow',
+						type: 'POST',
+						async: true,
+						timeout: 30000,
+						data: {
+							"user_id": user.user_id,
+							"content": genj_text,
+							"user_status": user_status
+						},
+						beforeSend: function() {},
+						dataType: 'json',
+						success: function(data) {
+							if(data.code == 200) {
+								alert('修改成功');
+								user.isAjaxSaving = false;//请求结束，再改为初始状态
+								user.getGenjincon();
+								$('#genj_text').val('');
+			//						$("#modal-record").modal('hide');
+							} else {
+								alert(data.msg);
+							}
+						},
+						complete: function(xhr, textStatus){
+					        if(textStatus === 'timeout'){
+					            layerTipsX('请求超时');
+					        };
+					    }
+						
+				});
+		  }
 		},
 
 		// 
@@ -1149,7 +1161,11 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'ckfinder', 'ckfinde
 						//客户动态 即跟进
 						var caozuo_table = "";
 						$.each(data['data']['user_date'], function(i, item) {
-							caozuo_table += '<tr><td class="text-left follow-up-home" width="70%">' + item.step + '</td><td>' + item.name + '</td><td>' + item.create_time + '</td></tr>';
+							if(item.step_name=='report'){
+							caozuo_table += '<tr><td class="text-left follow-up-home" width="70%">' + item.step+'到场时间：'+ item.predict_see_time +'备注：'+item.intro+ '</td><td>' + item.name + '</td><td>' + item.create_time + '</td></tr>';	
+							}else{
+							caozuo_table += '<tr><td class="text-left follow-up-home" width="70%">' + item.step+ '</td><td>' + item.name + '</td><td>' + item.create_time + '</td></tr>';	
+							}
 						});
 						if(caozuo_table){
 						        $("#caozuo_table2").html(caozuo_table);

public/resource/js/user.js

@@ -699,6 +699,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 			params.industry_type = $(".industry_type_two_1").val();
 			params.price_demand = $(".price_demand_1").val();
 			params.area_demand = $(".area_demand_1").val();
+			
 			if($('#user_city_edit').val() == 310100){
 			   params.city = '上海市'	;
 			   params.province = '上海市'	;
@@ -744,28 +745,39 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 				alert('状态标签未选中');
 				return false;
 			}
-
-			$.ajax({
-				url: '/index/pcAddFollow',
-				type: 'POST',
-				async: true,
-				data: {
-					"user_id": user.user_id,
-					"content": genj_text,
-					"user_status": user_status
-				},
-				dataType: 'json',
-				success: function(data) {
-					if(data.code == 200) {
-						alert('修改成功');
-						user.getGenjincon();
-						$('#genj_text').val('');
-//						$("#modal-record").modal('hide');
-					} else {
-						alert(data.msg);
-					}
-				}
+			if(!user.isAjaxSaving){
+				user.isAjaxSaving = true;
+				$.ajax({
+					url: '/index/pcAddFollow',
+					type: 'POST',
+					async: true,
+					timeout: 30000,
+					data: {
+						"user_id": user.user_id,
+						"content": genj_text,
+						"user_status": user_status
+					},
+					beforeSend: function() {},
+					dataType: 'json',
+					success: function(data) {
+						if(data.code == 200) {
+							alert('修改成功');
+							user.isAjaxSaving = false;//请求结束，再改为初始状态
+							user.getGenjincon();
+							$('#genj_text').val('');
+		//						$("#modal-record").modal('hide');
+						} else {
+							alert(data.msg);
+						}
+					},
+					complete: function(xhr, textStatus){
+				        if(textStatus === 'timeout'){
+				            layerTipsX('请求超时');
+				        };
+				    }
+					
 			});
+		  }
 		},
 
 		// 
@@ -1092,6 +1104,11 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 				$("#user_vip").focus();
 				return;
 			}
+			if(params.agents_id==''){
+				alert('请选择正确的客方');
+				return;
+				
+			}
 
 
 
@@ -1236,7 +1253,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 							if(item.step_name=='report'){
 							caozuo_table += '<tr><td class="text-left follow-up-home" width="70%">' + item.step+'到场时间：'+ item.predict_see_time +'备注：'+item.intro+ '</td><td>' + item.name + '</td><td>' + item.create_time + '</td></tr>';	
 							}else{
-							caozuo_table += '<tr><td class="text-left" width="70%">' + item.step+ '</td><td>' + item.name + '</td><td>' + item.create_time + '</td></tr>';	
+							caozuo_table += '<tr><td class="text-left follow-up-home" width="70%">' + item.step+ '</td><td>' + item.name + '</td><td>' + item.create_time + '</td></tr>';	
 							}
 							
 						});