From a54597994e1a2112cddcc356de93174525dd1710 Mon Sep 17 00:00:00 2001 From: yangan <yangan0921@163.com> Date: 星期三, 12 六月 2024 09:51:48 +0800 Subject: [PATCH] fix:修改密码页面加载失败错误弹窗 --- pages/driver-page/drvier-my/drvier-my.vue | 171 ++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 140 insertions(+), 31 deletions(-) diff --git a/pages/driver-page/drvier-my/drvier-my.vue b/pages/driver-page/drvier-my/drvier-my.vue index 6c59039..af770c2 100644 --- a/pages/driver-page/drvier-my/drvier-my.vue +++ b/pages/driver-page/drvier-my/drvier-my.vue @@ -16,13 +16,17 @@ </view> </view> </view> - <view class="process-state"> + <view class="process-state" + v-if="userInfo.isRegister!==2"> <view class="state-text"> 瀹℃牳鐘舵�� </view> - <u--text :type="userInfo.isRegister===0?'primary':userInfo.isRegister===1?'error':'success'" - :text="userInfo.isRegister===0?'寰呭鏍�':userInfo.isRegister===1?'鏈�氳繃':'宸插鏍�'" + <u--text :type="userInfo.isRegister===0?'primary':'error'" + :text="userInfo.isRegister===0?'寰呭鏍�':'鏈�氳繃'" size="32"></u--text> + </view> + <view class="car-type"> + <text>{{userInfo.countryNumberCar===1?'鍥戒簲杞﹁締':'鍥藉叚杞﹁締'}}</text> </view> <view class="information-block"> <view class="personal-information"> @@ -36,7 +40,7 @@ <view class="label-text">韬唤璇佸彿</view> </view> <view class="information-value"> - {{ userInfo.idCard || '' }} + {{ idCard || '' }} </view> </view> <view class="information-line"> @@ -85,7 +89,7 @@ icon 涓嬭浇鏍煎紡涓�18x18--> <view class="line-label" style="margin-left: 1.5%;"> - <image src="../../../static/image/banner/printer.png" + <image src="https://mx.jzeg.cn:9096/appimg/image/banner/printer.png" mode="widthFix" style="width: 18px;"></image> <view class="label-text">纾呭崟鏍峰紡</view> @@ -98,11 +102,11 @@ size="36"></u-icon> </view> </view> - <view class="information-line" + <!-- <view class="information-line" @click="addressManageHandle"> <view class="line-label" style="margin-left: 1.5%;"> - <image src="../../../static/image/banner/address.png" + <image src="https://mx.jzeg.cn:9096/appimg/image/banner/address.png" mode="widthFix" style="width: 18px;"></image> <view class="label-text" @@ -112,7 +116,7 @@ <u-icon name="arrow-right" size="36"></u-icon> </view> - </view> + </view> --> <view class="information-line last" @click="scoreDetail"> <view class="line-label" @@ -174,6 +178,23 @@ </u--image> </view> </view> + <view class="car-img"> + <view class="label-title"> + <image src="https://mx.jzeg.cn:9096/appimg/image/banner/cardimg.png" + mode="widthFix"></image> + <view class="label-text">杞﹁締绫诲瀷鐓х墖</view> + </view> + <view class="img-container"> + <u--image :showLoading="true" + :src="userInfo.inventoryImg != null ? BaseUrl + userInfo.drivingImg : ''" + width="80px" + height="80px" + @click="imageClick(3)"> + <view slot="error" + style="font-size: 24rpx;">鍔犺浇澶辫触</view> + </u--image> + </view> + </view> </view> </view> </view> @@ -226,14 +247,14 @@ border="none" inputAlign="left"></u--input> </u-form-item> --> - <u-form-item labelWidth="20%" + <!-- <u-form-item labelWidth="20%" label="韬唤璇佸彿" prop="idCard" required> <u--input v-model="editUserInfo.idCard" border="none" inputAlign="left"></u--input> - </u-form-item> + </u-form-item> --> <u-form-item labelWidth="20%" label="鎵嬫満鍙�" prop="phone" @@ -266,6 +287,24 @@ <u--input v-model="editUserInfo.axleNum" border="none" inputAlign="left"></u--input> + </u-form-item> + <u-form-item labelWidth="20%" + label="杞﹁締绫诲瀷" + borderBottom + required + prop="countryNumberCar"> + <u-radio-group v-model="editUserInfo.countryNumberCar" + placement="row" + size="30" + shape="circle" + iconSize="20"> + <u-radio labelSize="14px" + size="20px" + v-for="(item, index) in countryNumberCarList" + :key="index" + :label="item.label" + :name="item.name"></u-radio> + </u-radio-group> </u-form-item> <u-form-item labelWidth="25%" label="杞﹁締鐓х墖" @@ -330,6 +369,23 @@ height="150" :previewFullImage="true"></u-upload> </u-form-item> + <u-form-item prop="inventoryImg" + label="鐜繚娓呭崟" + labelWidth="24%" + borderBottom + @click="beforeRead"> + <u-upload :fileList="fileList5" + deletable + @afterRead="afterRead" + @delete="deletePic" + name="5" + multiple + :maxCount="3" + width="250" + height="150" + :previewFullImage="true"> + </u-upload> + </u-form-item> </u--form> <view class="person-utils"> <u-button text="淇敼瀵嗙爜" @@ -384,8 +440,19 @@ password: "", isRegister: 0, tradeQualificationImg: '', - roadTransportImg: '' + roadTransportImg: '', + inventoryImg: '', + countryNumberCar: 0 }, + countryNumberCarList: [{ + name: 1, + label: '鍥戒簲', + }, + { + name: 2, + label: '鍥藉叚', + } + ], rules: { name: { type: 'string', @@ -462,10 +529,11 @@ return Number(value); }, validator: (rule, value, callback) => { - return value <= 10; + return value <= 10 && value > 0; }, message: '璇疯緭鍏ユ纭殑杞﹁酱鏁�', - trigger: ['change', 'blur'] + trigger: ['change', 'blur'], + required: true, }], carImg: { type: 'string', @@ -478,13 +546,32 @@ required: true, message: '璇蜂笂浼犺椹惰瘉鐓х墖', trigger: ['blur', 'change'] - } + }, + countryNumberCar: { + type: 'number', + required: true, + message: '璇烽�夋嫨杞﹁締绫诲瀷', + trigger: ['blur', 'change'] + }, + roadTransportImg: { + type: 'string', + required: true, + message: '璇蜂笂浼犻亾璺繍杈撹瘉鐓х墖', + trigger: ['blur', 'change'] + }, + tradeQualificationImg: { + type: 'string', + required: true, + message: '璇蜂笂浼犱粠涓氳祫鏍艰瘉鐓х墖', + trigger: ['blur', 'change'] + }, }, src: '', fileList1: [], fileList2: [], fileList3: [], fileList4: [], + fileList5: [], // 淇敼淇℃伅寮瑰嚭妗� editDriverPopupShow: false, // previewImage @@ -501,6 +588,9 @@ computed: { currentSelectedPrintStyle() { return this.selectedPrintStyle ? this.selectedPrintStyle : uni.getStorageSync('selectedPrintStyle') + }, + idCard() { + return this.userInfo.idCard.slice(0, 6) + '********' + this.userInfo.idCard.slice(-4) } }, onShow() { @@ -521,35 +611,39 @@ this.$reqGet('getUserEntity').then(res => { uni.hideLoading(); this.userInfo = res.data; + // this.userInfo.idCard = this.userInfo.idCard.slice(0, 6) + '********' + this.userInfo.idCard + // .slice(-4) uni.setStorageSync('carImg', this.userInfo.carImg); uni.setStorageSync('drivingImg', this.userInfo.drivingImg); uni.setStorageSync('roadTransportImg', this.userInfo.roadTransportImg); uni.setStorageSync('tradeQualificationImg', this.userInfo.tradeQualificationImg); - if (this.fileList1.length == 0) { + if (this.fileList1.length == 0 && this.userInfo.carImg) { this.fileList1.push({ url: `${BaseUrl}${this.userInfo.carImg}` }); } - if (this.fileList2.length == 0) { + if (this.fileList2.length == 0 && this.userInfo.drivingImg) { this.fileList2.push({ url: `${BaseUrl}${this.userInfo.drivingImg}` }); } - if (this.fileList3.length == 0) { + if (this.fileList3.length == 0 && this.userInfo.roadTransportImg) { this.fileList3.push({ url: `${BaseUrl}${this.userInfo.roadTransportImg}` }); } - if (this.fileList4.length == 0) { + if (this.fileList4.length == 0 && this.userInfo.tradeQualificationImg) { this.fileList4.push({ url: `${BaseUrl}${this.userInfo.tradeQualificationImg}` }); } - Object.keys(this.editUserInfo).map(item => { - if (res.data[item]) { - this.editUserInfo[item] = res.data[item]; - } - }); + if (this.fileList5.length == 0 && this.userInfo.inventoryImg) { + this.fileList5.push({ + url: `${BaseUrl}${this.userInfo.inventoryImg}` + }); + } + Object.assign(this.editUserInfo, res.data) + console.log(this.editUserInfo); this.editUserInfo.password = '' }); }, @@ -558,12 +652,12 @@ this.editDriverPopupShow = true; }, imageClick(index) { - // 閫氳繃index鍒囨崲鍥剧墖 - console.log('鍒囨崲鍥剧墖', index); if (index == 1) { this.previewImageSrc = this.userInfo.carImg; - } else { + } else if (index == 2) { this.previewImageSrc = this.userInfo.drivingImg; + } else { + this.previewImageSrc = this.userInfo.inventoryImg; } this.$nextTick(() => { this.previewImageShow = true; @@ -632,6 +726,10 @@ uni.setStorageSync('tradeQualificationImg', JSON.parse(res.data).data .url); resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`); + } else if (num == 5) { + this.editUserInfo.inventoryImg = JSON.parse(res.data).data + .url; + resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`); } } }); @@ -655,7 +753,7 @@ this.$store.commit('changeisLogin', false) this.$store.dispatch('websocketOnClose') uni.reLaunch({ - url: '/pages/login/forgetPassword/forgetPassword' + url: `/pages/login/resetPassword/resetPassword?phone=${this.userInfo.phone}&idcard=${this.userInfo.idcard}` }) }, // 淇敼鐢ㄦ埛淇℃伅 @@ -805,6 +903,17 @@ } } + .car-type { + position: fixed; + top: 284rpx; + right: 70rpx; + width: 100%; + height: 50rpx; + display: flex; + align-items: center; + justify-content: flex-end; + } + .information-block { width: 100%; @@ -817,7 +926,7 @@ &-block { width: 690rpx; - height: 750rpx; + height: 680rpx; background: #ffffff; box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12); border-radius: 20rpx; @@ -884,7 +993,7 @@ .information-main { width: 690rpx; - height: 552rpx; + height: 800rpx; background: #ffffff; box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12); border-radius: 20rpx; @@ -903,7 +1012,7 @@ .label-title { @include flex; - width: 220rpx; + width: 300rpx; height: 100rpx; .label-text { @@ -997,4 +1106,4 @@ } } } -</style> \ No newline at end of file +</style> -- Gitblit v1.9.1