From 05273ace3da665cb10c36ca0dac4413a8284302a Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 17 五月 2023 18:10:36 +0800
Subject: [PATCH] 增加部分限制，增加新功能
---
pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue | 4
pages/driver-page/drvier-my/drvier-my.vue | 210 ++++++++++++++++++++++++++++++----
pages/public-page/mapRoute/mapRoute.vue | 16 +-
pages/register/register.vue | 4
pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue | 8
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 7
pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue | 4
pages/driver-page/driver-index/driver-index.vue | 62 +++++++---
8 files changed, 248 insertions(+), 67 deletions(-)
diff --git a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
index 81124d6..e2c418d 100644
--- a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
+++ b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
@@ -616,7 +616,9 @@
width: vww(40);
}
.scroll-Y {
- height: 900rpx;
+ height: 1000rpx;
+ position: relative;
+ top: 20rpx;
}
.utils-button {
width: 94%;
@@ -824,7 +826,7 @@
font-weight: 400;
color: #f81414;
position: absolute;
- right: -10rpx;
+ right: 12rpx;
display: flex;
flex-wrap: wrap;
}
@@ -921,7 +923,7 @@
}
}
.filter-main {
- height: 950rpx;
+ min-height: 950rpx;
width: 100%;
display: flex;
flex-direction: column;
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
index d8006c0..3b23e08 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -6,7 +6,8 @@
<view class="cutomer-name" v-else>瀹㈡埛:{{ coalDetailsData.customerName || '' }}</view>
<view class="fild-name">
<view class="">鐭垮満:{{ coalDetailsData.deptName || '鏆傛棤' }}</view>
- <view class="">鐓ゅ満:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
+ <view class="" v-if="orderType == '杞叆' || orderType == '杞嚭'">鐓ゅ満:{{ coalDetailsData.toFiledName || '' }}</view>
+ <view class="" v-else>鐓ゅ満:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
</view>
</view>
<view class="block-information">
@@ -55,8 +56,8 @@
<view class="utilsBox">
<view class="utils_chil utils_chilTop">
<view class="top-button">
- <u-button text="绛惧埌" type="primary" plain @click="arriveClick" shape="circle"></u-button>
- <u-button text="鍏ュ満鐢宠" type="primary" plain @click="rcsqClick" shape="circle"></u-button>
+ <u-button text="绛惧埌" type="primary" plain @click="arriveClick" shape="circle" :disabled="coalDetailsData.status >= 2"></u-button>
+ <u-button text="鍏ュ満鐢宠" type="primary" plain @click="rcsqClick" shape="circle" :disabled="coalDetailsData.status >= 3"></u-button>
</view>
<view class="bottom-button">
<u-button text="鏀剧┖" type="primary" plain @click="evacuation" throttleTime="500" shape="circle" :disabled="isEvacuation || isapproach"></u-button>
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue b/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue
index 008c53a..ac4ef2e 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue
@@ -9,10 +9,10 @@
<p>{{ nowTime }}</p>
</view>
</view>
- <view class="punchTheClock_text">
+ <!-- <view class="punchTheClock_text">
<u-icon name="map" color="#51e30d" size="30"></u-icon>
<text>鏈繘鍏ョ熆鍦哄尯鍩�</text>
- </view>
+ </view> -->
</view>
</view>
</template>
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 116235f..e20bc70 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -6,6 +6,7 @@
<view class="wait-collection" style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/diverbanner.png') no-repeat;background-size:contain"></view>
<view class="collection-form">
<view class="collection-form-item" v-for="(item, index) in driverBillOfLoadingData.list1" :key="index">
+ <view class="main-divider"></view>
<view class="first-line">
<view class="main-information">
<view class="sign">瑁�</view>
@@ -14,7 +15,6 @@
<text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerNameCopy }}</text>
</view>
</view>
- <view class="main-divider"></view>
<view class="point-number">
<text class="residue">{{ item.carNum - item.taskNum }}</text>
<text>/{{ item.carNum }}</text>
@@ -62,6 +62,7 @@
<view class="appointment-form">
<view class="appointment-form-item" v-for="(item, index) in driverBillOfLoadingData.list3" :key="index">
+ <view class="main-divider"></view>
<view class="first-line">
<view class="main-information">
<view class="sign">瑁�</view>
@@ -70,12 +71,11 @@
<text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerName }}</text>
</view>
</view>
- <view class="main-divider"></view>
<view class="map-icon" @click.stop="skipMap(item)">
<view><u-icon name="map" color="#4978F0" size="40"></u-icon></view>
</view>
</view>
- <view class="second-line">
+ <view class="first-extra">
<view class="main-information">
<view class="sign">鍗�</view>
<view class="filedname exceedHide">
@@ -114,6 +114,7 @@
></u-empty>
<view class="appointment-form">
<view class="appointment-form-item" v-for="(item, index) in driverBillOfLoadingData.list2" :key="index" @click="list3CardIconClick(item)">
+ <view class="main-divider"></view>
<view class="first-line">
<view class="main-information">
<view class="sign">瑁�</view>
@@ -122,7 +123,6 @@
<text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerName }}</text>
</view>
</view>
- <view class="main-divider"></view>
<view class="map-icon" @click.stop="skipMap(item)">
<view><u-icon name="map" color="#4978F0" size="40"></u-icon></view>
</view>
@@ -383,6 +383,14 @@
display: flex;
flex-direction: column;
justify-content: space-around;
+ .main-divider {
+ width: 560rpx;
+ height: 2rpx;
+ background: #e3e3e3;
+ position: absolute;
+ top: 122rpx;
+ left: 128rpx;
+ }
.first-line {
width: 94%;
height: vww(68);
@@ -407,14 +415,6 @@
color: #ffffff;
margin-right: vww(20);
}
- }
- .main-divider {
- width: 548rpx;
- height: 1rpx;
- background: #e3e3e3;
- position: absolute;
- top: 115rpx;
- left: vww(50);
}
.point-number {
position: absolute;
@@ -572,6 +572,15 @@
@include formItem;
height: vww(191);
justify-content: space-between;
+ overflow: hidden;
+ .main-divider {
+ width: 560rpx;
+ height: 1rpx;
+ background: #e3e3e3;
+ position: absolute;
+ top: 122rpx;
+ left: 128rpx;
+ }
.first-line {
position: relative;
@include firstLine;
@@ -581,7 +590,6 @@
display: flex;
justify-content: flex-start;
align-items: center;
-
.sign {
width: vww(28);
height: vww(28);
@@ -595,13 +603,27 @@
margin-right: vww(20);
}
}
- .main-divider {
- width: 548rpx;
- height: 1rpx;
- background: #e3e3e3;
- position: absolute;
- top: vww(40);
- left: vww(50);
+ }
+ .first-extra {
+ @include firstLine;
+ .main-information {
+ width: 100%;
+ height: vww(28);
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+ .sign {
+ width: vww(28);
+ height: vww(28);
+ line-height: vww(28);
+ text-align: center;
+ background: url('https://mx.jzeg.cn:9095/appimg/image/banner/redblock.png') no-repeat;
+ background-size: contain;
+ font-size: 30rpx;
+ font-weight: 400;
+ color: #ffffff;
+ margin-right: vww(20);
+ }
}
}
.second-line {
diff --git a/pages/driver-page/drvier-my/drvier-my.vue b/pages/driver-page/drvier-my/drvier-my.vue
index 430b999..bf10fb2 100644
--- a/pages/driver-page/drvier-my/drvier-my.vue
+++ b/pages/driver-page/drvier-my/drvier-my.vue
@@ -145,18 +145,50 @@
<u-popup :show="editDriverPopupShow" mode="bottom" @close="editDriverPopupClose" @open="editDriverPopupOpen" :closeable="true">
<combined-title title="淇敼涓汉淇℃伅" style="margin-left:20rpx"></combined-title>
<view class="editDriverPopup-container-box">
- <u--form labelPosition="left" :model="editUserInfo" ref="form1">
- <u-form-item labelWidth="20%" label="濮撳悕" ref="item1"><u--input v-model="editUserInfo.name" border="none" inputAlign="left"></u--input></u-form-item>
- <u-form-item labelWidth="20%" label="韬唤璇佸彿" ref="item1"><u--input v-model="editUserInfo.idCard" border="none" inputAlign="left"></u--input></u-form-item>
- <u-form-item labelWidth="20%" label="鎵嬫満鍙�" ref="item1"><u--input v-model="editUserInfo.phone" border="none" inputAlign="left"></u--input></u-form-item>
- <u-form-item labelWidth="20%" label="杞︾墝鍙�" ref="item1"><u--input v-model="editUserInfo.carNo" border="none" inputAlign="left"></u--input></u-form-item>
- <u-form-item labelWidth="20%" label="浣撻噸" ref="item1"><u--input v-model="editUserInfo.weight" border="none" inputAlign="left"></u--input></u-form-item>
- <u-form-item labelWidth="20%" label="杞﹁酱鏁�" ref="item1"><u--input v-model="editUserInfo.axleNum" border="none" inputAlign="left"></u--input></u-form-item>
- <u-form-item labelWidth="25%" label="杞﹁締鐓х墖" ref="item1">
- <u-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple :maxCount="1" width="250" height="150"></u-upload>
+ <u--form labelPosition="left" :model="editUserInfo" ref="editRef">
+ <u-form-item labelWidth="20%" label="濮撳悕" prop="name" required>
+ <u--input v-model="editUserInfo.name" border="none" inputAlign="left"></u--input>
</u-form-item>
- <u-form-item labelWidth="25%" label="琛岄┒璇佺収鐗�" ref="item1">
- <u-upload :fileList="fileList2" @afterRead="afterRead" @delete="deletePic" name="2" multiple :maxCount="1" width="250" height="150"></u-upload>
+ <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 labelWidth="20%" label="鎵嬫満鍙�" prop="phone" required>
+ <u--input v-model="editUserInfo.phone" 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="浣撻噸" prop="weight" required>
+ <u--input v-model="editUserInfo.weight" border="none" inputAlign="left" placeholder="浣撻噸浠g浣滀负鍗曚綅"></u--input>
+ </u-form-item>
+ <u-form-item labelWidth="20%" label="杞﹁酱鏁�" prop="axleNum" required>
+ <u--input v-model="editUserInfo.axleNum" border="none" inputAlign="left"></u--input>
+ </u-form-item>
+ <u-form-item labelWidth="25%" label="杞﹁締鐓х墖" @click="beforeRead" prop="carImg" required>
+ <u-upload
+ :fileList="fileList1"
+ @afterRead="afterRead"
+ @delete="deletePic"
+ name="1"
+ 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="drivingImg" required>
+ <u-upload
+ :fileList="fileList2"
+ @afterRead="afterRead"
+ @delete="deletePic"
+ name="2"
+ 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>
@@ -172,6 +204,7 @@
<script>
import { customerId, userInfo, redirectLogin } from '@/utils/status';
import { BaseUrl } from '@/api/publicInterface.js';
+import { mapMutations } from 'vuex';
export default {
data() {
return {
@@ -191,6 +224,94 @@
weight: '',
userId: ''
},
+ rules: {
+ name: {
+ type: 'string',
+ required: true,
+ message: '璇峰～鍐欏鍚�',
+ trigger: ['blur', 'change']
+ },
+ idCard: [
+ {
+ type: 'string',
+ required: true,
+ message: '璇疯緭鍏ヨ韩浠借瘉鍙�',
+ trigger: ['blur', 'change']
+ },
+ {
+ pattern: /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+ message: '韬唤璇佸彿鏍煎紡涓嶆纭�'
+ }
+ ],
+ phone: [
+ {
+ required: true,
+ message: '姝ら」涓哄繀濉」',
+ // blur鍜宑hange浜嬩欢瑙﹀彂妫�楠�
+ trigger: ['blur', 'change']
+ },
+ {
+ min: 11,
+ max: 11,
+ message: '璇疯緭鍏ュ悎娉曟墜鏈哄彿'
+ },
+ {
+ validator: (rule, value, callback) => {
+ return uni.$u.test.mobile(value);
+ },
+ message: '鎵嬫満鍙风爜鏍煎紡涓嶆纭�',
+ trigger: ['change', 'blur']
+ }
+ ],
+ weight: {
+ type: 'number',
+ required: true,
+ message: '璇峰～鍐欎綋閲�',
+ trigger: ['blur', 'change']
+ },
+ carNo: [
+ {
+ type: 'string',
+ required: true,
+ message: '璇疯緭鍏ヨ溅鐗屽彿',
+ trigger: ['blur', 'change']
+ },
+ {
+ transform(value) {
+ return String(value);
+ },
+ validator: (rule, value, callback) => {
+ return uni.$u.test.carNo(value);
+ },
+ message: '璇疯緭鍏ユ纭殑杞︾墝鍙�',
+ trigger: ['change', 'blur']
+ }
+ ],
+ axleNum: [
+ {
+ transform(value) {
+ return Number(value);
+ },
+ validator: (rule, value, callback) => {
+ return value <= 10;
+ },
+ message: '璇疯緭鍏ユ纭殑杞﹁酱鏁�',
+ trigger: ['change', 'blur']
+ }
+ ],
+ carImg: {
+ type: 'string',
+ required: true,
+ message: '璇蜂笂浼犺溅杈嗗浘鐗�',
+ trigger: ['blur', 'change']
+ },
+ drivingImg: {
+ type: 'string',
+ required: true,
+ message: '璇蜂笂浼犺椹惰瘉鐓х墖',
+ trigger: ['blur', 'change']
+ }
+ },
src: '',
fileList1: [],
fileList2: [],
@@ -209,7 +330,11 @@
onShow() {
// this.init();
},
+ onReady() {
+ this.$refs.editRef.setRules(this.rules);
+ },
methods: {
+ ...mapMutations(['changeisUploadimg']),
init() {
this.getUserEntity();
},
@@ -220,6 +345,18 @@
this.$reqGet('getUserEntity').then(res => {
uni.hideLoading();
this.userInfo = res.data;
+ uni.setStorageSync('carImg', this.userInfo.carImg);
+ uni.setStorageSync('drivingImg', this.userInfo.drivingImg);
+ if (this.fileList1.length == 0) {
+ this.fileList1.push({
+ url: `${BaseUrl}${this.userInfo.carImg}`
+ });
+ }
+ if (this.fileList2.length == 0) {
+ this.fileList2.push({
+ url: `${BaseUrl}${this.userInfo.drivingImg}`
+ });
+ }
Object.keys(this.editUserInfo).map(item => {
if (res.data[item]) {
this.editUserInfo[item] = res.data[item];
@@ -243,8 +380,12 @@
this.previewImageShow = true;
});
},
+ beforeRead() {
+ this.changeisUploadimg(true);
+ },
// 鍒犻櫎
deletePic(event) {
+ this.changeisUploadimg(true);
this[`fileList${event.name}`].splice(event.index, 1);
},
// 鏂板鍥剧墖
@@ -267,7 +408,7 @@
1,
Object.assign(item, {
status: 'success',
- message: '',
+ message: '涓婁紶鎴愬姛',
url: result
})
);
@@ -284,11 +425,14 @@
// user: 'test'
// },
success: res => {
- resolve(JSON.parse(res.data).data.url);
if (num == 1) {
this.editUserInfo.carImg = JSON.parse(res.data).data.url;
+ uni.setStorageSync('carImg', JSON.parse(res.data).data.url);
+ resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
} 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}`);
}
}
});
@@ -314,20 +458,32 @@
},
// 淇敼鐢ㄦ埛淇℃伅
updateUser() {
- this.$reqPost('updateUser', this.editUserInfo, 'json').then(res => {
- console.log('鏇存柊鏁版嵁', res);
- this.editDriverPopupShow = false;
- if (res.code == 0) {
- this.$u.toast('淇敼鎴愬姛');
- this.init();
- } else {
- uni.showToast({
- title: res.msg,
- icon: 'none',
- duration: 2000
+ this.editUserInfo = {
+ ...this.editUserInfo,
+ carImg: uni.getStorageSync('carImg'),
+ drivingImg: uni.getStorageSync('drivingImg')
+ };
+ this.$refs.editRef
+ .validate()
+ .then(res => {
+ this.$reqPost('updateUser', this.editUserInfo, 'json').then(res => {
+ console.log('鏇存柊鏁版嵁', res);
+ this.editDriverPopupShow = false;
+ if (res.code == 0) {
+ this.$u.toast('淇敼鎴愬姛');
+ this.init();
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ });
+ }
});
- }
- });
+ })
+ .catch(err => {
+ this.$u.toast('淇敼澶辫触');
+ });
},
logout() {
this.logoutShow = true;
@@ -533,7 +689,7 @@
.editDriverPopup-container {
.u-popup {
.u-transition {
- height: 95%;
+ height: 75%;
.u-popup__content {
overflow: scroll !important;
.editDriverPopup-container-box {
diff --git a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
index 11d83ee..a933098 100644
--- a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
+++ b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
@@ -398,12 +398,12 @@
}
}
.main-divider {
- width: 548rpx;
+ width: 560rpx;
height: 1rpx;
background: #e3e3e3;
position: absolute;
top: 98rpx;
- left: vww(50);
+ left: 122rpx;
}
.point-number {
position: absolute;
diff --git a/pages/public-page/mapRoute/mapRoute.vue b/pages/public-page/mapRoute/mapRoute.vue
index 573718e..5671a6b 100644
--- a/pages/public-page/mapRoute/mapRoute.vue
+++ b/pages/public-page/mapRoute/mapRoute.vue
@@ -54,11 +54,11 @@
id: 0,
callout: {
content: '璧风偣', //鏂囨湰
- color: '#000000', //鏂囧瓧棰滆壊
- fontSize: 14, //鏂囨湰澶у皬
- borderRadius: 15, //杈规鍦嗚
+ color: '#ffffff', //鏂囧瓧棰滆壊
+ fontSize: 10, //鏂囨湰澶у皬
+ borderRadius: 12, //杈规鍦嗚
borderWidth: '10',
- bgColor: '#e51860', //鑳屾櫙棰滆壊
+ bgColor: '#08b078', //鑳屾櫙棰滆壊
display: 'ALWAYS' //甯告樉
}
},
@@ -72,10 +72,10 @@
callout: {
content: '缁堢偣', //鏂囨湰
color: '#ffffff', //鏂囧瓧棰滆壊
- fontSize: 14, //鏂囨湰澶у皬
- borderRadius: 15, //杈规鍦嗚
+ fontSize: 10, //鏂囨湰澶у皬
+ borderRadius: 12, //杈规鍦嗚
borderWidth: '10',
- bgColor: '#e51860', //鑳屾櫙棰滆壊
+ bgColor: '#fc645c', //鑳屾櫙棰滆壊
display: 'ALWAYS' //甯告樉
}
}
@@ -171,7 +171,7 @@
_this.polyline = [
{
points: pl,
- color: '#FF0000DD',
+ color: '#04b474',
width: 4,
arrowLine: true
}
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 94eb142..c901a7b 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -162,7 +162,7 @@
phone: [
{
required: true,
- message: '姝や负蹇呭～瀛楁',
+ message: '姝ら」涓哄繀濉」',
// blur鍜宑hange浜嬩欢瑙﹀彂妫�楠�
trigger: ['blur', 'change']
},
@@ -308,7 +308,7 @@
})
.catch(err => {
console.log('err', err);
- uni.$u.toast('璇疯鑼冭緭鍏ュ唴瀹�');
+ this.$u.toast('璇疯鑼冭緭鍏ュ唴瀹�');
});
} else {
this.$u.toast('涓ゆ瀵嗙爜涓嶄竴鑷�');
--
Gitblit v1.9.1