修改

application/index/view/houses/edit.html

@@ -123,7 +123,7 @@
 									</label>
 								</li>
 								<li class="list-group-item" id="shangpu_tags_area">
-
+                                    <label for="">商铺标签(可多选)</label>
 									<!--<label class="checkbox-inline">
 									  <input type="checkbox" class="roomTag" id="" value="购物广场" name="shangpu_tags[]">购物广场
 									</label>

application/index/view/member/users_list.html

@@ -592,7 +592,7 @@
 						</div>
 					</div>
 					<div class="form-group form-group-bottom">
-						<label for="inputEmail3" class="col-sm-3 control-label">客户所属城市：</label>
+						<label for="inputEmail3" class="col-sm-3 control-label">客户所属城市(可多选)：</label>
 						<div class="col-sm-9" id="shangpu_tags_area">
 							<!--<select class="form-control btn5" id="user_city_add">
 								<option value="310100">上海市</option>
@@ -796,8 +796,8 @@
 									</td>
 									<td>
 										<span class="fore-span">客户所属城市:</span>
-										<span class="user_details_city fore-span">
-								</span>
+										<div class="col-sm-9 shangpu_tags_area_edit ld-Marheight fore-span">
+		                                </div>
 									</td>
 									<td>
 										<span class="fore-span">昵称:</span>
@@ -1239,14 +1239,16 @@
 						<tr>
 							<td colspan="3">
 								<span class="fore-span ld-Marheight">客户所属城市:</span>
-								<select class="form-control btn4 ld-Marheight" id="user_city_edit">
+								<div class="col-sm-9 shangpu_tags_area_edit ld-Marheight">
+                                </div>
+								<!--<select class="form-control btn4 ld-Marheight" id="user_city_edit">
 									<option value="">请选择城市</option>
 									<option value="310100">上海市</option>
 									<option value="330100">杭州市</option>
 								</select>
 								<select class="form-control btn4 ld-Marheight" id="user_area_edit">
 									<option value="">请选择区域</option>
-								</select>
+								</select>-->
 							</td>
 						</tr>
 						<tr>

public/resource/js/user.js

@@ -376,7 +376,6 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 				user.agent_id='';
 //				user.initializationCityFunctionAdd();
 				user.getSiteTags();//获取站点 城市
-				
 			});
 			// 跟进的提交按钮 点击
 			$(document).delegate("#edit_add", "click", function(e) {
@@ -1399,6 +1398,12 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 		
 		Submit_follow: function() { //客户编辑提交
 			var params = {};
+		    //站点标签验证(编辑客户)
+			var _siteTagArr = [];
+			$.each($('.roomTagEdit'), function(i, item) {
+				item.checked && _siteTagArr.push(item.getAttribute('data-id'));
+			});
+			params.site_id = _siteTagArr.join(','),
 			params.id = user.user_id;
 			params.user_name = $(".cus_name_1").val();
 			params.agents_id = user.agent_id2;
@@ -1539,6 +1544,7 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 					$('.user_call').hide();
 				}
 			checkLogin();
+			user.getSiteTagsEdit();//获取站点 城市
 			$.ajax({
 				'type': 'GET',
 				'url': '/index/useraction_search',
@@ -1572,6 +1578,10 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 							$("#take_look_name").html(data.data.user_info.user_name); //约带看姓名
 							$("#take_look_phone").html(data.data.user_info.user_phone); //约带看手机号
 							$("#take_look_id").html(data.data.user_info.user_id); //约带看id
+							//获取 站点城市
+							data.data.user_info['site_ids'] && $.each($('.roomTagEdit'), function(i, item) {
+							~data.data.user_info['site_ids'].indexOf(item.getAttribute('data-id')) && (item.checked = 'checked');
+									});
 							var sw=function(s){
 								switch(Number(s))
 									 {  case 0:return"";
@@ -1843,6 +1853,44 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 					}
 				});
 			},
+			//获取站点 标签 (编辑)
+		getSiteTagsEdit: function() {
+				$.ajax({
+					type: 'GET',
+					url: '/index/getSiteList',
+					data: {},
+					timeout: 30000,
+					dataType: 'json',
+					beforeSend: function() {},
+					success: function(_data) {
+						if(typeof _data === 'object') {
+							if(_data['code'] == '200') {
+								var _htmlTemp = '';
+								$.each(_data.data.list, function(i, item) {
+									_htmlTemp += '<label class="checkbox-inline"><input type="checkbox" class="roomTagEdit" id="" value="{0}" data-id="{1}" name="shangpu_tags[]">{0}</label>'.stringFormatObj({
+										'0': item.name,
+										'1': item.id
+									});
+								});
+								$('.shangpu_tags_area_edit').append(_htmlTemp);
+							} else {
+								alert(_data['msg']);
+							}
+						} else {
+							alert('数据错误');
+						};
+					},
+					error: function() {
+						alert('enter error');
+					},
+					complete: function(xhr, textStatus) {
+						if(textStatus === 'timeout') {
+							//处理超时的逻辑
+							alert('请求超时,请重试');
+						};
+					}
+				});
+			},
 		//城市 区域 筛选
 		getCityAreaList: function(id, fn) {
             $.ajax({
@@ -1876,30 +1924,14 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 			params.type = 'add';
 			params.referrer_id = user.user_id_new_introduce;
 			params.referrer_source = 10;
-			
-			if($('#user_city_add').val() == 310100){
-			   params.city = '上海市'	;
-			   params.province = '上海市'	;
-			   
-			}
-			if($('#user_city_add').val() == 330100){
-			   params.city = '杭州市'	;	
-			   params.province = '浙江省'	;
-			   
-			}
+			//站点标签验证
+			var _siteTagArr = [];
+			$.each($('.roomTag'), function(i, item) {
+				item.checked && _siteTagArr.push(item.getAttribute('data-id'));
+			});
+			params.site_id = _siteTagArr.join(','),
 			params.disc = $("#user_area_add").val();
 			params.user_label = $("#user_label_add").val();
-			
-			if(params.city == '') {
-				alert('请选择城市');
-				$('#user_city_add').focus();
-				return;
-			}
-			if(params.disc == '') {
-				alert('请选择城市');
-				$("#user_area_add").focus();
-				return;
-			}
 			if(params.user_name == '') {
 				alert('姓名不能为空');
 				$("input[name='user_name']").focus();
@@ -1915,6 +1947,10 @@ define(['doT', 'text!temp/user_template_tpl.html', 'css!style/home.css', 'ckfind
 				$("input[name='user_phone']").focus();
 				return;
 			}
+			if(_siteTagArr.length < 1) {
+				alert('请选择城市!');
+				return false;
+			};
 			if(params.pwd == '') {
 				alert('密码不能为空');
 				$("input[name='pwd']").focus();