city

public/resource/js/myCollectionOfficeList.js

@@ -221,7 +221,8 @@ define(['doT', 'text!temp/my_collection_office_template_tpl.html', 'css!style/ho
 			params.pageNo = house.pageNo;
 			params.pageSize = house.pageSize;
 			params.AuthToken = user_info_obj.AuthToken;
-			params.agents_id = $('#user_city').val();
+			params.agents_id = user_info_obj.id;
+			params.city = $('#user_city').val();
 			params.from =1;
 			
 			$.ajax({
@@ -274,11 +275,11 @@ define(['doT', 'text!temp/my_collection_office_template_tpl.html', 'css!style/ho
 							//获取转勤账号
 							var _str = '';
 							$.each(data.data, function(i, item) {
-								_str += '<option value="' + item.id + '">' + item.city + '</option>';
+								_str += '<option value="' + item.city + '">' + item.city + '</option>';
 							});
 							$('#user_city').html(_str);
 							//默认显示本账号所在城市
-							$('#user_city').val(user_info_obj.id);
+							$('#user_city').val(user_info_obj.city);
 							
 							house.getList(1);//搜索列表
 						} else {

public/resource/js/myCollectionShopList.js

@@ -222,8 +222,9 @@ define(['doT', 'text!temp/my_collection_shop_template_tpl.html', 'css!style/home
 			params.pageNo = house.pageNo;
 			params.pageSize = house.pageSize;
 			params.AuthToken = user_info_obj.AuthToken;
-//			params.agents_id = user_info_obj.id;
-			params.agents_id = $('#user_city').val();//城市筛选
+			params.agents_id = user_info_obj.id;
+			params.city = $('#user_city').val();
+//			params.agents_id = $('#user_city').val();//城市筛选
 			params.from =1;
 			
 			
@@ -277,12 +278,11 @@ define(['doT', 'text!temp/my_collection_shop_template_tpl.html', 'css!style/home
 							//获取转勤账号
 							var _str = '';
 							$.each(data.data, function(i, item) {
-								_str += '<option value="' + item.id + '">' + item.city + '</option>';
+								_str += '<option value="' + item.city + '">' + item.city + '</option>';
 							});
 							$('#user_city').html(_str);
 							//默认显示本账号所在城市
-							$('#user_city').val(user_info_obj.id);
-							
+							$('#user_city').val(user_info_obj.city);
 							house.getList(1);//搜索列表
 						} else {
 							alert(data['msg']);

public/resource/js/myCollectionUserList.js

@@ -1529,8 +1529,8 @@ define(['doT', 'text!temp/my_collection_user_template_tpl.html', 'css!style/home
             //商铺 办公楼
             
             params.entrust_type = user.entrust_type_list;
-//          params.agents_id   = user_info_obj.id;
-            params.agents_id   = $('#user_city').val();
+            params.agents_id   = user_info_obj.id;
+            params.site_id   = $('#user_city').val();
             params.pageNo   = user.pageNo;
             params.pageSize = user.pageSize;
             params.AuthToken = user_info_obj.AuthToken;
@@ -1577,13 +1577,13 @@ define(['doT', 'text!temp/my_collection_user_template_tpl.html', 'css!style/home
 							//获取转勤账号
 							var _str = '';
 							$.each(data.data, function(i, item) {
-								_str += '<option value="' + item.id + '">' + item.city + '</option>';
+								_str += '<option value="' + item.site_id + '">' + item.city + '</option>';
 							});
 							$('#user_city').html(_str);
 							//默认显示本账号所在城市
-							$('#user_city').val(user_info_obj.id);
+							$('#user_city').val(user_info_obj.site_id);
 							
-							house.getList(1);//搜索列表
+							user.getList(1);//搜索列表
 						} else {
 							alert(data['msg']);
 						};

public/resource/template/my_collection_user_template_tpl.html

 <script id="my_collection_user_list_tpl" type="text/template">
 	[% var delName=function(s){ delete s.user_name; delete s.user_nick;return s}; %]
-    [% if(it) { %]
+    [% if(it && it.length) { %]
     [% for(var item in it){ %]
     <tr>