修改

application/index/view/member/users_list.html

@@ -909,7 +909,7 @@
 							</div>
 							<label class="col-sm-3 control-label">跟进<span class="text-danger">(必填)</span>：</label>
 							<div class="col-sm-9">
-								<textarea class="form-control" rows="3" id="genj_text"></textarea>
+								<textarea class="form-control" rows="2" id="genj_text"></textarea>
 								
 							</div>
 								

public/resource/js/user.js

@@ -583,7 +583,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 			});
 			//查看弹出框里的tab点击事件,查看客户详情，客户约带看
 			_doc.on('click', '.detail-modal-header-tab>a', function(e){
-				console.log(668)
 				e.preventDefault();
 				e.stopPropagation();
 				var _this = $(this);
@@ -2280,9 +2279,13 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 								var user_status = '【已租】'
 							}else{
 								var user_status = '【求租】'
-								
 							};
-							caozuo_table += '<tr><td class="text-left follow-up-home" width="70%">电话跟进:' + item.content + user_status +'</td><td>' + item.name + '</td><td>' + item.create_time +'</td></tr>';	
+							if(item.type*1){
+								var follow_status = '跟进:'
+							}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>';	
 							
 						});
 						if(caozuo_table){
@@ -2346,14 +2349,12 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 					var caozuo_table='';
 					if(data.code == 200 && data.data != null) {
 						//带看动态
-						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>';	
+						    var caozuo_table = "";
+							if(data.data.step_name=='report'){
+							caozuo_table += '<tr><td class="text-left follow-up-home" width="70%">' + data.data.step+'到场时间：'+ data.data.predict_see_time +'备注：'+data.data.intro+ '</td><td>' + data.data.name + '</td><td>' + data.data.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%">' + data.data.step+ '</td><td>' + data.data.name + '</td><td>' + data.data.create_time + '</td></tr>';	
 							}
-						});
 						$(".user-log-detail").html(caozuo_table);
 					}else{
 						$(".user-log-detail").html('暂无带看信息');