Merge branch 'test'

application/index/view/global/footer_tpl.html

-<script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=201901116111' charset='utf-8'></script>
+<script src='/resource/lib/js/require.min.js' data-main='/resource/js/main?version=201901116118' charset='utf-8'></script>

application/index/view/member/user_genjing_modal.html

@@ -496,7 +496,7 @@
 							</td>
 							<td>
 								<span class="fore-span">客户所属城市:</span>
-								<span class="shangpu_tags_area_detail fore-span">
+								<span class="shangpu_tags_area_detail2 fore-span">
                         </span>
 								
 							</td>

public/resource/js/RemarkFollowIndex.js

@@ -116,7 +116,8 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
 						var _siteID = user_info_obj.site_id;
 						var _str =_str1 + '<option value="' + _siteID + '">' + _city+ '</option>';
 						$(".user_city_choose_site_list").append(_str);
-					}
+					};
+//					$(".user_city_choose_site_list").val(user_info_obj.site_id);//给默认值
 				}
 			});
 			

public/resource/js/user.js

@@ -154,7 +154,9 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 						var _siteID = user_info_obj.site_id;
 						var _str =_str1 + '<option value="' + _siteID + '">' + _city+ '</option>';
 						$(".user_city_choose_site_list").append(_str);
-					}
+					};
+//					$(".user_city_choose_site_list").val(user_info_obj.site_id);//给默认值
+					
 				}
 			});
 		},

public/resource/js/user_genjing_modal.js

@@ -1153,7 +1153,7 @@ define(['doT', 'css!style/home.css', 'ckfinder', 'ckfinderStart', 'bootstrapJs']
 									});
 							$('.shangpu_tags_area_detail').show();
 							var site_detail= data.data.user_info.site_name.join(',');
-							$('.shangpu_tags_area_detail').html(site_detail);
+							$('.shangpu_tags_area_detail2').html(site_detail);
 							var sw=function(s){
 								switch(Number(s))
 									 {  case 0:return"";