From f5d9fc10d155aed63fdf91217380610faa60f9e0 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 14 七月 2023 15:04:36 +0800
Subject: [PATCH] 转发页面修改
---
pages/public-page/forward/forward.vue | 12 +-
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 49 +++++----
pages/driver-page/drvier-my/drvier-my.vue | 191 ++++++++++++++++++++++++++++++++------
pages/register/register.vue | 18 +-
4 files changed, 203 insertions(+), 67 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index b775edd..f83188c 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -221,31 +221,32 @@
},
watch: {
realTimeWeigh(newV, oldV) {
- if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType ==
- '杞嚭') {
- if (!this.showWeigh.skin) {
- this.temporaryWeighObj.skin = newV;
- } else {
- this.temporaryWeighObj.hair = newV;
- this.isweigh = Number(this.currentClean) > this.weighList.orderSurplus || Number(this
- .currentClean) < 0;
- }
- } else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
- .orderType == '杞叆') {
- if (!this.showWeigh.hair) {
- this.temporaryWeighObj.hair = newV;
- } else {
- this.temporaryWeighObj.skin = newV;
- this.isweigh = Number(this.currentClean) < 0 || this.showWeigh.skin < newV && this.showWeigh
- .skin > 0;
- }
- }
+
},
// 鐩戝惉閲嶉噺鍙樺寲
globalweigh: {
handler: function(newV) {
this.weighData.weigh = this.realTimeWeigh = newV;
- console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
+ if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList
+ .orderType == '杞嚭') {
+ if (!this.showWeigh.skin) {
+ this.temporaryWeighObj.skin = newV;
+ } else {
+ this.temporaryWeighObj.hair = newV;
+ this.isweigh = Number(this.currentClean) > this.weighList.orderSurplus || Number(this
+ .currentClean) < 0;
+ }
+ } else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
+ .orderType == '杞叆') {
+ if (!this.showWeigh.hair) {
+ this.temporaryWeighObj.hair = newV;
+ } else {
+ this.temporaryWeighObj.skin = newV;
+ this.isweigh = Number(this.currentClean) < 0 || this.showWeigh.skin < newV && this
+ .showWeigh
+ .skin > 0;
+ }
+ }
},
deep: true
}
@@ -294,7 +295,13 @@
},
currentClean() {
if (!this.currentSkin) return ''
- return (this.currentHair - this.currentSkin).toFixed(2)
+ if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
+ .orderType == '杞叆') {
+ return (this.currentHair - this.currentSkin).toFixed(2)
+ } else {
+ return !this.showWeigh.skin ? this.currentSkin : (this.currentHair - this.currentSkin).toFixed(2)
+ }
+
}
},
methods: {
diff --git a/pages/driver-page/drvier-my/drvier-my.vue b/pages/driver-page/drvier-my/drvier-my.vue
index 2e47a02..7f7ece3 100644
--- a/pages/driver-page/drvier-my/drvier-my.vue
+++ b/pages/driver-page/drvier-my/drvier-my.vue
@@ -1,17 +1,22 @@
<template>
<view class="driver-my">
- <view class="driver-banner">
- <view class="navgation">鎴戠殑</view>
- <view class="avatar">
- <view class="avatar-imgage"
- :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/driverava.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
+ <view class=""
+ style="height: 446rpx;width: 100%;">
+ <view class="driver-banner">
+ <view class="navgation">鎴戠殑</view>
+ <view class="avatar">
+ <view class="avatar-imgage"
+ :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/driverava.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
+ </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="information-block">
<view class="personal-information">
<view class="personal-information-block">
<view class="block-main">
@@ -60,6 +65,17 @@
<!-- <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.axleNum"></u-icon> -->
</view>
</view>
+ <view class="information-line">
+ <view class="line-label">
+ <image :src="`${onlineurl}/appimg/image/banner/axisnum.png`"
+ mode="widthFix"></image>
+ <view class="label-text">杞︾墝棰滆壊</view>
+ </view>
+ <view class="information-value">
+ {{ userInfo.vehicleColour || '' }}
+ <!-- <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.axleNum"></u-icon> -->
+ </view>
+ </view>
<view class="information-line last">
<view class="line-label">
<image :src="`${onlineurl}/appimg/image/banner/weighnum.png`"
@@ -68,7 +84,6 @@
</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>
@@ -90,6 +105,24 @@
width="80px"
height="80px"
@click="imageClick(1)">
+ <view slot="error"
+ style="font-size: 24rpx;">鍔犺浇澶辫触</view>
+ </u--image>
+ </view>
+ </view>
+ <view class="car-img">
+ <view class="label-title">
+ <image :src="`${onlineurl}/appimg/image/banner/cardimg.png`"
+ mode="widthFix"></image>
+ <view class="label-text">杞﹀ご杞﹀熬杞﹁韩鐓х墖</view>
+ </view>
+ <view class="img-container"
+ v-for="item in userInfo.bodyofcarJpg?userInfo.bodyofcarJpg.split(','):[]">
+ <u--image :showLoading="true"
+ :src="item.url ? item.url : ''"
+ width="80px"
+ height="80px"
+ @click="imageClickCarBody(item.url)">
<view slot="error"
style="font-size: 24rpx;">鍔犺浇澶辫触</view>
</u--image>
@@ -173,12 +206,37 @@
inputAlign="left"></u--input>
</u-form-item>
<u-form-item labelWidth="20%"
+ label="淇敼瀵嗙爜"
+ prop="password">
+ <u--input v-model="editUserInfo.password"
+ border="none"
+ inputAlign="left"></u--input>
+ </u-form-item>
+ <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 labelWidth="20%"
+ label="杞︾墝棰滆壊"
+ required
+ prop="vehicleColour">
+ <u-radio-group v-model="editUserInfo.vehicleColour"
+ placement="row"
+ size="30"
+ shape="circle"
+ iconSize="20">
+ <u-radio labelSize="14px"
+ size="20px"
+ :customStyle="{ marginBottom: '8px' }"
+ v-for="(item, index) in radiolist2"
+ :key="index"
+ :label="item.name"
+ :name="item.value"></u-radio>
+ </u-radio-group>
</u-form-item>
<u-form-item labelWidth="20%"
label="浣撻噸"
@@ -211,6 +269,23 @@
width="250"
height="150"
:previewFullImage="true"></u-upload>
+ </u-form-item>
+ <u-form-item prop="bodyofcarJpg"
+ label="杞﹀ご杞﹀熬杞﹁韩鐓х墖"
+ labelWidth="20%"
+ required
+ @click="beforeRead">
+ <u-upload :fileList="fileList3"
+ deletable
+ @afterRead="afterRead"
+ @delete="deletePic"
+ name="3"
+ multiple
+ :maxCount="3"
+ width="250"
+ height="150"
+ :previewFullImage="true">
+ </u-upload>
</u-form-item>
<u-form-item labelWidth="25%"
label="琛岄┒璇佺収鐗�"
@@ -268,7 +343,10 @@
drivingImg: '',
axleNum: '',
weight: '',
- userId: ''
+ userId: '',
+ vehicleColour: '',
+ bodyofcarJpg: '',
+ password: ''
},
rules: {
name: {
@@ -313,6 +391,9 @@
message: '璇峰～鍐欎綋閲�',
trigger: ['blur', 'change']
},
+ password: {
+ required: false,
+ },
carNo: [{
type: 'string',
required: true,
@@ -330,6 +411,12 @@
trigger: ['change', 'blur']
}
],
+ vehicleColour: {
+ type: 'string',
+ required: true,
+ message: '璇烽�夋嫨杞︾墝棰滆壊',
+ trigger: ['blur', 'change']
+ },
axleNum: [{
transform(value) {
return Number(value);
@@ -346,6 +433,12 @@
message: '璇蜂笂浼犺溅杈嗗浘鐗�',
trigger: ['blur', 'change']
},
+ bodyofcarJpg: {
+ type: 'string',
+ required: true,
+ message: '璇蜂笂浼犺溅杈嗗浘鐗�',
+ trigger: ['blur', 'change']
+ },
drivingImg: {
type: 'string',
required: true,
@@ -356,6 +449,9 @@
src: '',
fileList1: [],
fileList2: [],
+ // 杞﹀ご杞﹁韩杞﹀熬鐓х墖
+ fileList3: [],
+ carBody: [],
// 淇敼淇℃伅寮瑰嚭妗�
editDriverPopupShow: false,
// previewImage
@@ -366,7 +462,20 @@
logoutTitle: '鎻愮ず',
logoutContent: '鏄惁纭閫�鍑�',
BaseUrl,
- onlineurl
+ onlineurl,
+ radiolist2: [{
+ name: '榛勮壊',
+ value: '榛勮壊'
+ },
+ {
+ name: '榛勭豢鑹�',
+ value: '榛勭豢鑹�'
+ },
+ {
+ name: '钃濊壊',
+ value: '钃濊壊'
+ }
+ ],
};
},
onShow() {
@@ -389,6 +498,7 @@
this.userInfo = res.data;
uni.setStorageSync('carImg', this.userInfo.carImg);
uni.setStorageSync('drivingImg', this.userInfo.drivingImg);
+ uni.setStorageSync('bodyofcarJpg', this.userInfo.bodyofcarJpg)
if (this.fileList1.length == 0) {
this.fileList1.push({
url: `${BaseUrl}${this.userInfo.carImg}`
@@ -399,9 +509,25 @@
url: `${BaseUrl}${this.userInfo.drivingImg}`
});
}
+ if (this.fileList3.length == 0) {
+ if (!this.userInfo.bodyofcarJpg) return
+ if (this.userInfo.bodyofcarJpg.indexOf(',') !== -1) {
+ let bodyofcarJpg = this.userInfo.bodyofcarJpg.split(',')
+ bodyofcarJpg.forEach(v => {
+ this.fileList3.push({
+ url: `${BaseUrl}${v}`
+ });
+ })
+ } else {
+ this.fileList3.push({
+ url: `${BaseUrl}${this.userInfo.bodyofcarJpg}`
+ });
+ }
+ }
Object.keys(this.editUserInfo).map(item => {
if (res.data[item]) {
this.editUserInfo[item] = res.data[item];
+ this.editUserInfo.password = ''
}
});
});
@@ -411,8 +537,6 @@
this.editDriverPopupShow = true;
},
imageClick(index) {
- // 閫氳繃index鍒囨崲鍥剧墖
- console.log('鍒囨崲鍥剧墖', index);
if (index == 1) {
this.previewImageSrc = this.userInfo.carImg;
} else {
@@ -421,6 +545,9 @@
this.$nextTick(() => {
this.previewImageShow = true;
});
+ },
+ imageClickCarBody(url) {
+ this.previewImageSrc = url;
},
beforeRead() {
this.changeisUploadimg(true);
@@ -463,9 +590,6 @@
url: BaseUrl + '/admin/sys-file/uploadUnToken',
filePath: url,
name: 'file',
- // formData: {
- // user: 'test'
- // },
success: res => {
if (num == 1) {
this.editUserInfo.carImg = JSON.parse(res.data).data.url;
@@ -474,6 +598,12 @@
} else if (num == 2) {
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) {
+ let imageUrl = JSON.parse(res.data).data.url
+ this.carBody.push(imageUrl)
+ uni.setStorageSync('bodyofcarJpg', this.carBody.join(','));
+ this.editUserInfo.bodyofcarJpg = this.carBody.join(',')
resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
}
}
@@ -503,7 +633,8 @@
this.editUserInfo = {
...this.editUserInfo,
carImg: uni.getStorageSync('carImg'),
- drivingImg: uni.getStorageSync('drivingImg')
+ drivingImg: uni.getStorageSync('drivingImg'),
+ bodyofcarJpg: uni.getStorageSync('bodyofcarJpg')
};
this.$refs.editRef
.validate()
@@ -556,15 +687,10 @@
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%;
@@ -617,17 +743,21 @@
top: vww(4);
}
}
+ }
+
+ .information-block {
+ width: 100%;
.personal-information {
width: 100%;
display: flex;
justify-content: center;
position: relative;
- top: vww(20);
+ top: vww(-20);
&-block {
width: 690rpx;
- height: 478rpx;
+ height: 550rpx;
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;
@@ -683,12 +813,11 @@
.car-information {
width: 100%;
position: relative;
- top: vww(410);
@include flex justify-content: center;
.information-main {
width: 690rpx;
- height: 552rpx;
+ height: 828rpx;
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;
@@ -707,7 +836,7 @@
.label-title {
@include flex;
- width: 220rpx;
+ width: 300rpx;
height: 100rpx;
.label-text {
@@ -731,7 +860,7 @@
@include flex;
justify-content: center;
position: relative;
- bottom: vww(-430);
+ top: vww(20);
.loginout-main {
width: 84%;
diff --git a/pages/public-page/forward/forward.vue b/pages/public-page/forward/forward.vue
index 5e81f78..8ea8e96 100644
--- a/pages/public-page/forward/forward.vue
+++ b/pages/public-page/forward/forward.vue
@@ -158,10 +158,10 @@
return {
id: item.id,
orderPlanId: item.orderPlanId,
- name: item.xsUserName === null ? item.fleetName : item.xsUserName,
+ name: item.xsUserName ? item.xsUserName : item.fleetName,
carNum: item.carNum,
- xsUserId: item.xsUserId === null ? 0 : item.xsUserId,
- fleetId: item.fleetId === null ? 0 : item.fleetId,
+ xsUserId: item.xsUserId ? item.xsUserId : 0,
+ fleetId: item.fleetId ? item.fleetId : 0,
checkboxValue1: '',
vid: `${new Date().getTime()}${index}${item.id}`
};
@@ -173,8 +173,8 @@
orderPlanId: item.orderPlanId,
name: item.fleetName,
carNum: item.carNum,
- xsUserId: item.xsUserId === null ? 0 : item.xsUserId,
- fleetId: item.fleetId === null ? 0 : item.fleetId,
+ xsUserId: item.xsUserId ? 0 : item.xsUserId,
+ fleetId: item.fleetId ? 0 : item.fleetId,
checkboxValue1: '',
vid: `${new Date().getTime()}${index}${item.id}`
};
@@ -413,7 +413,7 @@
that.calculate(that.jhOrderPlanForwardList);
if (that.roleType == 1) {
if (that.jhOrderPlanForwardList[index].carNum < Number(that
- .carNumSurplus1)) {
+ .carNumSurplus1)) {
that.$set(that.jhOrderPlanForwardList[index], 'checkboxValue1', '');
that.jhOrderPlanForwardList.forEach((v, i) => {
if (index != i) {
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 6507980..56c7113 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -122,8 +122,8 @@
:previewFullImage="true">
</u-upload>
</u-form-item>
- <u-form-item prop="bodyOfCarJpg"
- label="杞﹁締缁嗚妭鐓х墖"
+ <u-form-item prop="bodyofcarJpg"
+ label="杞﹀ご杞﹀熬杞﹁韩鐓х墖"
labelWidth="20%"
borderBottom
v-if="radiovalue1 == '鍙告満'"
@@ -236,7 +236,7 @@
tuiJianMa: '',
confirmPassword: '',
vehicleColour: '',
- bodyOfCarJpg: ''
+ bodyofcarJpg: ''
},
fileList1: [],
fileList2: [],
@@ -330,7 +330,7 @@
message: '璇蜂笂浼犺溅杈嗗浘鐗�',
trigger: ['blur', 'change']
},
- bodyOfCarJpg: {
+ bodyofcarJpg: {
type: 'string',
required: true,
message: '璇蜂笂浼犺溅杈嗗浘鐗�',
@@ -355,15 +355,15 @@
radiovalue1: '璐т唬',
radiolist2: [{
name: '榛勮壊',
- value: 'huangse'
+ value: '榛勮壊'
},
{
- name: '缁胯壊',
- value: 'lvse'
+ name: '榛勭豢鑹�',
+ value: '榛勭豢鑹�'
},
{
name: '钃濊壊',
- value: 'lanse'
+ value: '钃濊壊'
}
],
beforeChangeValue: '',
@@ -508,7 +508,7 @@
} else if (num == 3) {
let imageUrl = JSON.parse(res.data).data.url
this.carBody.push(imageUrl)
- this.registerFormModel.bodyOfCarJpg = this.carBody.join(',')
+ this.registerFormModel.bodyofcarJpg = this.carBody.join(',')
resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
}
}
--
Gitblit v1.9.1