From a59ff44b2eaa7020f0529632d9ec064c4dc38e27 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 28 四月 2026 22:08:46 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun

---
 app/pages/driver-certification/driver-certification.vue |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/app/pages/driver-certification/driver-certification.vue b/app/pages/driver-certification/driver-certification.vue
index 5e361aa..24db586 100644
--- a/app/pages/driver-certification/driver-certification.vue
+++ b/app/pages/driver-certification/driver-certification.vue
@@ -95,7 +95,9 @@
 					<view class="driver-cert-card__upload-list">
 						<view class="driver-cert-card__upload-item" @click="handleUpload('idcardImg', 1)" style="height: 196rpx;">
 							<template v-if="previewImages.idcardImg">
-								<image class="driver-cert-card__upload-img" :src="previewImages.idcardImg" mode="widthFix"></image>
+								<view class="driver-cert-card__upload-img">
+									<image style="height: 100%;" :src="previewImages.idcardImg" mode="heightFix"></image>
+								</view>
 								<view class="driver-cert-card__upload-remove" @click.stop="removeImage('idcardImg')">鍒犻櫎</view>
 							</template>
 							<template v-else>
@@ -105,7 +107,9 @@
 						</view>
 						<view class="driver-cert-card__upload-item" @click="handleUpload('idcardImgBack', 1)" style="height: 196rpx;">
 							<template v-if="previewImages.idcardImgBack">
-								<image class="driver-cert-card__upload-img" :src="previewImages.idcardImgBack" mode="widthFix"></image>
+								<view class="driver-cert-card__upload-img">
+									<image style="height: 100%;" :src="previewImages.idcardImgBack" mode="heightFix"></image>
+								</view>
 								<view class="driver-cert-card__upload-remove" @click.stop="removeImage('idcardImgBack')">鍒犻櫎</view>
 							</template>
 							<template v-else>
@@ -184,7 +188,7 @@
 					</view>
 				</view>
 
-				<view class="driver-cert-card__upload-block driver-cert-card__upload-block--stacked">
+				<view v-if="needLicense" class="driver-cert-card__upload-block driver-cert-card__upload-block--stacked">
 					<view class="driver-cert-card__upload-title-row">
 						<text class="driver-cert-card__label">椹鹃┒璇佺収鐗�</text>
 						<text class="driver-cert-card__required">*</text>
@@ -313,6 +317,7 @@
 					color: '',
 					carType: ''
 				},
+				needLicense: false,
 				showCarTypePicker: false,
 				carTypeList: [],
 				carTypeColumns: [],
@@ -371,6 +376,10 @@
 							this.vehicleForm.plateNumber = res.data.carCode || ''
 							this.vehicleForm.carType = res.data.carType || ''
 							this.vehicleForm.color = res.data.carColor || ''
+							if (this.carTypeList.length > 0) {
+								const selectedCarType = this.carTypeList.find(item => item.id === res.data.carType)
+								this.needLicense = selectedCarType && selectedCarType.otherField === 1
+							}
 							this.previewImages.idcardImg = res.data.idcardImg ? res.data.imgPrefix + res.data.idcardImg : ''
 							this.previewImages.idcardImgBack = res.data.idcardImgBack ? res.data.imgPrefix + res.data.idcardImgBack : ''
 							this.form.carImgUrls = (res.data.carImgList || []).map(item => item.fileurl)
@@ -485,6 +494,10 @@
 								text: item.name
 							}
 						})]
+						if (this.vehicleForm.carType) {
+							const selectedCarType = this.carTypeList.find(item => item.id === this.vehicleForm.carType)
+							this.needLicense = selectedCarType && selectedCarType.otherField === 1
+						}
 					}
 				})
 			},
@@ -496,6 +509,8 @@
 			confirmCarType(e) {
 				const { id, text } = e.value[0]
 				this.vehicleForm.carType = id
+				const selectedCarType = this.carTypeList.find(item => item.id === id)
+				this.needLicense = selectedCarType && selectedCarType.otherField === 1
 				this.showCarTypePicker = false
 			},
 			openDatePicker(mode) {
@@ -652,7 +667,7 @@
 					uni.showToast({ title: '璇蜂笂浼犺溅杈嗙収鐗�', icon: 'none' })
 					return false
 				}
-				if (this.form.licenseImgUrls.length === 0) {
+				if (this.needLicense && this.form.licenseImgUrls.length === 0) {
 					uni.showToast({ title: '璇蜂笂浼犻┚椹惰瘉鐓х墖', icon: 'none' })
 					return false
 				}
@@ -678,12 +693,7 @@
 						setTimeout(() => {
 							uni.navigateBack()
 						}, 1500)
-					} else {
-						uni.showToast({ title: res.msg || '鎻愪氦澶辫触', icon: 'none' })
 					}
-				}).catch(err => {
-					uni.hideLoading()
-					uni.showToast({ title: '鎻愪氦澶辫触', icon: 'none' })
 				})
 			},
 			goPrevStep() {
@@ -1008,7 +1018,12 @@
 
 		&__upload-img {
 			width: 100%;
+			height: 100%;
 			border-radius: 8rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			overflow: hidden;
 		}
 
 		&__upload-remove {

--
Gitblit v1.9.3