会员管理（列表、编辑）增加停车场区域信息（只应用于荆鹏停车场）

pages/index/index.vue

@@ -114,10 +114,11 @@
 			}
 		},
 		onLoad() {
-			this.loadParkSites();
+			//this.loadParkSites();
 			//this.getServerData();
 		},
 		onShow(){
+			this.loadParkSites();
 			this.updatePageData(this.selparking!='all'?this.selparking:this.allParkIds);
 		},
 		methods: {

pages/whiteList/editWhite.vue

@@ -20,6 +20,9 @@
 			<u-form-item label="使用场所*" prop="parkingName">
 				<u-input v-model="white.parkingName" type="select" @click="parkSelShow = true;whenOthFocus()" placeholder="选择可使用的停车场" @focus="whenOthFocus"/>
 			</u-form-item>
+			<u-form-item label="使用区域*" prop="areaName">
+				<u-input v-model="white.areaName" type="select" @click="parkSelShow = true;whenOthFocus()" placeholder="选择可使用的停车区域" @focus="whenOthFocus"/>
+			</u-form-item>
 			<u-form-item label="使用期限*">
 				<!-- <u-input :value="expireDateRange" type="select" @click="showCalendar = true;" placeholder="选择起始截止日期"/> -->
 			</u-form-item>
@@ -39,7 +42,9 @@
 			
 		</u-form>
 		
-		<u-picker mode="selector" v-model="parkSelShow"   :range="myParkSites" range-key="parking_name" @confirm="confirmPark"></u-picker>
+		<u-select v-model="parkSelShow" :list="myParkSites" mode="mutil-column-auto" @confirm="confirmPark"></u-select>
+		
+		<!-- <u-picker mode="selector" v-model="parkSelShow"   :range="myParkSites" range-key="parking_name" @confirm="confirmPark"></u-picker> -->
 		
 		<u-picker mode="time" v-model="timePickShow" :params="timePickParams" @confirm="confirmTimePick"></u-picker>
 		
@@ -56,6 +61,7 @@
 
 <script>
 	import * as api from '@/apis/whiteBill.js'
+	import * as apipark from '@/apis/myparkings.js'
 	import ucarkeyboard from '@/components/Ucarkeyboard.vue'
 	export default {
 		components: {
@@ -77,7 +83,9 @@
 					memberStartTime:'',
 					memberEndTime:'',
 					parkId:'',
-					memberType:null
+					memberType:null,
+					areaName:'',
+					area:null
 				},
 				timePickShow:false,
 				parkSelShow:false,
@@ -115,6 +123,13 @@
 							trigger: 'blur'
 						}
 					],
+					areaName:[
+						{
+							required:true,
+							message: '请选择一个停车场区域',
+							trigger: 'blur'
+						}
+					],
 					memberStartTime:[
 						{
 							required:true,
@@ -139,7 +154,23 @@
 				}
 		},
 		onLoad(opts){
-			this.myParkSites=api.getMyParkSites();
+			
+			let childPark=null
+			
+			
+			this.myParkSites=api.getMyParkSites().map(parkItem=>{
+				childPark=[{'label':'全部区域'}]
+				if(parkItem.park_id=='1'){ //1=荆鹏停车场分为多个区域
+					apipark.getAreaOpts().forEach(opt=>{
+						childPark.push({'label':opt.name,value:opt.code})
+					})
+					
+					//console.log(childPark)
+					
+				}
+				return {'label':parkItem.parking_name,'value':parkItem.park_id,'children':childPark}
+			})
+			
 			if(opts.id!=null){
 				this.loadDate(opts.id);
 				this.isUpdate=true;
@@ -188,9 +219,14 @@
 				}
 			},			
 			confirmPark(data){
-				let sel=this.myParkSites[data[0]];
-				this.white.parkingName=sel.parking_name;
-				this.white.parkId=sel.park_id;
+				//console.log(data)
+				//data数组，元素对应列中选中的项
+				//let sel=this.myParkSites[data[0]];
+				this.white.parkingName=data[0].label
+				this.white.parkId=data[0].value
+				
+				this.white.areaName=data[1].label
+				this.white.area=data[1].value
 			},
 			confirmTimePick(date){
 				//console.log(date)
@@ -216,9 +252,10 @@
 					}
 					
 					//this.memberRecord=resp.data;
-					let {memberName,memberPhone,memberCarNum,parkingName,memberStartTime,memberEndTime,parkId,memberType,id}=resp.data;
-					this.white={memberName,memberPhone,memberCarNum,parkingName,memberStartTime,memberEndTime,parkId,memberType,id};
-					console.log(this.white);
+					let {memberName,memberPhone,memberCarNum,parkingName,memberStartTime,memberEndTime,parkId,memberType,id,area=null}=resp.data;
+					let areaName=apipark.getAreaName(area);
+					this.white={memberName,memberPhone,memberCarNum,parkingName,memberStartTime,memberEndTime,parkId,memberType,id,area,areaName};
+					//console.log(this.white);
 					
 				}).catch(error => {
 					uni.hideLoading();
@@ -245,9 +282,12 @@
 				});
 				let submitData={...this.white};
 				delete submitData['memberType'];
-				console.log(this.isUpdate);
+				if(!submitData['area']||submitData['area']==""){
+					delete submitData['area'];
+				}
+				console.log(submitData)
 				apifun(submitData).then(resp => {
-					console.log(resp)
+					//console.log(resp)
 					uni.hideLoading();
 					if(!resp.success){
 						uni.showToast({

pages/whiteList/whiteList.vue

@@ -48,7 +48,10 @@
 		<view class="white-card" :class="{'white-card-invalid':item.cloud_del_flag==1}" v-for="(item,index) in pagedData.records" :key="item.id">
 			<view class="car-num">{{item.member_car_num}}{{item.member_type==0?'  [充电附赠]':''}}</view>
 			<!-- <view class="us-time">使用时段：无限制</view> -->
-			<view class="parking-site"><text style="color:#888;">使用场所：</text>{{item.parking_name}}</view>
+			<view class="parking-site">
+				<text style="color:#888;">使用场所：</text>{{item.parking_name}}
+				<view style="color:#888;font-size:28rpx;margin:10rpx;">({{ item.areaName}})</view>
+			</view>
 			<view class="us-expire">使用期限：
 			 <text v-if="item.cloud_del_flag==1" style="font-size:26rpx;font-weight: bold;">
 				 已失效
@@ -73,7 +76,7 @@
 
 <script>
 	import * as api from '@/apis/whiteBill.js'
-	
+	import * as apipark from '@/apis/myparkings.js'
 	export default {
 		data() {
 			return {
@@ -210,6 +213,15 @@
 				});
 			},
 			parseDatas(respData){
+				/*let finds=respData.records.find(item=>item.park_id=='1')
+				console.log(finds)
+				finds['area']='1'*/
+				if(respData.records){
+					respData.records.forEach(item=>{
+						item['areaName']=apipark.getAreaName(item['area_'])
+					})
+				}
+				
 				respData['pageNum']=respData.current;
 				respData['pageCount']=respData.pages;
 				respData['pageSize']=respData.size;