修改

application/index/view/remark/remark_follow_index.html

@@ -615,7 +615,7 @@
 								<table class="table table-striped table-bordered table-hover table-condensed">
 									<tbody class="text-center" id="caozuo_table2">
 									</tbody>
-									<tr class="text-center">
+									<tr class="text-center is-show-more-followlog">
 										<td colspan="3">
 											<span class="user-log-more text-info" style="cursor: pointer;">加载更多</span>
 										</td>

public/resource/js/RemarkFollowIndex.js

@@ -2005,7 +2005,12 @@ 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();
+						    if(data.data.length == 30){
+						       $('.is-show-more-followlog').show();
+						    }else{
+						       $('.is-show-more-followlog').hide();
+						    	
+						    };
 						
 							//客户动态 即跟进
 							var caozuo_table = "";
@@ -2020,7 +2025,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
 								}else{
 									var follow_status = '电话跟进:'
 								};
-								caozuo_table += '<tr><td class="text-left follow-up-home" width="70%">' + follow_status + item.content + user_status +'</td><td>' + item.name + '</td><td>' + item.create_time +'</td></tr>';	
+								caozuo_table += '<tr><td class="text-left follow-up-home" width="70%">' + follow_status + dealPunctuation(item.content+'!!!!!') + user_status +'</td><td>' + item.name + '</td><td>' + item.create_time +'</td></tr>';	
 								
 							});
 							if(caozuo_table){
@@ -2064,11 +2069,11 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
 						var caozuo_table = "";
 						$.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>';	
+							caozuo_table += '<tr><td class="text-left follow-up-home" width="70%">' + dealPunctuation(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>';	
+							caozuo_table += '<tr><td class="text-left follow-up-home" width="70%">' + dealPunctuation(item.step+'!!!!!') + '</td><td>' + item.name + '</td><td>' + item.create_time + '</td></tr>';	
 							}
 						});
 						$("#caozuo_table_log").html(caozuo_table);

public/resource/js/user.js

@@ -2284,7 +2284,13 @@ 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();
+						if(data.data.length == 30){
+						       $('.is-show-more-followlog').show();
+						   }else{
+						       $('.is-show-more-followlog').hide();
+						    	
+						   };
+
 						//客户动态 即跟进
 						var caozuo_table = "";
 						$.each(data['data'], function(i, item) {
@@ -2298,7 +2304,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 							}else{
 								var follow_status = '电话跟进:'
 							};
-							caozuo_table += '<tr><td class="text-left follow-up-home" width="70%">' + follow_status + item.content + user_status +'</td><td>' + item.name + '</td><td>' + item.create_time +'</td></tr>';	
+							caozuo_table += '<tr><td class="text-left follow-up-home" width="70%">' + follow_status + dealPunctuation(item.content+'!!!!!') + user_status +'</td><td>' + item.name + '</td><td>' + item.create_time +'</td></tr>';	
 							
 						});
 						if(caozuo_table){
@@ -2342,11 +2348,11 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 						var caozuo_table = "";
 						$.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>';	
+							caozuo_table += '<tr><td class="text-left follow-up-home" width="70%">' + dealPunctuation(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>';	
+							caozuo_table += '<tr><td class="text-left follow-up-home" width="70%">' + dealPunctuation(item.step+'!!!!!')+ '</td><td>' + item.name + '</td><td>' + item.create_time + '</td></tr>';	
 							}
 						});
 						$("#caozuo_table_log").html(caozuo_table);