From d8f015b20c2603d94a7c82918d377e43973ac72f Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 24 十月 2023 17:37:36 +0800
Subject: [PATCH] 修改司机修改资料未改变状态bug，增加司机我的页面下拉刷新，修改新手指引意外消失
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 deletions(-)
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 e1334a8..50789a2 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
@@ -1,7 +1,7 @@
<template>
<view class="bill-of-lading-details">
<view class="top-banner"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/loadingbanner.png') no-repeat;background-size: cover;">
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/loadingbanner.png') no-repeat;background-size: cover;">
<u-notice-bar :text="originInfoNotice"
v-if="haveInputOrigin"
fontSize='36'></u-notice-bar>
@@ -23,9 +23,9 @@
<view class="basic">
<view class="coalName">{{ coalDetailsData.coalName }}</view>
<view class="status-button"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/statusbutton.png') no-repeat;
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/statusbutton.png') no-repeat;
background-size: cover;">
- {{coalStatus[correctStatus]||''}}
+ {{coalDetailsData.statusView||''}}
</view>
</view>
<view class="time">
@@ -40,19 +40,19 @@
<view class="weigh-item">
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
鐨�</view>
<view class="num">{{ coalDetailsData.skin||"" }}</view>
</view>
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
姣�</view>
<view class="num">{{ coalDetailsData.hair||"" }}</view>
</view>
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
鍑�</view>
<view class="num">{{ coalDetailsData.clean||"" }}</view>
</view>
@@ -141,7 +141,8 @@
<u-button text="鎻愪氦"
type="primary"
@click.stop="submitOriginInfo"
- :disabled="isModifyoriginInfo"></u-button>
+ :disabled="isModifyoriginInfo"
+ :loading="submitOriginInfoLoading"></u-button>
</view>
</view>
</view>
@@ -336,7 +337,7 @@
serviecePhone: ''
},
coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠',
- '杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�', '杩斿洖鍔犲噺鍚�', '瓒呮椂', '鎵撳嵃涓�', '鎵撳嵃涓�', '濉啓'
+ '杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�', '杩斿洖鍔犲噺鍚�', '瓒呮椂', '鎵撳嵃涓�', '鎵撳嵃涓�', '濉啓', '鏀剧┖纭涓�', '瓒呮渶澶ф瘺閲嶇‘璁や腑'
], // 鐘舵��
weighHouseCode: '',
// 鏀剧┖寮圭獥鎺у埗鍙橀噺
@@ -395,7 +396,8 @@
timeout: '0',
wsgShow: false,
timeLineStatus: null,
- originInfoNotice: '濉啓鍘熷彂淇℃伅鍚庡彲涓婄璁￠噺'
+ originInfoNotice: '濉啓鍘熷彂淇℃伅鍚庡彲涓婄璁￠噺',
+ submitOriginInfoLoading: false
};
},
watch: {
@@ -717,16 +719,20 @@
evacuationConfirm() {
this.weighData = {
...this.weighData,
- weigh: this.globalweigh
+ weigh: this.globalweigh,
+ isBackground: 1
};
+ uni.showLoading({
+ title: '鍔犺浇涓�'
+ })
let mix = Object.assign(this.weighData, this.getWeightHouseObj);
this.$reqPost('getOneEvacuation', mix, 'json').then(res => {
- console.log(res, '绗竴娆℃斁绌�');
+ uni.hideLoading()
if (res.code == 0) {
this.$u.toast('鎿嶄綔鎴愬姛');
this.evacuationModalShow = false;
} else {
- this.$u.toast('鎿嶄綔澶辫触锛岃绋嶅悗閲嶈瘯');
+ this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触锛岃绋嶅悗閲嶈瘯');
this.evacuationModalShow = false;
}
});
@@ -771,7 +777,10 @@
} else {
this.$u.toast(res.msg ? res.msg : '鎵撳嵃澶辫触')
}
- })
+ }).catch(e => {
+ uni.hideLoading()
+ this.outLoading = false
+ })
},
// 鎵撳嵃鍑洪棬璇�
printExitPermit() {
@@ -780,14 +789,15 @@
})
let form = {
deptId: this.getWeightHouseObj.deptId,
+ filedId: this.getWeightHouseObj.filedId,
tmId: this.getWeightHouseObj.tmId,
carNo: uni.getStorageSync('carNo'),
type: 3,
weighingNumber: 2
}
+ let form1 = uni.getStorageSync('WeighHouseForm') ? uni.getStorageSync('WeighHouseForm') : '{}'
this.outLoading = true
- this.$reqPost('printer', Object.assign(form, JSON.parse(uni.getStorageSync('WeighHouseForm'))),
- 'json').then(res => {
+ this.$reqPost('printer', Object.assign(form, JSON.parse(form1)), 'json').then(res => {
uni.hideLoading()
this.outLoading = false
if (res.code === 0) {
@@ -795,6 +805,9 @@
} else {
this.$u.toast(res.msg ? res.msg : '鎵撳嵃澶辫触')
}
+ }).catch(e => {
+ uni.hideLoading()
+ this.outLoading = false
})
},
wsgContentConfirm() {
@@ -881,10 +894,13 @@
if (this.originInfoForm.coalContactSkin && this.originInfoForm.coalContactHair && this
.originInfoForm
.contactPicture) {
+ this.submitOriginInfoLoading = true
this.$reqPost('appSaveContact', form, 'json').then(res => {
if (res.code === 0) {
this.$u.toast('鎻愪氦鎴愬姛')
+ this.submitOriginInfoLoading = false
} else {
+ this.submitOriginInfoLoading = false
this.isModifyoriginInfo = true
this.$u.toast(res.msg ? res.msg : '鎻愪氦澶辫触')
--
Gitblit v1.9.1