From 0978691dc9047c7090dca64406f5d0ac027e8df4 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 30 十月 2023 17:59:31 +0800
Subject: [PATCH] 自主配送功能优化 部分功能增删 提煤单详情页面修改
---
pages/driver-page/drvier-my/drvier-my.vue | 303 ++++++++++++++++++++++++++++++++------------------
1 files changed, 195 insertions(+), 108 deletions(-)
diff --git a/pages/driver-page/drvier-my/drvier-my.vue b/pages/driver-page/drvier-my/drvier-my.vue
index 6bcc8d1..6f815cb 100644
--- a/pages/driver-page/drvier-my/drvier-my.vue
+++ b/pages/driver-page/drvier-my/drvier-my.vue
@@ -6,7 +6,7 @@
<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"
@@ -31,7 +31,7 @@
<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>
@@ -41,7 +41,7 @@
</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>
@@ -51,7 +51,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>
@@ -61,7 +61,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>
@@ -69,15 +69,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>
@@ -88,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>
@@ -105,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>
@@ -124,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"
@@ -136,24 +185,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"
@@ -164,12 +196,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">
@@ -192,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"
@@ -272,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>
@@ -287,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>
@@ -302,15 +359,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 {
// 鑾峰彇鐨勫徃鏈鸿鎯�
@@ -329,7 +382,9 @@
weight: '',
userId: '',
password: "",
- isRegister: ''
+ isRegister: 0,
+ tradeQualificationImg: '',
+ roadTransportImg: ''
},
rules: {
name: {
@@ -428,6 +483,8 @@
src: '',
fileList1: [],
fileList2: [],
+ fileList3: [],
+ fileList4: [],
// 淇敼淇℃伅寮瑰嚭妗�
editDriverPopupShow: false,
// previewImage
@@ -438,9 +495,13 @@
logoutTitle: '鎻愮ず',
logoutContent: '鏄惁纭閫�鍑�',
BaseUrl,
- initPwdShow: false
-
+ selectedPrintStyle: null
};
+ },
+ computed: {
+ currentSelectedPrintStyle() {
+ return this.selectedPrintStyle ? this.selectedPrintStyle : uni.getStorageSync('selectedPrintStyle')
+ }
},
onShow() {
// this.init();
@@ -462,6 +523,8 @@
this.userInfo = res.data;
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}`
@@ -470,6 +533,16 @@
if (this.fileList2.length == 0) {
this.fileList2.push({
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 => {
@@ -549,6 +622,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}`);
}
}
});
@@ -560,17 +643,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() {
@@ -578,7 +664,7 @@
...this.editUserInfo,
carImg: uni.getStorageSync('carImg'),
drivingImg: uni.getStorageSync('drivingImg'),
- isRegister: 0
+ isRegister: '0'
};
this.$refs.editRef
.validate()
@@ -602,35 +688,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;
},
@@ -642,15 +699,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>
@@ -749,7 +817,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;
@@ -763,25 +831,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;
}
}
@@ -797,6 +868,10 @@
.last {
border-bottom: 0;
+
+ .information-value {
+ justify-content: space-between;
+ }
}
}
}
@@ -861,6 +936,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);
@@ -892,7 +979,7 @@
.editDriverPopup-container-box {
width: 90%;
- margin: 0 auto;
+ margin: vww(10) auto;
}
//closeIcon
--
Gitblit v1.9.1