From eec82b55813387e20087989536cd32810b59cd48 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 13 十月 2023 09:42:49 +0800
Subject: [PATCH] 大部分按钮增加loading 放空操作逻辑修改

---
 pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 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 a846053..72ae6c0 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
@@ -189,6 +189,7 @@
 				plain
 				@click="evacuation"
 				throttleTime="500"
+				:loading="TwoEvacuationLoading"
 				v-if='weighList.skin||weighList.hair'></u-button>
 			<!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
 			<u-button type="primary"
@@ -203,7 +204,8 @@
 				:disabled="addAndSubtractCoalDisabled"
 				@click="addAndSubtractCoal"
 				class="jiajian"
-				v-if="outBuy||!isSkinWeigh"></u-button>
+				v-if="outBuy||!isSkinWeigh"
+				:loading="addAndSubtractCoalLoading"></u-button>
 		</view>
 		<view v-show="isExceedOrigin"
 			style="color: #ff6363;width: auto;margin: 0 auto;">
@@ -389,7 +391,9 @@
 				refreshLoading: false,
 				timer: null,
 				afterEvacuationStatus: null, //鏀剧┖鍚庢彁鐓ゅ崟鐘舵�佺姸鎬佷负21鏃舵彁绀衡�樼瓑寰呯鎴跨‘璁も��
-				afterEvacuationText: ''
+				afterEvacuationText: '',
+				TwoEvacuationLoading: false,
+				addAndSubtractCoalLoading: false
 			};
 		},
 		watch: {
@@ -582,6 +586,7 @@
 			},
 			// 鍔犲噺鐓�
 			addAndSubtractCoal() {
+				this.addAndSubtractCoalLoading = true
 				this.$reqPost('addAndSubtractCoal', {
 					deptId: this.weighData.deptId,
 					sceneId: this.weighData.sceneId,
@@ -592,6 +597,7 @@
 					weigh: this.weighData.weigh
 				}, 'json').then(res => {
 					if (res.code == 0) {
+						this.addAndSubtractCoalLoading = false
 						this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
 						setTimeout(() => {
 							uni.navigateBack({
@@ -599,7 +605,8 @@
 							});
 							this.isConfirmWeighLoading = false;
 						}, 1000);
-						console.log(res, '鍔犲噺鐓�');
+					} else {
+						this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触');
 					}
 				});
 			},
@@ -609,22 +616,24 @@
 			},
 			// 鏀剧┖寮圭獥纭
 			evacuationConfirm() {
+				this.TwoEvacuationLoading = true;
 				this.$reqPost('getTwoEvacuation', this.weighData, 'json').then(res => {
 					console.log(res, '绗簩娆℃斁绌�');
-					if (res.code == 0) {
-						this.$u.toast('鎿嶄綔鎴愬姛');
-						// setTimeout(() => {
-						// 	uni.navigateBack({
-						// 		delta: 1
-						// 	});
-						// }, 1000);
+					if (res.msg.length > 4) { //澶т簬4鏄瓑寰呭悗鍙扮‘璁�
+						this.TwoEvacuationLoading = true;
 						this.evacuationModalShow = false;
 						this.afterEvacuationStatus = res.data.status === 21 || res.data.status === 22
 						this.afterEvacuationText = res.msg
 
-					} else {
-						this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触');
-						this.evacuationModalShow = true;
+					} else { //灏忎簬4鎴愬姛
+						this.TwoEvacuationLoading = false;
+						this.evacuationModalShow = false;
+						this.$u.toast('鎿嶄綔鎴愬姛,鍗冲皢杩斿洖涓婁竴椤�');
+						setTimeout(() => {
+							uni.navigateBack({
+								delta: 1
+							});
+						}, 1000);
 					}
 				});
 			},
@@ -700,6 +709,7 @@
 			confirmWeighConfirm() {
 				this.changeconfirmWeighVisiable(false)
 				this.isConfirmWeighLoading = false
+				this.TwoEvacuationLoading = false;
 				setTimeout(() => {
 					this.$u.toast('鍗冲皢杩斿洖涓婁竴椤�'),
 						uni.navigateBack({

--
Gitblit v1.9.1