From 01e96c8855927df67ac8a6831e345b6cb33140d1 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 09 五月 2023 18:49:40 +0800
Subject: [PATCH] 样式修改
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 95 ++++++-----------------------------------------
1 files changed, 12 insertions(+), 83 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 96f39bd..e6bbd9d 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
@@ -53,7 +53,7 @@
<view class="unit">鍚�</view>
</view>
</view>
- <view class="block-sideline" v-else>
+ <view class="block-sideline" v-if="weighList.orderType == '鍐呰喘' || weighList.orderType == '杞嚭'">
<view class="first-line"><combined-title title="鍘熷彂淇℃伅"></combined-title></view>
<view class="weigh-item">
<view class="item">
@@ -232,8 +232,11 @@
// 鐩戝惉閲嶉噺鍙樺寲
globalweigh: {
handler(v) {
- this.weighData.weigh = this.realTimeWeigh = v;
- console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
+ // this.weighData.weigh = this.realTimeWeigh = v;
+ // console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
+ setTimeout(() => {
+ this.weighData.weigh = this.realTimeWeigh = v;
+ }, 0);
},
deep: true,
immediate: true
@@ -284,6 +287,7 @@
this.weighData.tmId = res.data.id;
this.weighData.carNo = res.data.carNo;
this.weighData.tmCode = res.data.code;
+ this.weighData.filedId = res.data.filedId;
if (this.weighList.orderType == '澶栬喘' && this.weighList.hair == 0) {
this.firstHairCustomernameShow = true;
}
@@ -351,47 +355,6 @@
}
});
},
- /**
- * 鍒濆鍖� weoSocket
- */
- // initWebSocket() {
- // let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}`;
- // let socket = uni.connectSocket({
- // url: wsUrl,
- // header: {
- // CLIENT_TOC: 'Y'
- // },
- // complete: res => {
- // console.log(res, 'socket缁撴灉');
- // }
- // });
- // socket.onOpen(() => {
- // console.log('onOpen');
- // });
- // // 鑾峰彇鏈嶅姟鍣ㄤ紶鏉ョ殑鏁版嵁锛屽仛鐩稿簲澶勭悊
- // socket.onMessage(res => {
- // console.log('socketWeigh', res);
- // let nowWeighObj = JSON.parse(res.data.slice(7));
- // if (nowWeighObj.eqCode == this.weighHouseCode) {
- // if (nowWeighObj.eqInfraredStatus) {
- // this.infraredStatus = true;
- // this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
- // } else {
- // this.infraredStatus = false;
- // this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
- // }
- // }
- // });
- // socket.onClose(() => {
- // uni.closeSocket();
- // console.log('webSocketClose');
- // this.$u.toast('纾呮埧宸插叧闂�');
- // });
- // socket.onError(err => {
- // console.log('socket鎶ラ敊', err);
- // this.$u.toast('纾呮埧鏆傛椂涓嶈兘浣跨敤锛岃閲嶆柊杩涘叆璇ラ〉闈紝閲嶈瘯锛侊紒');
- // });
- // },
// 鏀剧┖
evacuation() {
this.evacuationModalShow = true;
@@ -523,7 +486,7 @@
height: vww(36);
@include flex justify-content: space-around;
.item {
- width: vww(50);
+ min-width: vww(50);
height: vww(45);
font-size: 21rpx;
font-family: Microsoft YaHei;
@@ -553,12 +516,14 @@
background: #ffffff;
box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
border-radius: 20rpx;
- @include flex justify-content: center;
+ @include flex;
+ justify-content: center;
.block-main {
width: 94%;
height: 565rpx;
- margin-top: vww(22);
+ margin-top: vww(10);
@include flex;
+ justify-content: space-around;
align-items: flex-start;
flex-direction: column;
.main-information {
@@ -570,42 +535,6 @@
color: #303030;
@include flex;
}
- }
- }
- .two {
- flex: 4;
- border: vww(2) solid #dddddd;
- margin: vww(20);
- border-radius: vww(10);
- padding: vww(20);
- .uni-table {
- .uni-table-tr {
- padding: 0;
- border: vww(1) solid #c6c6c6;
- .uni-table-th {
- font-size: vww(14);
- height: vww(30);
- line-height: vww(30);
- padding: vww(5) vww(10);
- color: #111111;
- font-weight: 500;
- background: #e2e2e2;
- }
- .uni-table-td {
- font-size: vww(14);
- font-weight: 400;
- height: vww(30);
- line-height: vww(30);
- padding: vww(5) vww(10);
- color: #111111;
- }
- }
- }
- p {
- text-align: center;
- font-size: vww(20);
- font-weight: 500;
- margin-top: vww(5);
}
}
.three {
--
Gitblit v1.9.1