客户详情优化

application/index/view/member/users_list.html

@@ -888,7 +888,7 @@
 	                		<span class="text-info">客户动态</span>
 	                	    <span>带看动态</span>
 	                	</span>
-	                	<span class="user-log-more text-info" style="float: right;">加载更多</span>
+	                	
                 </div>
 						<div id="gen_jing_user">
 							<div>
@@ -896,6 +896,11 @@
 								<table class="table table-striped table-bordered table-hover table-condensed">
 									<tbody class="text-center" id="caozuo_table2">
 									</tbody>
+									<tr class="text-center is-show-more-followlog">
+										<td colspan="3">
+											<span class="user-log-more text-info" style="cursor: pointer;">加载更多</span>
+										</td>
+									</tr>
 								</table>
 								</div>
 								<div class="follow-up-modal-list-area" style="height: 212px">

application/index/view/remark/remark_follow_index.html

@@ -607,7 +607,7 @@
 	                		<span class="text-info">客户动态</span>
 	                	    <span>带看动态</span>
 	                	</span>
-	                	<span class="user-log-more text-info" style="float: right;">加载更多</span>
+	                	<!--<span class="user-log-more text-info" style="float: right;">加载更多</span>-->
                         </div>
 						<div id="gen_jing_user">
 						    <div>
@@ -615,6 +615,11 @@
 								<table class="table table-striped table-bordered table-hover table-condensed">
 									<tbody class="text-center" id="caozuo_table2">
 									</tbody>
+									<tr class="text-center">
+										<td colspan="3">
+											<span class="user-log-more text-info" style="cursor: pointer;">加载更多</span>
+										</td>
+									</tr>
 								</table>
 								</div>
 								<div class="follow-up-modal-list-area" style="height: 212px">

public/resource/js/RemarkFollowIndex.js

@@ -2004,6 +2004,8 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
 				dataType: 'json',
 				success: function(data) {
 					if(data.code == 200 && data.data != null) {
+						    $('.is-show-more-followlog').show();
+						
 							//客户动态 即跟进
 							var caozuo_table = "";
 							$.each(data['data'], function(i, item) {
@@ -2031,6 +2033,8 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
 						}else{
 							if(user.pageNoUser==1){
 							  $("#caozuo_table2").html('暂无跟进信息');
+						      $('.is-show-more-followlog').hide();
+							  
 							};
 							if(user.moreUser){
 								alert('暂无跟进信息!!!');
@@ -2060,6 +2064,8 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
 						$.each(data['data'], function(i, item) {
 							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 if(item.step_name=='follow_up_log'){
+							caozuo_table += '<tr><td class="text-left follow-up-home" width="70%">报备跟进' + item.step+'属于哪类客户：'+ item.user_type + '</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>';	
 							}

public/resource/js/user.js

@@ -2284,6 +2284,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 				dataType: 'json',
 				success: function(data) {
 					if(data.code == 200 && data.data != null) {
+						$('.is-show-more-followlog').show();
 						//客户动态 即跟进
 						var caozuo_table = "";
 						$.each(data['data'], function(i, item) {
@@ -2304,13 +2305,15 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 						        $("#caozuo_table2").append(caozuo_table);
 						}else{
 						        $("#caozuo_table2").html('暂无跟进信息');
+						        
 						}
 						//滚动条 回到顶部
-//						$('.follow-up-modal-list-area').scrollTop(0);
+						$('.follow-up-modal-list-area').scrollTop(0);
 						
 					}else{
 							if(user.pageNoUser==1){
 						        $("#caozuo_table2").html('暂无跟进信息');
+						        $('.is-show-more-followlog').hide();
 							}
 							if(user.moreUser){
 								alert('暂无跟进信息!!!');
@@ -2340,6 +2343,8 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 						$.each(data['data'], function(i, item) {
 							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 if(item.step_name=='follow_up_log'){
+							caozuo_table += '<tr><td class="text-left follow-up-home" width="70%">报备跟进' + item.step+'属于哪类客户：'+ item.user_type + '</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>';	
 							}