客户查看记录

application/index/view/global/frame_tpl.html

@@ -10,7 +10,7 @@
 	    <link rel="stylesheet" href="/resource/css/bootstrap-theme.min.css">
 	    <link rel="stylesheet" href="/resource/css/bootstrap-datetimepicker.min.css">
 	    <link rel="stylesheet" href="/resource/css/b-liu.tabs.css">
-        <!--<link rel="stylesheet" href="/resource/lib/UEditor/themes/default/css/umeditor.css">-->
+	    <script type="text/javascript" charset="utf-8" src="/resource/lib/js/jquery-2.0.3.min.js"></script>
         
 	    
 	    <title>同联商业</title>

application/index/view/global/frame_two_tpl.html

@@ -10,7 +10,6 @@
     <link rel="stylesheet" href="/resource/css/bootstrap-theme.min.css">
     <link rel="stylesheet" href="/resource/css/bootstrap-datetimepicker.min.css">
     <link rel="stylesheet" href="/resource/css/b-liu.tabs.css">
-	<script type="text/javascript" charset="utf-8" src="/resource/lib/js/jquery-2.0.3.min"></script>
 	<!--<script type="text/javascript" charset="utf-8" src="/resource/lib/ueditor/ueditor.all.min.js"></script>
 	<script type="text/javascript" src="/resource/lib/ueditor/lang/zh-cn/zh-cn.js"></script>-->
 

application/index/view/houses/houseList.html

@@ -705,7 +705,12 @@
 		                        <th class="text-center">查看端口</th>
 		                    </tr>
 	                    </thead>
-	                    <tbody class="text-center" id="caozuo_table_kehu">
+	                    <tbody class="text-center" id="caozuo_table_kehu"></tbody>
+	                    	<tr class="text-center is-show-more-followlog">
+								<td colspan="4">
+									<span class="user-log-more text-info" style="cursor: pointer;">点击加载更多</span>
+								</td>
+							</tr>
                     </table>
             	</div>
             	

public/resource/js/financial_daily_list.js

@@ -131,6 +131,12 @@ define(['doT', 'text!temp/financial_daily_list_template_tpl.html', 'css!style/ho
                 'site_id':$('#financial_city_choose').val(),
                 
 			};
+			if($("#district_id2_city").val()){
+				if(!$("select[name='district_id']").val()){
+				   alert('请选择部门进行搜索');
+				   return
+				}
+			}
 			$.ajax({
 				type: 'GET',
 				url: '/index/dailyList',

public/resource/js/houseList.js

@@ -47,6 +47,7 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 		agent_id_choose_p:'',
 		generalize_id:1,
 		detailTabIndexTuiGuang:0,
+		pageNoUser:1,
 		init: function() {
 			//初始化dot
 			
@@ -150,6 +151,12 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 			_doc.delegate(".addphone-agent", "click", function() { //客户列表 客户员工 下拉式 搜索 点击li事件 获取id ul消失
 				business.addphoneAgent(this);
 			});
+			//客户浏览商铺动态 加载更多
+			_doc.on('click', '.user-log-more', function(e) {
+				e.preventDefault();
+				e.stopPropagation();
+				business.Caozuokehu(business.pageNoUser++)
+			});
 			//切换 不同的推广 类型
 			_doc.on('click', '.tuiguang-type>a', function(e){
 				e.preventDefault();
@@ -508,7 +515,9 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 				if(business.detailTabIndex  == 5){//商铺视频
 				      business.shopVideo();
 				};
-				if(business.detailTabIndex  == 6){//商铺视频
+				if(business.detailTabIndex  == 6){//客户浏览商铺
+					  $("#caozuo_table_kehu").html('');
+					  business.pageNoUser = 1;
 				      business.Caozuokehu();
 				};
 				
@@ -1103,15 +1112,20 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 				'url': '/broker/getUserLookShopList', 
 				data: {
 					"house_id": business.house_id,
-					"pageNo": 1,
-					"pageSize": 1000,
+					"pageNo": business.pageNoUser,
+					"pageSize": 30,
 					"AuthToken": user_info_obj.AuthToken
 					
 				},
 				dataType: "json",
 				success: function(data) {
 					if(data.code == 200) {
-						if(data.data) {
+						if(data.data.length == 30){
+							$(".is-show-more-followlog").show();
+						}else{
+							$(".is-show-more-followlog").hide();
+						}
+						if(data.data.length) {
 							$.each(data.data, function(i, item) {
 //								"type" = >1 //1app 2小程序 3微信
 								if(item.type == 1){
@@ -1121,15 +1135,18 @@ define(['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css', 'ckfin
 								}else{
 									var type_ = '微信'
 								}
-								caozuo_table += '<tr><td>' + item.look_day + '</td> <td>' + item.id + '</td> <td>' + (item.user_id == 0 ?'' : item.user_id) + '</td> <td>' + type_ +'</td></tr>'
+								caozuo_table += '<tr><td>' + item.look_day + '</td> <td>' + item.house_id + '</td> <td>' + (item.user_id == 0 ?'' : item.user_id) + '</td> <td>' + type_ +'</td></tr>'
 							});
 							if(caozuo_table){
-							   $("#caozuo_table_kehu").html(caozuo_table);
+							   $("#caozuo_table_kehu").append(caozuo_table);
+							}
+
 						}else{
+						  if(business.pageNoUser == 1){
 							      $("#caozuo_table_kehu").html('<tr><td colspan="4">暂无数据</td></tr>');
 							}	
-
 						}
+						
 					} else {
 						alert('获取失败！');
 					}

public/resource/js/openCheckList.js

@@ -553,6 +553,12 @@ define(['doT', 'text!temp/open_check_template_tpl.html', 'css!style/home.css', '
 			var params = that.buildSearchParams(0);
 			params.pageNo = that.pageNo;
 			params.pageSize = that.pageSize ;
+			if($("#district_id2_city").val()){
+				if(!$("#commit_home").val()){
+				   alert('请选择部门进行搜索');
+				   return
+				}
+			}
 			$.get(refund.url,params,function(data){
 				if(typeof data === 'object') {
 					if(data.code == 200) {

public/resource/js/reportListShop.js

@@ -2137,6 +2137,12 @@ define(['doT', 'text!temp/reportList_shop_template_tpl.html', 'css!style/home.cs
                 
                 
 			};
+			if($("#district_id2_city").val()){
+				if(!$("select[name='district_id']").val()){
+				   alert('请选择部门进行搜索');
+				   return
+				}
+			}
 			$.ajax({
 				type: 'GET',
 				url: bargain.switchUrl(),