1

public/appnew/src/components/office_building/buildSearch.vue

@@ -53,15 +53,15 @@
 						<div style="width:100%;overflow: hidden;margin-top:.3rem;">
 							<div class="selecter-title" > 租金(元/月) </div>
 							<div class="square-choose" style="color : #999999">
-								<input style="width:1rem;padding:.1rem; 0rem ; border : 1px solid #eeeeee ; margin:.1rem ; text-align:center" type="num" placeholder="请输入"/>--
-								<input style="width:1rem;padding:.1rem; 0rem ; border : 1px solid #eeeeee ; margin:.1rem ; text-align:center" type="num" placeholder="请输入"/>
+								<input style="width:1rem;padding:.1rem; 0rem ; border : 1px solid #eeeeee ; margin:.1rem ; text-align:center" type="num" placeholder="请输入" v-model="dataMore.pri1"/>--
+								<input style="width:1rem;padding:.1rem; 0rem ; border : 1px solid #eeeeee ; margin:.1rem ; text-align:center" type="num" placeholder="请输入" v-model="dataMore.pri2"/>
 							</div>
 						</div>
 						<div style="width:100%;overflow: hidden;margin-top:.3rem;">
 							<div class="selecter-title" > 面积(㎡) </div>
 							<div class="square-choose" style="color : #999999">
-								<input style="width:1rem;padding:.1rem; 0rem ; border : 1px solid #eeeeee ; margin:.1rem ; text-align:center" type="num" placeholder="请输入"/>--
-								<input style="width:1rem;padding:.1rem; 0rem ; border : 1px solid #eeeeee ; margin:.1rem ; text-align:center" type="num" placeholder="请输入"/>
+								<input style="width:1rem;padding:.1rem; 0rem ; border : 1px solid #eeeeee ; margin:.1rem ; text-align:center" type="num" placeholder="请输入" v-model="dataMore.aread1"/>--
+								<input style="width:1rem;padding:.1rem; 0rem ; border : 1px solid #eeeeee ; margin:.1rem ; text-align:center" type="num" placeholder="请输入" v-model="dataMore.aread2"/>
 							</div>
 						</div>
 						<div style="width:100%;overflow: hidden;margin-top:.3rem;">
@@ -112,7 +112,7 @@
 				</div>
 				
 			</div>
-			<div class="more-button" style="margin-left:.4rem;" v-show="index == 0 || subs">
+			<div class="more-button" style="margin-left:.4rem;" v-show="index == 0 && subs">
 				<span class="clear-btn" @click="chooseSubstationOK(false)">取消</span>
 				<span class="save-btn" @click="chooseSubstationOK(true)">保存</span>
 			</div>
@@ -168,7 +168,12 @@
 					index : 0 , 
 					name : '全部'
 				} , //办公楼类型
-				specialSpan : ['全部'] 
+				specialSpan : ['全部'] ,
+				aread1 : '',
+				aread2:'',
+				pri1:'',
+				pri2:'',
+				clicked : false 
 			}, //更多中的数据封装
 			switchData1 : {str1:'是',str2:'否'},
 			ajax_shop_area_start:'',
@@ -251,7 +256,7 @@
 		mounted () {
 			let that = this ; 
 			that.getChooseList();
-			console.log(this.nowData);
+//			console.log(this.nowData);
 		},
 		methods: {
 			delMore (){
@@ -289,6 +294,7 @@
 				_this.mainDataChoose.map ( (res) => {
 					res.isShow = false ;
 				})
+				this.dataMore.clicked = true  ; 
 				this.backData();
 			},
 			changeSpecial ( i,name ) {
@@ -333,13 +339,24 @@
 			backData (){
 				let _this = this ; 
 				let obj = {
-					addr : _this.substationChoosen.length > 0 ? _this.substationChoosen : _this.ajaxBusiness,
+					addr : _this.substationChoosen.length > 0 ? _this.resetSubstationData(_this.substationChoosen) : _this.ajaxBusiness,
 					money : _this.priceChoosen ,
 					area : [_this.ajax_shop_area_start , _this.ajax_shop_area_end] ,
 					more :_this.dataMore
 				}
 				this.$emit('backSearchData',obj)
 			},
+			resetSubstationData (arr){
+				let str = '' ; 
+				arr.map((res)=>{
+					if (str == '' ) {
+						str += res ;
+					} else {
+						str += ','+res
+					}
+				})
+				return str ;
+			},
 			changeTime1 : function(a,b,c){
 				var _this = this ;
 				_this.dataMore.startTime = a;
@@ -399,7 +416,7 @@
 						_this.priceChoosen = [30000,0]; 
 						break ;
 					case 1 :
-						_this.priceChoosen = [10000,3000]; 
+						_this.priceChoosen = [10000,30000]; 
 						break ; 
 					case 2 :
 						_this.priceChoosen = [0,10000]; 
@@ -439,14 +456,14 @@
 				let res = this.nowData ; 
 				_this.mainDataChooseLi = res;
 				_this.mainDataSubstationLi = res.stations;
-				console.log(res.stations)
+//				console.log(res.stations)
 				_this.mainDataCityLi = res.area[1].business_district;
 			},
 			tabAreaCity(index,district){
 				let _this = this;
 				_this.initTabNumAreaCity = index;
 				_this.ajaxDisc = district;
-				_this.backData();
+//				_this.backData();
 			},
 			tabSubstationLine (index,name) {
 				let _this = this ; 
@@ -469,7 +486,9 @@
 				    _this.lableColorArr[_this.initTabNumMainChoose] = 1;
 				}
 				_this.mainDataChoose[_this.initTabNumMainChoose].isShow = false;
-				_this.ajaxBusiness = business;
+//				_this.ajaxBusiness = business;
+				_this.ajaxBusiness = businessStr;
+				_this.substationChoosen = [] ;
 				this.backData();
 			},
 			substationChoose (i,index){