Browse Source

auto commit

gcz 3 years ago
parent
commit
fc82214ebb
3 changed files with 74 additions and 12 deletions
  1. 21 0
      common/data.js
  2. 24 12
      pages/getin/getin.vue
  3. 29 0
      utils/filter.js

+ 21 - 0
common/data.js

@@ -0,0 +1,21 @@
+const mydata = {
+	carColorList:[
+		{label: '蓝色',value:0}
+		,{label: '黄色',value:1}
+		,{label: '黑色',value:2}
+		,{label: '白色',value:3}
+		,{label: '绿色',value:4}
+		,{label: '其他',value:99}
+	],
+	carTypeList:[
+		{label: '小车',value:0}
+		,{label: '大车',value:1}
+		,{label: '超大型车',value:2}
+		,{label: '摩托车',value:3}
+		,{label: '非机动车',value:4}
+		,{label: '其他',value:5}
+	],
+}
+export {
+	mydata
+}

+ 24 - 12
pages/getin/getin.vue

@@ -17,7 +17,17 @@
 				</view>
 				<view class="text-item u-flex u-flex u-row-between">
 					<view class="">车辆类型</view>
-					<view class="" @click="carTypeShow = true">{{vehicleType|filterCarType}}</view>
+					<view class="" @click="carTypeShow = true">
+						{{vehicleType|filterCarType}}
+						<u-icon class="u-m-l-10" name="arrow-down-fill" color="#C2C2C2" size="15"></u-icon>
+					</view>
+				</view>
+				<view class="text-item u-flex u-flex u-row-between">
+					<view>车辆颜色</view>
+					<view @click="carColorShow = true">
+						{{vehicleColor|filterCarColor}}
+						<u-icon class="u-m-l-10" name="arrow-down-fill" color="#C2C2C2" size="15"></u-icon>
+					</view>
 				</view>
 				<view class="text-item u-flex u-flex u-row-between">
 					<view class="">余额:<span class="balance">{{balance||'暂无'}}</span></view>
@@ -53,13 +63,16 @@
 			</view>
 		</view>
 		
-		<u-select v-model="carTypeShow" :default-value="[vehicleType]" :list="carTypeList" @confirm="carTypeConfirm"></u-select>
+		<u-select v-model="carTypeShow" :default-value="[2]" :list="carTypeList" @confirm="carTypeConfirm"></u-select>
+		<u-select v-model="carColorShow" :default-value="[2]" :list="carColorList" @confirm="carColorConfirm"></u-select>
 		<u-toast ref="uToast" />
 	</view>
 </template>
 
 <script>
 	import { config } from '@/common/config.js';
+	import { mydata } from '@/common/data.js';
+	console.log('mydata',mydata.carColorList)
 	//#ifdef APP-PLUS
 	import speak from '@/utils/speaks.js';
 	let ALog = uni.requireNativePlugin("AndroidLog");
@@ -73,18 +86,13 @@
 				spaceId:'',
 				spaceName:'',
 				carTypeShow:false,
-				carTypeList:[
-					{label: '小车',value:0}
-					,{label: '大车',value:1}
-					,{label: '超大型车',value:2}
-					,{label: '摩托车',value:3}
-					,{label: '非机动车',value:4}
-					,{label: '其他',value:5}
-				],
+				carColorShow:false,
+				carTypeList:mydata.carTypeList,
+				carColorList:mydata.carColorList,
 				vehicleType:0,
+				vehicleColor:0,
 				currentTime: new Date(), // 获取当前时间
 				vehicleNo:null,
-				vehicleColor:null,
 				vehicleImage:null,
 				memberId:null,
 				depositAmount:null,
@@ -118,9 +126,13 @@
 			carTypeConfirm(e){
 				// console.log('carTypeConfirm',e[0].label);
 				// this.carType = e[0].label;
-				this.carType = e[0].value;
+				// this.carType = e[0].value;
 				this.vehicleType = e[0].value;
 			},
+			carColorConfirm(e){
+				console.log('e',e)
+				this.vehicleColor = e[0].value;
+			},
 			submit(){
 				let files = [];
 				let that = this;

+ 29 - 0
utils/filter.js

@@ -48,6 +48,35 @@ Vue.filter("miniImg",function(img,quality){
 	return img+'?imageMogr2/quality/'+quality
 });
 
+//车辆颜色
+Vue.filter("filterCarColor",function(item){
+	item = Number(item);
+	switch (item){
+		case 0:
+			return '蓝色'
+			break;
+		case 1:
+			return '黄色'
+			break;
+		case 2:
+			return '黑色'
+			break;
+		case 3:
+			return '白色'
+			break;
+		case 4:
+			return '绿色'
+			break;
+		case 99:
+			return '其他'
+			break;
+		default:
+			return '其他'
+			break;
+	}
+	
+});
+
 //车辆类型
 Vue.filter("filterCarType",function(item){
 	// console.log(item)