From 9a63b4c5f5dfcfa14a52fb726a0f5604077bba9c Mon Sep 17 00:00:00 2001 From: qingyiay <2386314947@qq.com> Date: 星期二, 28 十一月 2023 11:06:41 +0800 Subject: [PATCH] 修改原发信息提交限制 称重限制 --- pages/driver-page/drvier-my/drvier-my.vue | 380 ++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 281 insertions(+), 99 deletions(-) diff --git a/pages/driver-page/drvier-my/drvier-my.vue b/pages/driver-page/drvier-my/drvier-my.vue index f3ce250..eb407d5 100644 --- a/pages/driver-page/drvier-my/drvier-my.vue +++ b/pages/driver-page/drvier-my/drvier-my.vue @@ -1,75 +1,137 @@ <template> <view class="driver-my"> - <view class="driver-banner"> - <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;"> + <view class="" + style="height: 446rpx;width: 100%;"> + <view class="driver-banner"> + <view class="navgation">鎴戠殑</view> + <view class="avatar"> + <view class="avatar-imgage" + 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" + plain>缂栬緫涓汉璧勬枡</u-button></view> </view> - <view class="avatar-name">{{ userInfo.name || '' }}</view> - <view class="edit-button"><u-button type="primary" - @click="editBtnClick" - shape="circle" - plain>缂栬緫涓汉璧勬枡</u-button></view> </view> + </view> + <view class="process-state"> + <view class="state-text"> + 瀹℃牳鐘舵�� + </view> + <u--text :type="userInfo.isRegister===0?'primary':userInfo.isRegister===1?'error':'success'" + :text="userInfo.isRegister===0?'寰呭鏍�':userInfo.isRegister===1?'鏈�氳繃':'宸插鏍�'" + size="32"></u--text> + </view> + <view class="information-block"> <view class="personal-information"> <view class="personal-information-block"> <view class="block-main"> <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 || '' }} - <!-- <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.idCard"></u-icon> --> </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> <view class="information-value"> {{ userInfo.phone || '' }} - <!-- <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.phone"></u-icon> --> </view> </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> <view class="information-value"> {{ userInfo.carNo || '' }} - <!-- <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.carNo"></u-icon> --> </view> </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> <view class="information-value"> {{ userInfo.axleNum || '' }} - <!-- <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.axleNum"></u-icon> --> </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 || '' }} - <!-- <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.weight"></u-icon> --> </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> @@ -80,7 +142,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> @@ -97,7 +159,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> @@ -122,44 +184,8 @@ shape="circle" plain></u-button></view> </view> - <!-- <view class="personal-information-form"> - <u--form labelPosition="left" :model="userInfo" ref="form1"> - <u-form-item labelWidth="20%" label="濮撳悕" ref="item1"> - <u--input v-model="userInfo.name" border="none" inputAlign="right" disabled disabledColor="#fff"></u--input> - </u-form-item> - <u-form-item labelWidth="20%" label="韬唤璇佸彿" ref="item1"> - <u--input v-model="userInfo.idCard" border="none" inputAlign="right" disabled disabledColor="#fff"></u--input> - </u-form-item> - <u-form-item labelWidth="20%" label="鎵嬫満鍙�" ref="item1"> - <u--input v-model="userInfo.phone" border="none" inputAlign="right" disabled disabledColor="#fff"></u--input> - </u-form-item> - <u-form-item labelWidth="20%" label="杞︾墝鍙�" ref="item1"> - <u--input v-model="userInfo.carNo" border="none" inputAlign="right" disabled disabledColor="#fff"></u--input> - </u-form-item> - <u-form-item labelWidth="20%" label="浣撻噸" ref="item1"> - <u--input v-model="userInfo.weight" border="none" inputAlign="right" disabled disabledColor="#fff"></u--input> - </u-form-item> - <u-form-item v-model="userInfo.axleNum" labelWidth="20%" label="杞﹁酱鏁�" ref="item1"> - <u--input border="none" inputAlign="right" disabled disabledColor="#fff"></u--input> - </u-form-item> - <u-form-item labelWidth="20%" label="杞﹁締鐓х墖" ref="item1"> - <u--image :showLoading="true" :src="userInfo.carImg != null ? BaseUrl + userInfo.carImg : ''" width="80px" height="80px" @click="imageClick(1)"> - <view slot="error" style="font-size: 24rpx;">鍔犺浇澶辫触</view> - </u--image> - </u-form-item> - <u-form-item labelWidth="25%" label="琛岄┒璇佺収鐗�" ref="item1"> - <u--image :showLoading="true" :src="userInfo.drivingImg != null ? BaseUrl + userInfo.drivingImg : ''" width="80px" height="80px" @click="imageClick(2)"> - <view slot="error" style="font-size: 24rpx;">鍔犺浇澶辫触</view> - </u--image> - </u-form-item> - </u--form> - <view class="push-information-button"> - <u-button text="淇敼涓汉璧勬枡" type="primary" @click="editBtnClick"></u-button> - <u-button text="閫�鍑虹櫥褰�" type="primary" @click="logout"></u-button> - </view> --> - <!-- <view class="statistics"><u-button text="鍙戣繍缁熻" type="primary" @click="statistics"></u-button></view> --> - <!-- </view> --> - + <!-- 寮曞椤� --> + <noob-tour isPersonCenter></noob-tour> <!-- 鍥剧墖棰勮寮瑰嚭妗� --> <view class="previewImage-container"> <u-popup :show="previewImageShow" @@ -171,7 +197,6 @@ height="400px"></u--image> </u-popup> </view> - <!-- 淇敼寮瑰嚭妗� --> <view class="editDriverPopup-container"> <u-popup :show="editDriverPopupShow" @@ -193,6 +218,14 @@ border="none" inputAlign="left"></u--input> </u-form-item> + <!-- <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%" label="韬唤璇佸彿" prop="idCard" @@ -209,14 +242,14 @@ border="none" inputAlign="left"></u--input> </u-form-item> - <u-form-item labelWidth="20%" + <!-- <u-form-item labelWidth="20%" label="杞︾墝鍙�" prop="carNo" required> <u--input v-model="editUserInfo.carNo" border="none" inputAlign="left"></u--input> - </u-form-item> + </u-form-item> --> <u-form-item labelWidth="20%" label="浣撻噸" prop="weight" @@ -265,10 +298,47 @@ 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> - <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> @@ -280,14 +350,20 @@ @confirm="logoutConfirm" @cancel="logoutCancel"></u-modal> </view> + <printerStyle ref="printerStyleRef" + @selectedPrintStyle='selectedPrintStyleHandle' /> </view> </template> <script> - import { customerId, userInfo, redirectLogin } from '@/utils/status'; + import { redirectLogin } from '@/utils/status'; import { BaseUrl } from '@/api/publicInterface.js'; - import { mapMutations } from 'vuex'; + 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, noobTour, printerStyle }, data() { return { // 鑾峰彇鐨勫徃鏈鸿鎯� @@ -304,7 +380,11 @@ drivingImg: '', axleNum: '', weight: '', - userId: '' + userId: '', + password: "", + isRegister: 0, + tradeQualificationImg: '', + roadTransportImg: '' }, rules: { name: { @@ -346,8 +426,19 @@ weight: { type: 'number', required: true, - message: '璇峰~鍐欎綋閲�', - trigger: ['blur', 'change'] + trigger: ['blur', 'change'], + transform(value) { + return Number(value); + }, + validator: (rule, value, callback) => { + if (!value) { + callback(new Error('璇峰~鍐欎綋閲�')) + } else if (value > 200) { + callback(new Error('璇峰~鍐欏悎鐞嗕綋閲�')) + } else { + callback() + } + } }, carNo: [{ type: 'string', @@ -392,6 +483,8 @@ src: '', fileList1: [], fileList2: [], + fileList3: [], + fileList4: [], // 淇敼淇℃伅寮瑰嚭妗� editDriverPopupShow: false, // previewImage @@ -401,8 +494,14 @@ logoutShow: false, logoutTitle: '鎻愮ず', logoutContent: '鏄惁纭閫�鍑�', - BaseUrl + BaseUrl, + selectedPrintStyle: null }; + }, + computed: { + currentSelectedPrintStyle() { + return this.selectedPrintStyle ? this.selectedPrintStyle : uni.getStorageSync('selectedPrintStyle') + } }, onShow() { // this.init(); @@ -422,8 +521,12 @@ 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) { this.fileList1.push({ url: `${BaseUrl}${this.userInfo.carImg}` @@ -434,11 +537,25 @@ url: `${BaseUrl}${this.userInfo.drivingImg}` }); } + if (this.fileList3.length == 0) { + this.fileList3.push({ + url: `${BaseUrl}${this.userInfo.roadTransportImg}` + }); + } + if (this.fileList4.length == 0) { + this.fileList4.push({ + url: `${BaseUrl}${this.userInfo.tradeQualificationImg}` + }); + } Object.keys(this.editUserInfo).map(item => { if (res.data[item]) { this.editUserInfo[item] = res.data[item]; + this.editUserInfo.idCard = this.userInfo.idCard.slice(0, 6) + '********' + this + .editUserInfo.idCard + .slice(-4) } }); + this.editUserInfo.password = '' }); }, // 淇敼鎸夐挳鐐瑰嚮 @@ -510,6 +627,16 @@ 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}`); } } }); @@ -521,24 +648,28 @@ 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() { this.editUserInfo = { ...this.editUserInfo, carImg: uni.getStorageSync('carImg'), - drivingImg: uni.getStorageSync('drivingImg') + drivingImg: uni.getStorageSync('drivingImg'), + isRegister: '0' }; this.$refs.editRef .validate() @@ -567,15 +698,31 @@ }, logoutConfirm() { redirectLogin(); + this.$store.commit('changeisLogin', false) + this.$store.dispatch('websocketOnClose') }, 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' + }) + }, + addressManageHandle() { + uni.navigateTo({ + url: '/pages/driver-page/drvier-my/addressMange/addressMange' + }) + }, + selectedPrintStyleHandle(val) { + this.selectedPrintStyle = val } } }; @@ -589,15 +736,11 @@ align-items: center; } - .statistics { - margin-top: vww(10); - margin-bottom: vww(10); - } ::v-deep.driver-my { width: 100%; margin: 0 auto; - padding-bottom: vww(60); + padding-bottom: vww(100); .driver-banner { width: 100%; @@ -650,17 +793,36 @@ top: vww(4); } } + } + + .process-state { + width: 300rpx; + height: 50rpx; + margin: 0 auto; + position: fixed; + top: 284rpx; + left: 37rpx; + display: flex; + align-items: center; + + .state-text { + margin-right: vww(6); + } + } + + .information-block { + width: 100%; .personal-information { width: 100%; display: flex; justify-content: center; position: relative; - top: vww(20); + top: vww(-30); &-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; @@ -674,25 +836,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; } } @@ -708,6 +873,10 @@ .last { border-bottom: 0; + + .information-value { + justify-content: space-between; + } } } } @@ -716,7 +885,6 @@ .car-information { width: 100%; position: relative; - top: vww(410); @include flex justify-content: center; .information-main { @@ -760,14 +928,28 @@ .loginout { width: 100%; - height: 74rpx; + height: 200rpx; @include flex; - justify-content: center; + justify-content: space-around; + flex-direction: column; + align-items: center; position: relative; - bottom: vww(-430); + top: vww(20); .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); } } @@ -802,7 +984,7 @@ .editDriverPopup-container-box { width: 90%; - margin: 0 auto; + margin: vww(10) auto; } //closeIcon -- Gitblit v1.9.1