From e40cf023cdc19d3bdea6cfb5d74cca65cd7b9679 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期二, 09 七月 2024 17:09:10 +0800
Subject: [PATCH] feature:细节
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 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 279eeae..d18ad56 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
@@ -72,7 +72,7 @@
plain
@click="printOrder"
shape="circle"
- :disabled="(currentPageCoalStatus < 3) || !printNum"></u-button>
+ :disabled="(currentPageCoalStatus != 3) || !printNum"></u-button>
</view>
<view class="bottom-button">
<u-button text="鏀剧┖"
@@ -134,7 +134,8 @@
:closeOnClickOverlay="true"
:closeOnClickAction="true"
@select="selectClick"
- @close="sheetClose" ></u-action-sheet>
+ @close="sheetClose" >
+ </u-action-sheet>
<view class="serviece-customer">
<u-action-sheet :actions="hujiaolist"
@select="selectClickhujiao"
@@ -220,7 +221,7 @@
openName: '',
serviecePhone: ''
},
- coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '澶勭悊瀹屾垚'], // 鐘舵��
+ coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '璐ㄦ瀹屾垚'], // 鐘舵�乕0,1,3,4]
weighHouseCode: '',
// 鏀剧┖寮圭獥鎺у埗鍙橀噺
evacuationModalShow: false,
@@ -292,7 +293,7 @@
return this.coalDetailsData.hair !== 0 || this.coalDetailsData.skin !== 0;
},
isapproach() {
- return this.currentPageCoalStatus < 3;
+ return this.currentPageCoalStatus != 3;
},
// 灞曠ず鐨瘺鍑�
showWeigh() {
@@ -665,7 +666,7 @@
selectClick(obj){
this.$reqGet('printerHandler',{tmItemId:obj.id}).then(res => {
uni.hideLoading();
- this.$u.toast(res.msg)
+ this.$u.toast(res.msg ? res.msg : '鍘绘墦鍗�')
if (res.data) {
// this.$u.toast('鎵撳嵃鎴愬姛')
// this.orderPlanData = res.data
@@ -680,7 +681,14 @@
},
sheetClose(){
this.show = false;
- }
+ },
+ onPullDownRefresh() { //涓嬫媺鍒锋柊
+ setTimeout(() => {
+ this.getTakeCoal(() => { //鑾峰彇閫氱煡鍗曡鎯�
+ uni.stopPullDownRefresh()
+ })
+ },1000)
+ }
}
};
</script>
@@ -759,8 +767,8 @@
.block-information {
width: 690rpx;
height: 100%;
- min-height: 420rpx;
- margin: vww(40) auto;
+ min-height: 400rpx;
+ margin: vww(40) auto 0rpx;
background: #ffffff;
box-shadow: 4rpx 6rpx 51rpx 0rpx rgba(73, 120, 240, 0.11);
border-radius: 20rpx;
@@ -777,8 +785,8 @@
gap: auto 5rpx;
width: 94%;
height: 100%;
- min-height: 380rpx;
- margin: vww(18) vww(7) vww(11) vww(17);
+ min-height: 360rpx;
+ margin: vww(18) vww(7) vww(8) vww(17);
}
.status-button {
@@ -822,7 +830,7 @@
}
.time {
- width: 35%;
+ width: 100%;
height: vww(12);
display: flex;
justify-content: flex-start;
@@ -851,12 +859,7 @@
// 绉伴噸鍘嗗彶
.weigh-history {
- @extend .block-information;
-
.block-main {
- @extend .block-main;
- gap: 10rpx 20rpx;
-
.weigh-item {
width: 100%;
height: vww(80);
@@ -901,7 +904,6 @@
.timeLine {
height: 300rpx;
min-height: 300rpx;
- margin: vww(20);
position: relative;
// top: vww(120);
overflow-y: overlay;
--
Gitblit v1.9.1