Merge branch '1030-v2.9.6' of https://gitee.com/zwyjjc/tl_estate into 1030-v2.9.6

public/appnew/src/components/shop/shopList.vue

@@ -68,7 +68,7 @@
 					<p class="rent-choose">租金（单选）</p>
 					<span v-for="(item6, index6) in mainDataChooseLi.money" class="li-choose-span li-choose-span-rent" :class="{active:index6 === initTabNumRent}" @click="tabRent(index6)">{{item6.value}}</span>
 					<p class="lable-choose">特色标签（多选）</p>
-					<span v-for="(item3, index3) in mainDataChooseLi.more" class="li-choose-span">{{item3}}</span>
+					<span v-for="(item3, index3) in mainDataChooseLi.more" class="li-choose-span li-choose-span-sign"   @click="tabShopSign(item3)">{{item3}}</span>
 					<div class="more-button">
 						<span class="clear-btn">清空</span>
 						<span class="save-btn">保存</span>
@@ -132,7 +132,10 @@
 			_ajaxBusiness:'',
 			_ajaxYeTai:'',
 			_ajaxArea:'',
-			
+			_ajax_shop_area_start:'',
+			_ajax_shop_area_end:'',
+			_arrShop: [],
+			_oo:'333',
 			mainDataChoose:[{
 				'title': '区域',
 				'isShow': false,
@@ -171,23 +174,29 @@
 				let _this = this;
 				let _index = _this.initTabNumMain;
 				if(!_this.isLoading && !_this.mainData[_index].isStop) {
+					var _data={};
+					    _data.pageSize = _this.pageSize;
+					    _data.pageNo = _this.mainData[_index].page;
+					    _data.site_area = 2;
+					    _data.is_carefully_chosen = _this.mainData[_index].page;
+					    _data.shop_type = _this.mainData[_index].page;
+					    _data.city =  _this.initSelectCity;
+					    _data.disc =  _this._ajaxDisc;
+					    _data.business_id = _this._ajaxBusiness;
+					    _data.industry_type = _this._ajaxYeTai;
+					    if(_this._ajax_shop_area_start){
+					       _data.shop_area_start = _this._ajax_shop_area_start;
+					    };
+					    if(_this._ajax_shop_area_end){
+					       _data.shop_area_end = _this._ajax_shop_area_end;
+					    };
+					    
+					    
 					_this.axios({
 						method: 'get',
 						url: '/api/getShopList',
 						responseType: 'json',
-						data: {
-							'pageNo' : _this.mainData[_index].page,
-							'site_area' : 2,//c端搜索
-							'is_carefully_chosen': 0,//不是 精选商铺
-							'shop_type' : _index=='0'?1:0,
-							'pageSize' : _this.pageSize,
-							'city' : _this.initSelectCity,
-							'disc' : _this._ajaxDisc,
-							'business_id' :_this._ajaxBusiness,
-							'industry_type' :_this._ajaxYeTai,
-							
-							
-						}
+						data: _data,
 					})
 					.then(function(response) {
 						_this.mainData[_index].isLoadOnce = true;
@@ -198,6 +207,7 @@
 								if(_list.length === 0) {
 									_this.mainData[_index].page === 1 && (_this.mainData[_index].noDataFlag = true);
 									_this.mainData[_index].isStop = true;
+
 								} else {
 									_this.mainData[_index].dataList.push(..._list); //这里使用push要注意，先把数组展开
 									_list.length < _this.pageSize && (_this.mainData[_index].isStop = true);
@@ -271,10 +281,31 @@
 			},
 			tabArea(index,area){
 				let _this = this;
-				_this.initTabNumArea = index;
-				_this._ajaxArea = area;
-                console.log(area);
+				 _this.initTabNumArea = index;
+				 _this._ajaxArea = area;
+				 if(area[0] != '全部' ){
+				 	var parseIntStart = parseInt(area[0]);
+				 }
+				if(area[0] == '全部'){
+					_this._ajax_shop_area_start = '';
+					_this._ajax_shop_area_end = '';
+				}else if((area.length == 1) && (area[0] != '全部')){
+					if(parseIntStart > 30){
+						_this._ajax_shop_area_start = parseIntStart;
+						_this._ajax_shop_area_end = '';
+					}else{
+						_this._ajax_shop_area_start = '0';
+						_this._ajax_shop_area_end = parseIntStart;
+					};
+				}else{
+				   var parseIntEnd = parseInt(area[1]);
+				       _this._ajax_shop_area_start = parseIntStart;
+					   _this._ajax_shop_area_end = parseIntEnd;
+					
+				}
 				_this.mainDataChoose[_this.initTabNumMainChoose].isShow = false;
+				_this.resetConditions();
+				_this.getList();
 			},
 			tabAreaCity(index,district){
 				let _this = this;
@@ -294,6 +325,17 @@
 				let _this = this;
 				_this.initTabNumRent = index;
 			},
+			tabShopSign(item){
+				let _this = this;
+				let _arrShop = ['全部'];
+				var _shopIndex =_arrShop.indexOf(item);
+				if(_shopIndex > -1){
+					_arrShop.splice(_shopIndex, 1); 
+				}else{
+					_arrShop.push(item); 
+				}
+				console.log(_arrShop);
+			},
 			tabLable(index){
 				let _this = this;
 				_this.initTabNumRent = index;
@@ -563,6 +605,10 @@
 		background-color:#FFA029 ;
 		color: #fff;
 	}
+	.li-choose-span-sign.active{
+		background-color:#FFA029 ;
+		color: #fff;
+	}
 	/*城市 筛选*/
 	.top-city-select-area {
 	    position: fixed;