bug

application/index/view/houses/HouseFollowUp.html

@@ -71,7 +71,7 @@
 												<select class="form-control btn4 ld-Marheight input" name="" id="guest_stores" value="">
 												</select>-->
 																								<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_name" placeholder="跟进人姓名" type="text" value="">-->
-												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_phone" placeholder="用户姓名或电话" type="text" value="">
+												<input class="form-control btn4 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_phone" placeholder="跟进人姓名或电话" type="text" value="">
 												
 
 												<span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>

application/index/view/member/users_list.html

@@ -207,6 +207,11 @@
 		font-weight: 600;
 		font-size: 36px;
 	}
+	/*客户动态*/
+	.followup-modal-list-area {
+    height: 450px;
+    overflow-y: scroll;
+    }
 </style>
 <!--导航star-->
 
@@ -690,7 +695,8 @@
 							<th class="text-center">跟进时间</th>
 					   </tr>
 					</thead>-->
-					<tbody class="text-center" id="caozuo_table2"></tbody>
+					<tbody class="text-center followup-modal-list-area" id="caozuo_table2">
+					</tbody>
 				</table>
 				      
 				

public/resource/js/user.js

@@ -789,30 +789,23 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 		getGenjincon: function() {//获取客户动态
 			var  user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));  //读取缓存
 			$.ajax({
-//				url: '/index/useraction_search',
-				url: 'broker/useraction_search',
+				url:'/broker/useraction_search',
+//				url: 'https://pre2.tonglianjituan.com'+'/broker/useraction_search',
 				type: 'GET',
 				async: true,
 				data: {
 					"AuthToken": user_info_obj.AuthToken,
-					"searchdate": 1,
 					"user_id": user.user_id,
-					"pagenum": 1,
 					"agent_id": user_info_obj.id
 					
 				},
-//				AuthToken	true	string	token
-//user_id	true	int	客户的ID
-//searchdate	true	int	动态关键字
-//pagenum	false	int	页码：默认第一页
-//agent_id	true	int	经纪人id
 				dataType: 'json',
 				success: function(data) {
 					if(data.code == 200 && data.data != null) {
 						//客户动态 即跟进
 						var caozuo_table = "";
 						$.each(data['data']['user_date'], function(i, item) {
-							caozuo_table += '<tr><td>' + item.content + '</td><td>' + item.agentinfo + '</td><td>' + item.create_time + '</td></tr>';
+							caozuo_table += '<tr><td>' + item.step + '</td><td>' + item.name + '</td><td>' + item.create_time + '</td></tr>';
 						});
 						if(caozuo_table){
 						        $("#caozuo_table2").html(caozuo_table);