From 3fef62b03c16aa69c109c355150cdb698b777feb Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 28 六月 2024 17:39:20 +0800
Subject: [PATCH] Merge branch 'develop/steels' into feature/steels/yangan
---
pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
index 298be09..23d8de2 100644
--- a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
+++ b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
@@ -35,6 +35,7 @@
icon="http://cdn.uviewui.com/uview/empty/data.png"
textSize="30"
iconSize="1000"
+ text="鏆傛棤鏁版嵁"
v-if="filterList.length == 0"></u-empty>
<view class="statistics-card"
v-for="(item, index) in filterList"
@@ -87,6 +88,10 @@
</view>
<!-- <view class="black-block"><view class="black-bar"></view></view>
<view class="coal-type">{{ value.orderType }}</view> -->
+ </view>
+ <view class="third-line">
+ <text class="carnum-text" style="font-size: 28rpx;">鍒涘缓鏃堕棿锛�</text>
+ <view class="carnum-text">{{ value.createTime || '' }}</view>
</view>
<view class="third-line">
<view class="carnum-icon">
@@ -206,7 +211,7 @@
</view>
</view>
<view class="filter-body"
- v-if="roleType !== 3&&roleType !== 4">
+ v-if="roleType === 2||roleType === 1">
<view class="condition-name">杞﹂槦</view>
<view class="filter-name">
<view class="filter-button"
@@ -272,7 +277,7 @@
@click="confirmCondition"></u-button></view>
</view>
</u-popup>
- <tab-bar :current="roleType===4?2:1"></tab-bar>
+ <tab-bar :current="roleType===4?1:1"></tab-bar>
</view>
<view class="white-block"></view>
</view>
@@ -331,11 +336,11 @@
// 鐐瑰嚮鍙崇澶磋鎯呭脊绐�
faYunDetailobj: {},
modalShow: false,
- coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '楠岃川瀹屾垚'],
+ coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '澶勭悊瀹屾垚'],
onlineurl,
};
},
- onShow() {
+ onLoad() {
this.firstDate();
this.lastDate();
this.getShipping();
@@ -635,7 +640,7 @@
// 璺宠浆鍙戣繍璇︽儏
faYunDetail(takeCoalId) {
uni.navigateTo({
- url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?orderPlanId=${takeCoalId}`
+ url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?orderPlanId=${takeCoalId}&flag=${true}`
});
},
// 鎵撳紑绛涢�夋潯浠跺脊绐�
@@ -686,6 +691,7 @@
this.first = newV.slice(0, 10);
this.last = newV.slice(11);
this.getTmTaskCoalData();
+ this.getShipping();
}
}
}
@@ -1021,7 +1027,7 @@
}
.third-line {
- width: 40%;
+ width: 80%;
min-height: vww(15);
display: flex;
justify-content: flex-start;
--
Gitblit v1.9.1