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 | 198 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 164 insertions(+), 34 deletions(-) diff --git a/pages/driver-page/drvier-my/drvier-my.vue b/pages/driver-page/drvier-my/drvier-my.vue index 3b8a30c..eb407d5 100644 --- a/pages/driver-page/drvier-my/drvier-my.vue +++ b/pages/driver-page/drvier-my/drvier-my.vue @@ -79,9 +79,44 @@ {{ 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"> + <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> @@ -143,11 +178,6 @@ </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" @@ -155,7 +185,7 @@ plain></u-button></view> </view> <!-- 寮曞椤� --> - <noob-tour></noob-tour> + <noob-tour isPersonCenter></noob-tour> <!-- 鍥剧墖棰勮寮瑰嚭妗� --> <view class="previewImage-container"> <u-popup :show="previewImageShow" @@ -188,14 +218,14 @@ 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> --> <u-form-item labelWidth="20%" label="韬唤璇佸彿" prop="idCard" @@ -268,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> @@ -283,14 +350,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> @@ -299,9 +360,10 @@ 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, noobTour }, + components: { previewImage, noobTour, printerStyle }, data() { return { // 鑾峰彇鐨勫徃鏈鸿鎯� @@ -320,7 +382,9 @@ weight: '', userId: '', password: "", - isRegister: '' + isRegister: 0, + tradeQualificationImg: '', + roadTransportImg: '' }, rules: { name: { @@ -419,6 +483,8 @@ src: '', fileList1: [], fileList2: [], + fileList3: [], + fileList4: [], // 淇敼淇℃伅寮瑰嚭妗� editDriverPopupShow: false, // previewImage @@ -429,8 +495,13 @@ logoutTitle: '鎻愮ず', logoutContent: '鏄惁纭閫�鍑�', BaseUrl, - + selectedPrintStyle: null }; + }, + computed: { + currentSelectedPrintStyle() { + return this.selectedPrintStyle ? this.selectedPrintStyle : uni.getStorageSync('selectedPrintStyle') + } }, onShow() { // this.init(); @@ -450,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}` @@ -462,9 +537,22 @@ 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 = '' @@ -539,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}`); } } }); @@ -550,17 +648,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() { @@ -568,7 +669,7 @@ ...this.editUserInfo, carImg: uni.getStorageSync('carImg'), drivingImg: uni.getStorageSync('drivingImg'), - isRegister: 0 + isRegister: '0' }; this.$refs.editRef .validate() @@ -603,10 +704,25 @@ logoutCancel() { this.logoutShow = false; }, + //淇敼纾呭崟鎵撳嵃鏍峰紡 + modifyPrint() { + this.$nextTick(() => { + this.$refs.printerStyleRef.init() + }) + }, + // 绉垎璇︽儏 scoreDetail() { uni.navigateTo({ url: '/pages/driver-page/drvier-my/scoreDetail/scoreDetail' }) + }, + addressManageHandle() { + uni.navigateTo({ + url: '/pages/driver-page/drvier-my/addressMange/addressMange' + }) + }, + selectedPrintStyleHandle(val) { + this.selectedPrintStyle = val } } }; @@ -706,7 +822,7 @@ &-block { width: 690rpx; - height: 570rpx; + 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; @@ -720,12 +836,13 @@ } .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; @@ -735,11 +852,12 @@ } .label-text { - width: 120rpx; + flex: 0.8; font-size: 30rpx; font-weight: 400; color: #000000; line-height: 85rpx; + text-align: left; } } @@ -823,6 +941,18 @@ } } + .person-utils { + width: 98%; + margin: vww(10) auto; + display: flex; + justify-content: space-between; + + .u-button { + width: 45%; + letter-spacing: vww(4); + } + } + // 琛ㄥ崟 .personal-information-form { margin-top: vww(200); @@ -854,7 +984,7 @@ .editDriverPopup-container-box { width: 90%; - margin: 0 auto; + margin: vww(10) auto; } //closeIcon -- Gitblit v1.9.1