From eb7a808aaf7dd0a6dd2ff70f9ef3f8ce0b1e31d1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 22 五月 2026 18:27:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
app/pages/driver-certification/driver-certification.vue | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/app/pages/driver-certification/driver-certification.vue b/app/pages/driver-certification/driver-certification.vue
index 83d2ab5..f02537f 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>
@@ -223,7 +227,12 @@
<view class="driver-cert-page__bottom-bar">
<view v-if="currentStep === 2" class="driver-cert-page__agreement" @click="isAgreed = !isAgreed">
<image class="driver-cert-page__agreement-icon" :src="isAgreed ? '/static/image/ic_accept_sel@2x.png' : '/static/image/ic_accept@2x.png'" mode="widthFix"></image>
- <text class="driver-cert-page__agreement-text">鎴戝凡闃呰骞跺悓鎰忋�婇闄╁０鏄庛�嬨�併�婅鏉庡瘎瀛樺憳椤荤煡銆嬪強銆婃湇鍔″崗璁��</text>
+ <text class="driver-cert-page__agreement-text">鎴戝凡闃呰骞跺悓鎰�</text>
+ <text class="driver-cert-page__agreement-link" @click.stop="openAgreement('errandRiskCommitment')">銆婇闄╂壙璇恒��</text>
+ <text class="driver-cert-page__agreement-text">銆�</text>
+ <text class="driver-cert-page__agreement-link" @click.stop="openAgreement('errandLuggageStorageNotice')">銆婅鏉庡瘎瀛橀』鐭ャ��</text>
+ <text class="driver-cert-page__agreement-text">鍙�</text>
+ <text class="driver-cert-page__agreement-link" @click.stop="openAgreement('errandServiceAgreement')">銆婃湇鍔″崗璁��</text>
</view>
<view class="driver-cert-page__actions" :class="{ 'driver-cert-page__actions--dual': currentStep === 2 }">
@@ -313,6 +322,7 @@
color: '',
carType: ''
},
+ needLicense: false,
showCarTypePicker: false,
carTypeList: [],
carTypeColumns: [],
@@ -371,6 +381,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 +499,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 +514,9 @@
confirmCarType(e) {
const { id, text } = e.value[0]
this.vehicleForm.carType = id
+ const selectedCarType = this.carTypeList.find(item => item.id === id)
+ console.log(selectedCarType)
+ this.needLicense = selectedCarType && selectedCarType.otherField === '1'
this.showCarTypePicker = false
},
openDatePicker(mode) {
@@ -652,7 +673,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
}
@@ -689,6 +710,11 @@
uni.pageScrollTo({
scrollTop: 0,
duration: 0
+ })
+ },
+ openAgreement(type) {
+ uni.navigateTo({
+ url: '/pages/agreement/agreement?type=' + type
})
}
}
@@ -864,6 +890,12 @@
line-height: 1.6;
color: #98a0ad;
}
+
+ &__agreement-link {
+ font-size: 22rpx;
+ line-height: 1.6;
+ color: #106EFA;
+ }
}
.driver-cert-card {
@@ -1003,7 +1035,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