From 5071cbf55bd73b6d7bb61421fe618666c537a4e2 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期四, 19 十月 2023 09:34:43 +0800
Subject: [PATCH] 司机增加退单功能 增加积分功能 其他页面修改

---
 pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 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 72ae6c0..0877f51 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
@@ -1,7 +1,7 @@
 <template>
 	<view class="weighingDevice">
 		<view class="one"
-			style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/weighbanner.png') no-repeat;
+			style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/weighbanner.png') no-repeat;
 		background-size: cover;">
 			<view class="top">
 				<view class="top_left">
@@ -31,19 +31,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">{{ weighList.skinTwo }}</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">{{ weighList.hairTwo }}</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">{{ weighList.cleanTwo }}</view>
 					</view>
@@ -417,8 +417,11 @@
 							this.isSkinWeigh = false;
 							this.outBuy = true;
 							this.temporaryWeighObj.hair = newV;
-							this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(
-								2);
+							let x = new BigNumber(this.temporaryWeighObj.hair)
+							let y = new BigNumber(this.weighList.skin)
+							this.temporaryWeighObj.clean = x.minus(y).toNumber().toFixed(2)
+							// this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(
+							// 	2);
 							this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
 								.temporaryWeighObj
 								.clean < 0;
@@ -439,8 +442,11 @@
 							let yy = new BigNumber(newV)
 							this.errorTipShow = (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) &&
 								this.avgSkin !== 0;
-							this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
-								2);
+							let x = new BigNumber(this.weighList.hair)
+							let y = new BigNumber(this.temporaryWeighObj.skin)
+							this.temporaryWeighObj.clean = x.minus(y).toNumber().toFixed(2)
+							// this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
+							// 	2);
 							this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
 								.temporaryWeighObj
 								.clean < 0;

--
Gitblit v1.9.1