From acc9f2d9eb7b3848803023075c9c2cdd67467ac4 Mon Sep 17 00:00:00 2001 From: 819527061@qq.com <123456> Date: 星期二, 11 六月 2024 11:07:08 +0800 Subject: [PATCH] feature:忘记密码修改 --- pages/driver-page/drvier-my/drvier-my.vue | 455 ++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 325 insertions(+), 130 deletions(-) diff --git a/pages/driver-page/drvier-my/drvier-my.vue b/pages/driver-page/drvier-my/drvier-my.vue index 7f722ae..212018b 100644 --- a/pages/driver-page/drvier-my/drvier-my.vue +++ b/pages/driver-page/drvier-my/drvier-my.vue @@ -6,24 +6,27 @@ <view class="navgation">鎴戠殑</view> <view class="avatar"> <view class="avatar-imgage" - style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/driverava.png')no-repeat;background-size: cover;"> + style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/driverava.png')no-repeat;background-size: cover;"> </view> <view class="avatar-name">{{ userInfo.name || '' }}</view> <view class="edit-button"><u-button type="primary" @click="editBtnClick" shape="circle" - :disabled="userInfo.isRegister!==2" plain>缂栬緫涓汉璧勬枡</u-button></view> </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"> @@ -32,17 +35,17 @@ <view class="information-line" @click=""> <view class="line-label"> - <image src="https://mx.jzeg.cn:9095/appimg/image/banner/personalicon.png" + <image src="https://mx.jzeg.cn:9096/appimg/image/banner/personalicon.png" mode="widthFix"></image> <view class="label-text">韬唤璇佸彿</view> </view> <view class="information-value"> - {{ userInfo.idCard || '' }} + {{ idCard || '' }} </view> </view> <view class="information-line"> <view class="line-label"> - <image src="https://mx.jzeg.cn:9095/appimg/image/banner/phonenum.png" + <image src="https://mx.jzeg.cn:9096/appimg/image/banner/phonenum.png" mode="widthFix"></image> <view class="label-text">鎵嬫満鍙�</view> </view> @@ -52,7 +55,7 @@ </view> <view class="information-line"> <view class="line-label"> - <image src="https://mx.jzeg.cn:9095/appimg/image/banner/carnum.png" + <image src="https://mx.jzeg.cn:9096/appimg/image/banner/carnum.png" mode="widthFix"></image> <view class="label-text">杞︾墝鍙�</view> </view> @@ -62,7 +65,7 @@ </view> <view class="information-line"> <view class="line-label"> - <image src="https://mx.jzeg.cn:9095/appimg/image/banner/axisnum.png" + <image src="https://mx.jzeg.cn:9096/appimg/image/banner/axisnum.png" mode="widthFix"></image> <view class="label-text">杞﹁酱鏁�</view> </view> @@ -70,15 +73,69 @@ {{ userInfo.axleNum || '' }} </view> </view> - <view class="information-line last"> + <view class="information-line"> <view class="line-label"> - <image src="https://mx.jzeg.cn:9095/appimg/image/banner/weighnum.png" + <image src="https://mx.jzeg.cn:9096/appimg/image/banner/weighnum.png" mode="widthFix"></image> <view class="label-text">浣撻噸</view> </view> <view class="information-value"> {{ userInfo.weight || '' }} </view> + </view> + <view class="information-line" + @click="modifyPrint"> + <!-- 鐢变簬鏄嚜瀹氫箟icon 闈炶璁″浘icon 鎵�浠ヨ鍔犱笂杩欎釜style="margin-left: 1.5%;" + icon 涓嬭浇鏍煎紡涓�18x18--> + <view class="line-label" + style="margin-left: 1.5%;"> + <image src="https://mx.jzeg.cn:9096/appimg/image/banner/printer.png" + mode="widthFix" + style="width: 18px;"></image> + <view class="label-text">纾呭崟鏍峰紡</view> + </view> + <view class="information-value"> + <view class=""> + {{ currentSelectedPrintStyle===1?'涓�椤典袱鑱�':'涓�椤靛洓鑱�'}} + </view> + <u-icon name="arrow-right" + size="36"></u-icon> + </view> + </view> + <!-- <view class="information-line" + @click="addressManageHandle"> + <view class="line-label" + style="margin-left: 1.5%;"> + <image src="https://mx.jzeg.cn:9096/appimg/image/banner/address.png" + mode="widthFix" + style="width: 18px;"></image> + <view class="label-text" + style="width:220rpx ;">閫佽揣瀹㈡埛绠$悊</view> + </view> + <view class=""> + <u-icon name="arrow-right" + size="36"></u-icon> + </view> + </view> --> + <view class="information-line last" + @click="scoreDetail"> + <view class="line-label" + style="margin-left: 1.5%;"> + <image src="https://mx.jzeg.cn:9096/appimg/image/banner/score.png" + mode="widthFix" + style="width: 36rpx;position: relative;left: 8rpx;"></image> + <view class="label-text">鎴戠殑绉垎</view> + </view> + <view class="information-value"> + <view class=""> + {{ userInfo.integral || '' }} + </view> + <view class=""> + <u-icon name="arrow-right" + size="36"></u-icon> + </view> + </view> + </view> </view> </view> @@ -89,7 +146,7 @@ <view class="information-body"> <view class="car-img"> <view class="label-title"> - <image src="https://mx.jzeg.cn:9095/appimg/image/banner/carimg.png" + <image src="https://mx.jzeg.cn:9096/appimg/image/banner/carimg.png" mode="widthFix"></image> <view class="label-text">杞﹁締鐓х墖</view> </view> @@ -106,7 +163,7 @@ </view> <view class="car-img"> <view class="label-title"> - <image src="https://mx.jzeg.cn:9095/appimg/image/banner/cardimg.png" + <image src="https://mx.jzeg.cn:9096/appimg/image/banner/cardimg.png" mode="widthFix"></image> <view class="label-text">琛岄┒璇佺収鐗�</view> </view> @@ -121,15 +178,27 @@ </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> <view class="loginout"> - <view class="loginout-main"><u-button text="閲嶇疆瀵嗙爜" - type="primary" - @click="initPwd" - shape="circle" - plain></u-button></view> <view class="loginout-main"><u-button text="閫�鍑虹櫥褰�" type="primary" @click="logout" @@ -137,24 +206,7 @@ plain></u-button></view> </view> <!-- 寮曞椤� --> - <view class="noob-tour" - style="margin-top: 80rpx;"> - <combined-title title="鎿嶄綔鎸囧紩"></combined-title> - <u-cell-group> - <u-cell title="鏂版墜鎸囧紩" - name='1' - :clickable="true" - @click="noobTour"> - <u-badge type="primary" - value="01" - slot='icon'></u-badge> - <u-icon slot="value" - name="arrow-right" - size="30" - color="#b8b8b8"></u-icon> - </u-cell> - </u-cell-group> - </view> + <noob-tour isPersonCenter></noob-tour> <!-- 鍥剧墖棰勮寮瑰嚭妗� --> <view class="previewImage-container"> <u-popup :show="previewImageShow" @@ -165,12 +217,6 @@ width="400px" height="400px"></u--image> </u-popup> - </view> - <!-- 寮曞鍥剧墖寮瑰嚭 --> - <view class="previewImage-container"> - <previewImage ref="previewImage" - :imgs="driverTourImgList" - :saveBtn='false'></previewImage> </view> <!-- 淇敼寮瑰嚭妗� --> <view class="editDriverPopup-container"> @@ -193,22 +239,22 @@ border="none" inputAlign="left"></u--input> </u-form-item> - <u-form-item labelWidth="20%" + <!-- <u-form-item labelWidth="20%" label="瀵嗙爜" prop="password" required> <u--input v-model="editUserInfo.password" border="none" inputAlign="left"></u--input> - </u-form-item> - <u-form-item labelWidth="20%" + </u-form-item> --> + <!-- <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" @@ -242,6 +288,24 @@ 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="杞﹁締鐓х墖" @click="beforeRead" @@ -273,10 +337,64 @@ height="150" :previewFullImage="true"></u-upload> </u-form-item> + <u-form-item labelWidth="25%" + label="閬撹矾杩愯緭璇�" + ref="item1" + @click="beforeRead" + prop="roadTransportImg" + required> + <u-upload :fileList="fileList3" + @afterRead="afterRead" + @delete="deletePic" + name="3" + multiple + :maxCount="1" + width="250" + height="150" + :previewFullImage="true"></u-upload> + </u-form-item> + <u-form-item labelWidth="25%" + label="浠庝笟璧勬牸璇�" + ref="item1" + @click="beforeRead" + prop="tradeQualificationImg" + required> + <u-upload :fileList="fileList4" + @afterRead="afterRead" + @delete="deletePic" + name="4" + multiple + :maxCount="1" + width="250" + 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> - <u-button text="鎻愪氦" - @click="updateUser" - type="primary"></u-button> + <view class="person-utils"> + <u-button text="淇敼瀵嗙爜" + @click="modifyPassword" + type="primary"></u-button> + <u-button text="鎻愪氦" + @click="updateUser" + type="primary"></u-button> + </view> </view> </u-popup> </view> @@ -288,14 +406,8 @@ @confirm="logoutConfirm" @cancel="logoutCancel"></u-modal> </view> - <view class="initPwdModal"> - <u-modal :show="initPwdShow" - title="閲嶇疆瀵嗙爜" - showCancelButton - content="鍒濆瀵嗙爜灏嗗彉鏇翠负123456,鏄惁纭閲嶇疆" - @confirm="initPwdConfirm" - @cancel="initPwdCancel"></u-modal> - </view> + <printerStyle ref="printerStyleRef" + @selectedPrintStyle='selectedPrintStyleHandle' /> </view> </template> @@ -303,15 +415,11 @@ import { redirectLogin } from '@/utils/status'; import { BaseUrl } from '@/api/publicInterface.js'; import previewImage from '@/components/kxj-previewImage/kxj-previewImage.vue'; + import noobTour from '@/components/noobTour/noobTour.vue' + import printerStyle from '@/pages/driver-page/driver-index/bill-of-lading-details/printerStyle/printerStyle.vue' import { mapMutations, mapState } from 'vuex'; export default { - components: { previewImage }, - computed: { - ...mapState(['driverTourImgList']), - roleType() { - return uni.getStorageSync('roleType'); - }, - }, + components: { previewImage, noobTour, printerStyle }, data() { return { // 鑾峰彇鐨勫徃鏈鸿鎯� @@ -330,8 +438,21 @@ weight: '', userId: '', password: "", - isRegister: '' + isRegister: 0, + tradeQualificationImg: '', + roadTransportImg: '', + inventoryImg: '', + countryNumberCar: 0 }, + countryNumberCarList: [{ + name: 1, + label: '鍥戒簲', + }, + { + name: 2, + label: '鍥藉叚', + } + ], rules: { name: { type: 'string', @@ -408,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', @@ -424,11 +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 @@ -439,9 +582,16 @@ logoutTitle: '鎻愮ず', logoutContent: '鏄惁纭閫�鍑�', BaseUrl, - initPwdShow: false - + selectedPrintStyle: null }; + }, + computed: { + currentSelectedPrintStyle() { + return this.selectedPrintStyle ? this.selectedPrintStyle : uni.getStorageSync('selectedPrintStyle') + }, + idCard() { + return this.userInfo.idCard.slice(0, 6) + '********' + this.userInfo.idCard.slice(-4) + } }, onShow() { // this.init(); @@ -461,23 +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); - if (this.fileList1.length == 0) { + uni.setStorageSync('roadTransportImg', this.userInfo.roadTransportImg); + uni.setStorageSync('tradeQualificationImg', this.userInfo.tradeQualificationImg); + 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}` }); } - Object.keys(this.editUserInfo).map(item => { - if (res.data[item]) { - this.editUserInfo[item] = res.data[item]; - } - }); + if (this.fileList3.length == 0 && this.userInfo.roadTransportImg) { + this.fileList3.push({ + url: `${BaseUrl}${this.userInfo.roadTransportImg}` + }); + } + if (this.fileList4.length == 0 && this.userInfo.tradeQualificationImg) { + this.fileList4.push({ + url: `${BaseUrl}${this.userInfo.tradeQualificationImg}` + }); + } + 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 = '' }); }, @@ -486,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; @@ -550,6 +716,20 @@ this.editUserInfo.drivingImg = JSON.parse(res.data).data.url; uni.setStorageSync('drivingImg', JSON.parse(res.data).data.url); resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`); + } else if (num == 3) { + this.editUserInfo.roadTransportImg = JSON.parse(res.data).data.url; + uni.setStorageSync('roadTransportImg', JSON.parse(res.data).data.url); + resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`); + } else if (num == 4) { + this.editUserInfo.tradeQualificationImg = JSON.parse(res.data).data + .url; + 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}`); } } }); @@ -561,17 +741,20 @@ previewImageClose() { this.previewImageShow = false; }, - previewImageOpen() { - console.log('preview open'); - }, + previewImageOpen() {}, /** * @editPopup 淇敼寮瑰嚭妗嗕簨浠� */ editDriverPopupClose() { this.editDriverPopupShow = false; }, - editDriverPopupOpen() { - console.log('鎵撳紑浜�'); + editDriverPopupOpen() {}, + modifyPassword() { + this.$store.commit('changeisLogin', false) + this.$store.dispatch('websocketOnClose') + uni.reLaunch({ + url: '/pages/login/forgetPassword/forgetPassword' + }) }, // 淇敼鐢ㄦ埛淇℃伅 updateUser() { @@ -579,7 +762,7 @@ ...this.editUserInfo, carImg: uni.getStorageSync('carImg'), drivingImg: uni.getStorageSync('drivingImg'), - isRegister: 0 + isRegister: '0' }; this.$refs.editRef .validate() @@ -603,35 +786,6 @@ this.$u.toast('淇敼澶辫触'); }); }, - initPwd() { - this.initPwdShow = true - }, - initPwdConfirm() { - this.initPwdShow = false - uni.showLoading({ - title: '鍔犺浇涓�...' - }); - this.editUserInfo.password = '123456'; - this.editUserInfo.carImg = uni.getStorageSync('carImg'); - this.editUserInfo.drivingImg = uni.getStorageSync('drivingImg') - this.$reqPost('updateUser', this.editUserInfo, 'json').then(res => { - uni.hideLoading() - if (res.code == 0) { - uni.showToast({ - title: '閲嶇疆鎴愬姛', - duration: 2000, - icon: 'success' - }) - } else { - this.$u.toast(res.msg ? res.msg : '淇敼澶辫触'); - } - }).catch(err => { - this.$u.toast('淇敼澶辫触'); - }); - }, - initPwdCancel() { - this.initPwdShow = false - }, logout() { this.logoutShow = true; }, @@ -643,15 +797,26 @@ logoutCancel() { this.logoutShow = false; }, - // 璺宠浆鍙戣繍缁熻椤甸潰 - statistics() { + //淇敼纾呭崟鎵撳嵃鏍峰紡 + modifyPrint() { + this.$nextTick(() => { + this.$refs.printerStyleRef.init() + }) + }, + // 绉垎璇︽儏 + scoreDetail() { uni.navigateTo({ - url: '/pages/customer-page/customer-my/faYunstatistics/faYunstatistics' - }); + url: '/pages/driver-page/drvier-my/scoreDetail/scoreDetail' + }) }, - noobTour() { - this.$refs.previewImage.open('https://mx.jzeg.cn:9096/appimg/image/tour/driver/sj1.png') + addressManageHandle() { + uni.navigateTo({ + url: '/pages/driver-page/drvier-my/addressMange/addressMange' + }) }, + selectedPrintStyleHandle(val) { + this.selectedPrintStyle = val + } } }; </script> @@ -738,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%; @@ -750,7 +926,7 @@ &-block { width: 690rpx; - height: 478rpx; + 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; @@ -764,25 +940,28 @@ } .information-line { - @include flex width: 636rpx; + @include flex; + width: 636rpx; height: vww(45); border-bottom: 1rpx solid #f0f1f6; .line-label { - width: 188rpx; + width: 50%; height: 90rpx; + @include flex; - @include flex image { + image { width: 50rpx; height: 50rpx; } .label-text { - width: 120rpx; + flex: 0.8; font-size: 30rpx; font-weight: 400; color: #000000; line-height: 85rpx; + text-align: left; } } @@ -798,6 +977,10 @@ .last { border-bottom: 0; + + .information-value { + justify-content: space-between; + } } } } @@ -810,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; @@ -829,7 +1012,7 @@ .label-title { @include flex; - width: 220rpx; + width: 300rpx; height: 100rpx; .label-text { @@ -859,6 +1042,18 @@ .loginout-main { width: 84%; + } + } + + .person-utils { + width: 98%; + margin: vww(10) auto; + display: flex; + justify-content: space-between; + + .u-button { + width: 45%; + letter-spacing: vww(4); } } @@ -893,7 +1088,7 @@ .editDriverPopup-container-box { width: 90%; - margin: 0 auto; + margin: vww(10) auto; } //closeIcon -- Gitblit v1.9.1