Merge branch 'test' of https://gitee.com/zwyjjc/tl_estate into test

public/resource/js/RemarkFollowIndex.js

@@ -612,9 +612,13 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'ckfinder', 'ckfinde
 			params.area_demand = $(".area_demand_1").val();
 			if($('#user_city_edit').val() == 310100){
 			   params.city = '上海市'	;
+			   params.province = '上海市'	;
+			   
 			}
 			if($('#user_city_edit').val() == 330100){
 			   params.city = '杭州市'	;	
+			   params.province = '浙江省'	;
+			   
 			}
 //			params.city = $("#user_city_edit").val();
 			

public/resource/js/myCollectionUserList.js

@@ -662,9 +662,13 @@ define(['doT', 'text!temp/my_collection_user_template_tpl.html', 'ckfinder', 'ck
 			params.area_demand = $(".area_demand_1").val();
 			if($('#user_city_edit').val() == 310100){
 			   params.city = '上海市'	;
+			   params.province = '上海市'	;
+			   
 			}
 			if($('#user_city_edit').val() == 330100){
-			   params.city = '杭州市'	;	
+			   params.city = '杭州市'	;
+			   params.province = '浙江省'	;
+			   
 			}
 //			params.city = $("#user_city_edit").val();
 			

public/resource/js/user.js

@@ -664,9 +664,14 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 			params.area_demand = $(".area_demand_1").val();
 			if($('#user_city_edit').val() == 310100){
 			   params.city = '上海市'	;
+			   params.province = '上海市'	;
+			   
+			   
 			}
 			if($('#user_city_edit').val() == 330100){
-			   params.city = '杭州市'	;	
+			   params.city = '杭州市'	;
+			   params.province = '浙江省'	;
+			   
 			}
 			
 			params.disc = $("#user_area_edit").val();
@@ -979,9 +984,13 @@ define(['doT', 'text!temp/user_template_tpl.html', 'ckfinder', 'ckfinderStart',
 			params.type = 'add';
 			if($('#user_city_add').val() == 310100){
 			   params.city = '上海市'	;
+			   params.province = '上海市'	;
+			   
 			}
 			if($('#user_city_add').val() == 330100){
 			   params.city = '杭州市'	;	
+			   params.province = '浙江省'	;
+			   
 			}
 			params.disc = $("#user_area_add").val();
 			params.user_label = $("#user_label_add").val();