From 01f3801b895fa50387ba6ac7c28130053bf5e19a Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 19 九月 2023 14:14:40 +0800
Subject: [PATCH] 修改合卡显示,修改司机首页

---
 pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 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 d1fad8a..7b2e230 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
@@ -211,22 +211,23 @@
 				</view>
 			</view>
 		</view>
-		<view class="mergeState"
-			v-show="mergeStateShow">
-			<view class="merge-wrap">
-				<view>鏄惁纭鍚堝苟</view>
-				<view class="merge-checkbox">
-					<u-checkbox-group v-model="checkboxValue1"
-						placement="column"
-						@change="mergeStateChange">
-						<u-checkbox :customStyle="{marginBottom: '8px'}"
-							:label="mergeState?'纭':'鍙栨秷'"
-							name="confirm"
-							label-size="30"
-							size="30"
-							activeColor="#48a2ff">
-						</u-checkbox>
-					</u-checkbox-group>
+		<view v-show="mergeStateShow">
+			<view class="mergeState">
+				<view class="merge-wrap">
+					<view>鏄惁纭鍚堝苟</view>
+					<view class="merge-checkbox">
+						<u-checkbox-group v-model="checkboxValue1"
+							placement="column"
+							@change="mergeStateChange">
+							<u-checkbox :customStyle="{marginBottom: '8px'}"
+								:label="mergeState?'纭':'鍙栨秷'"
+								name="confirm"
+								label-size="30"
+								size="30"
+								activeColor="#48a2ff">
+							</u-checkbox>
+						</u-checkbox-group>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -248,7 +249,7 @@
 				@click="confirmWeigh"
 				throttleTime="800"></u-button>
 			<u-button type="primary"
-				text="杩斿洖鍔犲噺鍚�"
+				text="杩斿洖瑁呭嵏"
 				:disabled="addAndSubtractCoalDisabled"
 				@click="addAndSubtractCoal"
 				class="jiajian"

--
Gitblit v1.9.1