From fa4c7baec36d58b4bdca66159ece743b5a45a9c8 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 11 六月 2026 10:15:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/pages/driver-certification/driver-certification.vue | 84 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 78 insertions(+), 6 deletions(-)
diff --git a/app/pages/driver-certification/driver-certification.vue b/app/pages/driver-certification/driver-certification.vue
index 24db586..e1966bc 100644
--- a/app/pages/driver-certification/driver-certification.vue
+++ b/app/pages/driver-certification/driver-certification.vue
@@ -227,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 }">
@@ -273,11 +278,20 @@
:minDate="datePickerMode === 'end' ? this.form.cardStartDate : 0"
@confirm="confirmDate"
@cancel="showDatePicker = false" />
+
+ <u-popup :show="showDriverCertPopup" mode="center" :mask-click="false" round="24">
+ <view class="driver-cert-notice">
+ <text class="driver-cert-notice__title">鍙告満璁よ瘉</text>
+ <text class="driver-cert-notice__content">瀹炲悕淇℃伅浠呯敤浜庡徃鏈轰粠涓氳祫璐ㄥ鏍搞�佸瘎瀛樿鍗曞饱绾︽牳楠屼笌璐︽埛瀹夊叏闃叉姢锛屾垜浠壙璇轰弗鏍间繚鎶ゆ偍鐨勯殣绉併�傛劅璋㈡偍鐨勪俊浠汇��</text>
+ <button class="driver-cert-notice__button" @click="acknowledgeDriverCertNotice">宸茬煡鏅�</button>
+ </view>
+ </u-popup>
</view>
</template>
<script>
import { mapState } from 'vuex'
+ import { chooseImageWithNotice } from '@/utils/utils'
export default {
data() {
return {
@@ -339,18 +353,24 @@
otherImgUrls: []
},
isAgreed: false,
- imgPrefix: ''
+ imgPrefix: '',
+ showDriverCertPopup: false
}
},
computed: {
...mapState(['userInfo'])
},
onLoad() {
+ this.showDriverCertPopup = this.userInfo.auditStatus == 99 && !uni.getStorageSync('driver_cert_notice_agreed')
this.getAreaList()
this.getCategoryList()
this.getVerifyDetail()
},
methods: {
+ acknowledgeDriverCertNotice() {
+ uni.setStorageSync('driver_cert_notice_agreed', true)
+ this.showDriverCertPopup = false
+ },
getMaritalStatusText(value) {
if (!value && value !== 0) return '璇烽�夋嫨'
const item = this.maritalOptions.find(option => option.value === String(value))
@@ -404,7 +424,7 @@
uni.showToast({ title: `鏈�澶氫笂浼�${maxCount}寮燻, icon: 'none' })
return
}
- uni.chooseImage({
+ chooseImageWithNotice({
count: maxCount,
sizeType: ['compressed'],
sourceType: ['album', 'camera'],
@@ -414,7 +434,7 @@
const tempFilePaths = allTempPaths.slice(0, remaining)
this.uploadFiles(field, tempFilePaths, maxCount)
}
- })
+ }).catch(() => {})
},
uploadFiles(field, tempFilePaths, maxCount) {
const uploadPath = this.uploadPaths[field]
@@ -510,7 +530,8 @@
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
+ console.log(selectedCarType)
+ this.needLicense = selectedCarType && selectedCarType.otherField === '1'
this.showCarTypePicker = false
},
openDatePicker(mode) {
@@ -705,6 +726,11 @@
scrollTop: 0,
duration: 0
})
+ },
+ openAgreement(type) {
+ uni.navigateTo({
+ url: '/pages/agreement/agreement?type=' + type
+ })
}
}
}
@@ -879,6 +905,12 @@
line-height: 1.6;
color: #98a0ad;
}
+
+ &__agreement-link {
+ font-size: 22rpx;
+ line-height: 1.6;
+ color: #106EFA;
+ }
}
.driver-cert-card {
@@ -1048,4 +1080,44 @@
color: #b7bdc7;
}
}
-</style>
\ No newline at end of file
+
+ .driver-cert-notice {
+ width: 620rpx;
+ padding: 48rpx 36rpx 36rpx;
+ background: #ffffff;
+ border-radius: 24rpx;
+ box-sizing: border-box;
+
+ &__title {
+ display: block;
+ text-align: center;
+ font-size: 34rpx;
+ font-weight: 600;
+ color: #222222;
+ }
+
+ &__content {
+ display: block;
+ margin-top: 28rpx;
+ font-size: 28rpx;
+ line-height: 1.7;
+ color: #555555;
+ }
+
+ &__button {
+ margin-top: 40rpx;
+ width: 100%;
+ height: 88rpx;
+ line-height: 88rpx;
+ border-radius: 44rpx;
+ background: #106efa;
+ font-size: 28rpx;
+ color: #ffffff;
+ padding: 0;
+
+ &::after {
+ border: 0;
+ }
+ }
+ }
+</style>
--
Gitblit v1.9.3