约带看修改

application/index/view/member/users_list.html

@@ -683,13 +683,13 @@
 					<span class="text-danger">(必填)</span>
 				</div>
 				<table class="table table-striped table-bordered table-hover table-condensed"">
-					<thead>
+					<!--<thead>
 						<tr class="ld-Marheight">
 							<th class="text-center">跟进内容</th>
 							<th class="text-center">跟进人</th>
 							<th class="text-center">跟进时间</th>
 					   </tr>
-					</thead>
+					</thead>-->
 					<tbody class="text-center" id="caozuo_table2"></tbody>
 				</table>
 				      

public/resource/js/getCollection.js

@@ -185,7 +185,9 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
 				success: function(data) {
 					if(data.code == 200) {
 						follow.getList(0);
-					} else {}
+					} else {
+						alert(data.msg)
+					}
 				}
 			});
 		},

public/resource/js/user.js

@@ -164,6 +164,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 			$(document).on("input", ".look-shop", function() { //手机号搜索客方
 				if($(this).val() == '') {
 					$(this).next('.look-shop-ul').html('');
+					$(this).removeAttr("data-id");
 				} else {
 					user.search_phone_look(this);
 				}
@@ -281,12 +282,17 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 			console.log(user_info_obj);
 			var arr_look=[];
 			for(var i=0;i<$('.look-shop').length;i++){
-				if($('.look-shop').eq(i).attr('data-id')){
+				if($('.look-shop').eq(i).attr('data-id')){//如果id为空 不提交空的数据
 				arr_look[i]=$('.look-shop').eq(i).attr('data-id');
 					
 				}
 
 			}
+//			if(user_info_obj.id==1){
+//               alert('当前用户没有权限提交约带看');
+//				 return false;
+//			}
+//			
 			if(arr_look.length<0||arr_look.length==0){
 				alert('请选择约带看商铺');
 				return false;
@@ -320,7 +326,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 				success: function(data) {
 					if(data.code == 200) {
 						alert('提交成功');
-						$("#modal-takeLook").modal('hide');
+						$("#modal-takeLook").modal('hide');//提交成功后 关闭弹窗
 						
 					} else {
 						alert(data.msg);
@@ -757,14 +763,14 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 				},
 				dataType: 'json',
 				success: function(data) {
-					if(data.code == 200 && data.data != null) {
+					if(data.code == 200) {
 						$("input[type='radio'][name='user_status'][value=" + data.data + "]").prop("checked", "checked");
                          user.getGenjincon();
 					}
 				}
 			});
 		},
-		getGenjincon: function() {
+		getGenjincon: function() {//获取客户动态
 			$.ajax({
 				url: '/index/useraction_search',
 				type: 'GET',
@@ -780,8 +786,12 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 						$.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>';
 						});
-						console.log(caozuo_table);
-						$("#caozuo_table2").html(caozuo_table);
+						if(caozuo_table){
+						        $("#caozuo_table2").html(caozuo_table);
+						}else{
+						        $("#caozuo_table2").html('暂无跟进信息');
+						}
+
 
 					}
 				}

public/resource/template/inspectionRecord_list_template_tpl.html

@@ -10,7 +10,7 @@
         <td>[%= it[item]['house_title'] %]</td>
         <td>[%= it[item]['predict_see_time'] %]</td>
         <td>
-            <a class="btn1 btn-info timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["report_id"] %]'>时间轴</a>
+            <a class="btn1 btn-info timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a>
         </td>
     </tr>
     [% } %]
@@ -21,16 +21,3 @@
     [% } %]
 </script> 
 
-
-
-
-<!--id	int	报备id
-user_id	int	用户id
-user_phone	string	用户手机号
-user_name	string	用户名
-predict_see_time	time	预计到看时间
-order_id	int	订单id
-order_no	string	订单编号
-house_id	int	楼盘id
-house_title	string	楼盘名
-sign	string	标签-->