From bb52e0d4baffe8e0486c951e525b6614bd4aaa28 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 24 四月 2023 14:08:56 +0800
Subject: [PATCH] 修改样式，修复已知bug
---
pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue | 2
pages/public-page/forward/forward.vue | 37 +
pages/driver-page/drvier-my/drvier-my.vue | 2
pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue | 2
static/tabBar-icon/statistics.png | 0
pages.json | 55 +-
pages/customer-page/customer-index/customer-index.vue | 102 ++++-
pages/tabbar-page/index-tabbar/index-tabbar.vue | 4
pages/customer-page/customer-my/customer-my.vue | 2
pages/driver-page/driver-index/driver-index.vue | 48 ++
store/index.js | 12
components/tab-bar/tab-bar.vue | 9
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 99 +++++
api/globalApi.js | 5
static/tabBar-icon/statisticsactive.png | 0
pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue | 362 +++++++++++----------
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 157 ++++++--
pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue | 101 ++++-
18 files changed, 664 insertions(+), 335 deletions(-)
diff --git a/api/globalApi.js b/api/globalApi.js
index 0b51552..7354daa 100644
--- a/api/globalApi.js
+++ b/api/globalApi.js
@@ -313,5 +313,10 @@
getTmTaskCoalData: {
url: '/wrzs/tmtaskcoal/getTmTaskCoalData',
method: 'GET'
+ },
+ //鏍规嵁id鎷垮埌杞彂涓殑鍘熷鏁伴噺
+ jhorderplanforward: {
+ url: '/wrzs/jhorderplanforward/getAppById',
+ method: 'GET'
}
}
diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue
index 4fb3d63..ecd53a7 100644
--- a/components/tab-bar/tab-bar.vue
+++ b/components/tab-bar/tab-bar.vue
@@ -22,13 +22,14 @@
// tabBarList: this.$store.state.userTabbar
};
},
- computed:{
- tabBarList(){
- return this.$store.state.userTabbar
+ computed: {
+ tabBarList() {
+ return this.$store.state.userTabbar;
}
},
methods: {
tabbarchange(e) {
+ console.log(e, 'tab鍒囨崲鍦板潃');
uni.switchTab({
url: '/' + this.tabBarList[e].pagePath
});
@@ -40,7 +41,7 @@
::v-deep.tab-bar {
.u-tabbar {
&__content {
- background: #ececec!important;
+ background: #ececec !important;
&__item-wrapper {
height: vww(50);
}
diff --git a/pages.json b/pages.json
index f48dd50..fa1dbee 100644
--- a/pages.json
+++ b/pages.json
@@ -167,17 +167,15 @@
"enablePullDownRefresh": false
}
+ }, {
+ "path": "pages/customer-page/customer-my/faYunstatistics/faYunstatistics",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
}
- ,{
- "path" : "pages/customer-page/customer-my/faYunstatistics/faYunstatistics",
- "style" :
- {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
-
- }
- ],
+ ],
"subPackages": [{
"root": "pages/register",
"pages": [{
@@ -202,25 +200,21 @@
"enablePullDownRefresh": true
}
- } ,{
- "path" : "messageDetails/messageDetails",
- "style" :
- {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
-
- }
- ,{
- "path" : "faYunstatisticsDetails/faYunstatisticsDetails",
- "style" :
- {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
-
- }
- ]
+ }, {
+ "path": "messageDetails/messageDetails",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "faYunstatisticsDetails/faYunstatisticsDetails",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }]
}, {
"root": "pages/driver-page/appointment",
"pages": [{
@@ -310,6 +304,9 @@
// "text": "缁撶畻"
// },
{
+ "pagePath": "pages/customer-page/customer-my/faYunstatistics/faYunstatistics"
+ },
+ {
"pagePath": "pages/tabbar-page/myPage-tabbar/myPage-tabbar"
// "iconPath": "static/tabBar-icon/Gmine10.png",
// "selectedIconPath": "static/tabBar-icon/Bmine57.png",
diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index fbceba9..64a521e 100644
--- a/pages/customer-page/customer-index/customer-index.vue
+++ b/pages/customer-page/customer-index/customer-index.vue
@@ -49,26 +49,39 @@
<view class="history-numbers">
<combined-title title="鍘嗗彶鎻愮叅鍗�"></combined-title>
<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y" @scrolltolower="historyScrolltolower">
- <uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁" :loading="loading">
- <uni-tr>
- <uni-th width="100" align="center">鍙戣繍鏃ユ湡</uni-th>
- <uni-th width="100" align="center">鎵�灞炲崟浣�</uni-th>
- <uni-th align="center" width="150">鐓ゅ満鍚嶇О</uni-th>
- <uni-th align="center" width="100">鐓ょ鍚嶇О</uni-th>
- <uni-th align="center" width="150">璁㈠崟缂栧彿</uni-th>
- <uni-th align="center" width="100">璁㈠崟鍓╀綑閲�</uni-th>
- <uni-th align="center" width="80">鎻愮叅鍗曚釜鏁�</uni-th>
- </uni-tr>
- <uni-tr v-for="(item, index) in historyCoalData" :key="index">
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.sendDate || '' }}</uni-td>
- <uni-td align="left" @row-click="faYundetail(item)">{{ item.deptName || '' }}</uni-td>
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.filedName || '' }}</uni-td>
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.coalName || '' }}</uni-td>
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.orderCode || '' }}</uni-td>
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.carNumSurplus || '' }}</uni-td>
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.tmCount || '' }}</uni-td>
- </uni-tr>
- </uni-table>
+ <view class="history-information" v-for="(item, index) in historyCoalData" :key="index" @click="faYundetail(item)">
+ <view class="history-sendate">
+ <text>鍙戣繍鏃ユ湡 {{ item.sendDate || '' }}</text>
+ <view class="view-more">
+ <text style="color: #449cfc;">璇︽儏</text>
+ <view class="arrow-right"><u-icon name="arrow-right" size="40" color="#449cfc"></u-icon></view>
+ </view>
+ </view>
+ <view class="history-main">
+ <view class="main-left">
+ <view class="history-body">
+ <text>鎵�灞炲崟浣� {{ item.deptName || '' }}</text>
+ </view>
+ <view class="history-body">
+ <text>鐓ゅ満鍚嶇О {{ item.filedName || '' }}</text>
+ </view>
+ <view class="history-body">
+ <text>鐓ょ鍚嶇О {{ item.coalName || '' }}</text>
+ </view>
+ </view>
+ <view class="main-right">
+ <view class="history-body">
+ <text style="word-break: break-all;">璁㈠崟缂栧彿 {{ item.orderCode || '' }}</text>
+ </view>
+ <view class="history-body">
+ <text>璁㈠崟鍓╀綑閲� {{ item.carNumSurplus || '' }}</text>
+ </view>
+ <view class="history-body">
+ <text>鎻愮叅鍗曚釜鏁� {{ item.tmCount || '' }}</text>
+ </view>
+ </view>
+ </view>
+ </view>
<view class="more_text" v-if="showMoreData && historyCoalData.length !== 0">娌℃湁鏁版嵁浜�...</view>
</scroll-view>
</view>
@@ -242,6 +255,7 @@
},
// 杞彂
forwardClick(obj) {
+ if (obj.cars2 == 0) return this.$u.toast('璇峰厛棰嗗彇鍚庡啀杞彂');
uni.navigateTo({ url: `/pages/public-page/forward/forward?orderPlanId=${obj.id}&carNumSurplus1=${obj.carNumSurplus1}&carNum=${obj.carNum}&cars2=${obj.cars2}` });
}
}
@@ -250,10 +264,52 @@
<style lang="scss" scoped>
.scroll-Y {
- height: 600rpx;
- margin-bottom: vww(50);
+ height: 900rpx;
+ background-color: #e2e2e2;
+ border-radius: vww(10);
+ .history-information {
+ width: 94%;
+ display: flex;
+ flex-direction: column;
+ border: 1px solid #e2e2e2;
+ background-color: #fff;
+ border-radius: vww(10);
+ margin: vww(10);
+ .history-sendate {
+ height: vww(40);
+ border-bottom: 1px solid #e2e2e2;
+ line-height: vww(40);
+ padding-left: vww(8);
+ position: relative;
+ .view-more {
+ display: flex;
+ width: vww(80);
+ position: absolute;
+ right: vww(10);
+ top: vww(-1);
+ .arrow-right {
+ position: absolute;
+ right: vww(27);
+ top: vww(12);
+ }
+ }
+ }
+ .history-main {
+ min-height: vww(120);
+ display: flex;
+ justify-content: space-between;
+ .main-left,
+ .main-right {
+ width: 45%;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ padding: vww(4) vww(4);
+ }
+ }
+ }
.more_text {
- color: #999;
+ color: #333;
font-size: 24rpx;
text-align: center;
}
diff --git a/pages/customer-page/customer-my/customer-my.vue b/pages/customer-page/customer-my/customer-my.vue
index 4558572..6be882c 100644
--- a/pages/customer-page/customer-my/customer-my.vue
+++ b/pages/customer-page/customer-my/customer-my.vue
@@ -33,7 +33,7 @@
</view>
</view>
- <view class="statistics"><u-button text="鍙戣繍缁熻" type="primary" @click="statistics"></u-button></view>
+ <!-- <view class="statistics"><u-button text="鍙戣繍缁熻" type="primary" @click="statistics"></u-button></view> -->
<view class="logout"><u-button text="閫�鍑虹櫥褰�" type="primary" @click="logout()"></u-button></view>
<!-- 鏂板缓杞﹂槦寮瑰嚭妗� -->
diff --git a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
index 1da3993..b8dd609 100644
--- a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
+++ b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
@@ -8,158 +8,124 @@
</view>
</view>
<view class="collapse-main">
- <u-collapse>
- <u-collapse-item :title="dateRange" value="绛涢��">
- <view class="filter-main">
- <view class="filter-body">
- <view class="condition-name">鐓ょ锛�</view>
- <view class="filter-name">
- <view class="filter-button" v-for="(item, index) in coalList" :key="index" @click="filterCondition(0, index, item.condition)">
- <u-button shape="circle" :text="item.condition" :type="item.active ? 'success' : ''" size="small" v-if="index < coalShow"></u-button>
- </view>
- <view class="toggle-button">
- <u-button
- shape="circle"
- :text="coalShow < coalTotal ? '鏌ョ湅鏇村' : '鏀惰捣'"
- type="primary"
- size="small"
- @click="toggle(0)"
- v-if="coalTotal > 3"
- ></u-button>
- </view>
- </view>
- </view>
- <view class="filter-body">
- <view class="condition-name">绫诲瀷锛�</view>
- <view class="filter-name">
- <view class="filter-button" v-for="(item, index) in typeList" :key="index" @click="filterCondition(1, index, item.condition)">
- <u-button shape="circle" :text="item.condition" :type="item.active ? 'success' : ''" size="small"></u-button>
- </view>
- <view class="toggle-button">
- <u-button
- shape="circle"
- :text="typeShow < typeTotal ? '鏌ョ湅鏇村' : '鏀惰捣'"
- type="primary"
- size="small"
- @click="toggle(1)"
- v-if="typeTotal > 3"
- ></u-button>
- </view>
- </view>
- </view>
- <view class="filter-body">
- <view class="condition-name">瀹㈡埛锛�</view>
- <view class="filter-name">
- <view class="filter-button" v-for="(item, index) in customerList" :key="index" @click="filterCondition(2, index, item.condition)">
- <u-button shape="circle" :text="item.condition" :type="item.active ? 'success' : ''" size="small"></u-button>
- </view>
- <view class="toggle-button">
- <u-button
- shape="circle"
- :text="customerShow < customerTotal ? '鏌ョ湅鏇村' : '鏀惰捣'"
- type="primary"
- size="small"
- @click="toggle(2)"
- v-if="customerTotal > 3"
- ></u-button>
- </view>
- </view>
- </view>
- <view class="filter-body" v-if="roleType == 1">
- <view class="condition-name">璐т唬锛�</view>
- <view class="filter-name">
- <view class="filter-button" v-for="(item, index) in forwarderList" :key="index" @click="filterCondition(3, index, item.condition)">
- <u-button shape="circle" :text="item.condition" :type="item.active ? 'success' : ''" size="small"></u-button>
- </view>
- <view class="toggle-button">
- <u-button
- shape="circle"
- :text="forwarderShow < forwarderTotal ? '鏌ョ湅鏇村' : '鏀惰捣'"
- type="primary"
- size="small"
- @click="toggle(3)"
- v-if="forwarderTotal > 3"
- ></u-button>
- </view>
- </view>
- </view>
- <view class="filter-body" v-if="roleType != 3">
- <view class="condition-name">杞﹂槦锛�</view>
- <view class="filter-name">
- <view class="filter-button" v-for="(item, index) in fleetList" :key="index" @click="filterCondition(4, index, item.condition)">
- <u-button shape="circle" :text="item.condition" :type="item.active ? 'success' : ''" size="small"></u-button>
- </view>
- <view class="toggle-button">
- <u-button
- shape="circle"
- :text="fleetShow < fleetTotal ? '鏌ョ湅鏇村' : '鏀惰捣'"
- type="primary"
- size="small"
- @click="toggle(4)"
- v-if="fleetTotal > 3"
- ></u-button>
- </view>
- </view>
- </view>
- <view class="filter-body" v-if="roleType != 1">
- <view class="condition-name">鐭垮満锛�</view>
- <view class="filter-name">
- <view class="filter-button" v-for="(item, index) in filedList" :key="index" @click="filterCondition(5, index, item.condition)">
- <u-button shape="circle" :text="item.condition" :type="item.active ? 'success' : ''" size="small"></u-button>
- </view>
- <view class="toggle-button">
- <u-button
- shape="circle"
- :text="filedShow < filedTotal ? '鏌ョ湅鏇村' : '鏀惰捣'"
- type="primary"
- size="small"
- @click="toggle(5)"
- v-if="filedTotal > 3"
- ></u-button>
- </view>
- </view>
- </view>
- <view class="filter-body" v-if="roleType == 2">
- <view class="condition-name">杞︾墝鍙凤細</view>
- <view class="filter-name">
- <view class="filter-button" v-for="(item, index) in carNoList" :key="index" @click="filterCondition(6, index, item.condition)">
- <u-button shape="circle" :text="item.condition" :type="item.active ? 'success' : ''" size="small"></u-button>
- </view>
- <view class="toggle-button">
- <u-button
- shape="circle"
- :text="carNoShow < carNoTotal ? '鏌ョ湅鏇村' : '鏀惰捣'"
- type="primary"
- size="small"
- @click="toggle(6)"
- v-if="carNoTotal > 3"
- ></u-button>
- </view>
- </view>
- </view>
- <view class="filter-body">
- <view class="condition-name">鏃ユ湡锛�</view>
- <view class="filter-name">
- <u-button :text="dateselect" @click="opencalendar"></u-button>
- <view class="filter-button">
- <uni-calendar
- ref="calendar"
- class="uni-calendar--hook"
- :clear-date="true"
- :date="info.date"
- :insert="info.insert"
- :lunar="info.lunar"
- :startDate="info.startDate"
- :endDate="info.endDate"
- :range="info.range"
- @confirm="confirm"
- />
- </view>
+ <view class="filter-show">
+ <view class="filtershow-date">{{ dateRange }}</view>
+ <view class="filter-icon"><u-icon name="grid" :size="40" color="#9ec16c "></u-icon></view>
+ <view class="filtershow-text" @click="showPopup">绛涢��</view>
+ </view>
+ <u-popup :show="conditinonShow" mode="top" :closeable="true" :closeOnClickOverlay="true" @close="conditinonclose">
+ <view class="filter-main">
+ <view class="filter-body date-button">
+ <view class="condition-name">鏃ユ湡</view>
+ <view class="filter-name">
+ <u-button :text="dateselect" @click="opencalendar"></u-button>
+ <view class="filter-button ">
+ <uni-calendar
+ ref="calendar"
+ class="uni-calendar--hook"
+ :clear-date="true"
+ :date="info.date"
+ :insert="info.insert"
+ :lunar="info.lunar"
+ :startDate="info.startDate"
+ :endDate="info.endDate"
+ :range="info.range"
+ @confirm="confirm"
+ />
</view>
</view>
</view>
- </u-collapse-item>
- </u-collapse>
+ <view class="filter-body">
+ <view class="condition-name">鐓ょ</view>
+ <view class="filter-name">
+ <view class="filter-button" v-for="(item, index) in coalList" :key="index" @click="filterCondition(0, index, item.condition)">
+ <u-button :text="item.condition" :type="item.active ? 'success' : ''" size="small" v-if="index < coalShow"></u-button>
+ </view>
+ <view class="toggle-button">
+ <u-button :text="coalShow < coalTotal ? '鏌ョ湅鏇村' : '鏀惰捣'" type="primary" size="small" @click="toggle(0)" v-if="coalTotal > 3"></u-button>
+ </view>
+ </view>
+ </view>
+ <view class="filter-body">
+ <view class="condition-name">绫诲瀷</view>
+ <view class="filter-name">
+ <view class="filter-button" v-for="(item, index) in typeList" :key="index" @click="filterCondition(1, index, item.condition)">
+ <u-button :text="item.condition" :type="item.active ? 'success' : ''" size="small" v-if="index < typeShow"></u-button>
+ </view>
+ <view class="toggle-button">
+ <u-button :text="typeShow < typeTotal ? '鏌ョ湅鏇村' : '鏀惰捣'" type="primary" size="small" @click="toggle(1)" v-if="typeTotal > 3"></u-button>
+ </view>
+ </view>
+ </view>
+ <view class="filter-body">
+ <view class="condition-name">瀹㈡埛</view>
+ <view class="filter-name">
+ <view class="filter-button" v-for="(item, index) in customerList" :key="index" @click="filterCondition(2, index, item.condition)">
+ <u-button :text="item.condition" :type="item.active ? 'success' : ''" size="small" v-if="index < customerShow"></u-button>
+ </view>
+ <view class="toggle-button">
+ <u-button
+ :text="customerShow < customerTotal ? '鏌ョ湅鏇村' : '鏀惰捣'"
+ type="primary"
+ size="small"
+ @click="toggle(2)"
+ v-if="customerTotal > 3"
+ ></u-button>
+ </view>
+ </view>
+ </view>
+ <view class="filter-body" v-if="roleType == 1">
+ <view class="condition-name">璐т唬</view>
+ <view class="filter-name">
+ <view class="filter-button" v-for="(item, index) in forwarderList" :key="index" @click="filterCondition(3, index, item.condition)">
+ <u-button :text="item.condition" :type="item.active ? 'success' : ''" v-if="index < forwarderShow"></u-button>
+ </view>
+ <view class="toggle-button">
+ <u-button
+ :text="forwarderShow < forwarderTotal ? '鏌ョ湅鏇村' : '鏀惰捣'"
+ type="primary"
+ size="small"
+ @click="toggle(3)"
+ v-if="forwarderTotal > 3"
+ ></u-button>
+ </view>
+ </view>
+ </view>
+ <view class="filter-body" v-if="roleType != 3">
+ <view class="condition-name">杞﹂槦</view>
+ <view class="filter-name">
+ <view class="filter-button" v-for="(item, index) in fleetList" :key="index" @click="filterCondition(4, index, item.condition)">
+ <u-button :text="item.condition" :type="item.active ? 'success' : ''" size="small" v-if="index < fleetShow"></u-button>
+ </view>
+ <view class="toggle-button">
+ <u-button :text="fleetShow < fleetTotal ? '鏌ョ湅鏇村' : '鏀惰捣'" type="primary" size="small" @click="toggle(4)" v-if="fleetTotal > 3"></u-button>
+ </view>
+ </view>
+ </view>
+ <view class="filter-body" v-if="roleType != 1">
+ <view class="condition-name">鐭垮満</view>
+ <view class="filter-name">
+ <view class="filter-button" v-for="(item, index) in filedList" :key="index" @click="filterCondition(5, index, item.condition)">
+ <u-button :text="item.condition" :type="item.active ? 'success' : ''" size="small" v-if="index < filedShow"></u-button>
+ </view>
+ <view class="toggle-button">
+ <u-button :text="filedShow < filedTotal ? '鏌ョ湅鏇村' : '鏀惰捣'" type="primary" size="small" @click="toggle(5)" v-if="filedTotal > 3"></u-button>
+ </view>
+ </view>
+ </view>
+ <view class="filter-body" v-if="roleType == 2">
+ <view class="condition-name">杞︾墝鍙�</view>
+ <view class="filter-name">
+ <view class="filter-button" v-for="(item, index) in carNoList" :key="index" @click="filterCondition(6, index, item.condition)">
+ <u-button :text="item.condition" :type="item.active ? 'success' : ''" size="small" v-if="index < carNoShow"></u-button>
+ </view>
+ <view class="toggle-button">
+ <u-button :text="carNoShow < carNoTotal ? '鏌ョ湅鏇村' : '鏀惰捣'" type="primary" size="small" @click="toggle(6)" v-if="carNoTotal > 3"></u-button>
+ </view>
+ </view>
+ </view>
+ </view>
+ </u-popup>
</view>
<view class="date-information">
<view class="statistics-card" v-for="(item, index) in filterList" :key="index">
@@ -173,8 +139,8 @@
}}鍚�
</view>
</view>
- <view class="card-main" v-for="(value, i) in item.taskCoalList" :key="i">
- <view class="arrow-right" @click="faYunDetail(value.id)"><u-icon name="arrow-right" size="50"></u-icon></view>
+ <view class="card-main" v-for="(value, i) in item.taskCoalList" :key="i" @click="faYunDetail(value.id)">
+ <view class="arrow-right"><u-icon name="arrow-right" size="50"></u-icon></view>
<view class="main-body">
<view class="coal-name">鐓ょ:{{ value.coalName || '' }}</view>
<view class="clean">鎵ц閲�:{{ value.clean.toFixed(2) || 0 }}</view>
@@ -185,6 +151,7 @@
</view>
</view>
</view>
+ <tab-bar :current="1"></tab-bar>
</view>
</template>
@@ -213,6 +180,8 @@
filterList: [],
totalLength: 0,
totalTon: 0,
+ // 绛涢�夊脊鍑哄眰
+ conditinonShow: false,
// 瓒呰繃涓よ鑷姩闅愯棌
coalShow: 3,
typeShow: 3,
@@ -414,6 +383,7 @@
}
},
confirm(e) {
+ console.log(e, '鏃ユ湡閫夋嫨');
this.first = e.range.before;
this.last = e.range.after;
},
@@ -494,8 +464,13 @@
url: `/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails?id=${takeCoalId}`
});
},
- confirm() {
- this.modalShow = false;
+ // 鎵撳紑绛涢�夋潯浠跺脊绐�
+ showPopup() {
+ this.conditinonShow = true;
+ },
+ // 鍏抽棴绛涢�夋潯浠跺脊绐�
+ conditinonclose() {
+ this.conditinonShow = false;
}
},
computed: {
@@ -544,15 +519,14 @@
</script>
<style lang="scss" scoped>
-::v-deep .u-cell__value {
- color: #9ec16c !important;
- font-size: vww(18) !important;
+::v-deep .toggle-button .u-button {
+ width: vww(40);
}
-::v-deep .filter-name:nth-last-child(1) {
- .u-button {
- width: 66%;
- }
-}
+// ::v-deep .filter-name:nth-last-child(1) {
+// .u-button {
+// width: 66%;
+// }
+// }
.main {
width: 96%;
margin: 0 auto;
@@ -586,11 +560,54 @@
background-color: #fff;
border: 1px solid #cccccc;
border-radius: vww(5);
+ .filter-show {
+ width: 100%;
+ height: vww(40);
+ background-color: #fff;
+ border-radius: vww(5);
+ font-size: vww(18);
+ color: #333;
+ position: relative;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ .filtershow-date {
+ font-size: vww(15);
+ padding-left: vww(8);
+ }
+ .filter-icon {
+ position: absolute;
+ right: vww(45);
+ top: vww(11);
+ }
+ .filtershow-text {
+ color: #9ec16c;
+ padding-right: vww(8);
+ position: relative;
+ &::before {
+ content: '';
+ position: absolute;
+ width: 1px;
+ height: vww(22);
+ background-color: #dcdfe6;
+ right: 94px;
+ bottom: 0;
+ }
+ }
+ }
.filter-main {
width: 100%;
display: flex;
flex-direction: column;
justify-content: space-around;
+ .date-button {
+ width: 80%;
+ height: vww(80);
+ margin: vww(5) auto;
+ .condition-name {
+ margin-bottom: vww(10);
+ }
+ }
.filter-body {
width: 100%;
position: relative;
@@ -598,31 +615,34 @@
justify-content: flex-start;
flex-wrap: wrap;
.condition-name {
+ margin-left: vww(15);
+ margin-top: vww(10);
font-size: vww(16);
+ color: #686868;
}
.filter-name {
- width: 100%;
+ width: 94%;
+ margin: 0 auto;
+ position: relative;
display: flex;
flex-wrap: wrap;
justify-content: flex-start;
align-items: flex-start;
- position: relative;
- top: vww(-34);
.filter-button {
color: #393a3c;
height: vww(16);
padding: vww(8);
margin: vww(5) vww(5);
- &:nth-child(1) {
- margin-left: vww(48);
- }
+ margin-bottom: vww(10);
}
.toggle-button {
- margin: vww(12) auto;
- position: relative;
- left: -10%;
- transform: translateX(-50%);
+ width: 30%;
+ display: flex;
+ justify-content: center;
+ position: absolute;
+ right: vww(-21);
+ top: vww(-23);
}
}
}
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 e541d34..461de18 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
@@ -1,8 +1,56 @@
<template>
<view class="bill-of-lading-details">
- <view class="bangDanMessage">
+ <scroll-view class="bangDanMessage" :scroll-top="scrollTop" scroll-y="true">
+ <uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
+ <uni-tr>
+ <uni-th align="left">瀹㈡埛</uni-th>
+ <uni-td align="right">{{ coalDetailsData.customerName || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鐭垮満</uni-th>
+ <uni-td align="right">{{ coalDetailsData.deptName || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">姣涢噸</uni-th>
+ <uni-td align="right">{{ coalDetailsData.hair || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鐨噸</uni-th>
+ <uni-td align="right">{{ coalDetailsData.skin || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鍑�閲�</uni-th>
+ <uni-td align="right">{{ coalDetailsData.clean || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">纾呭崟绫诲瀷</uni-th>
+ <uni-td align="right">{{ coalDetailsData.orderType || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鐘舵��</uni-th>
+ <uni-td align="right">{{ coalStatus[coalDetailsData.status] }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鐓ゅ満</uni-th>
+ <uni-td align="right">{{ coalDetailsData.filedName || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鍙戣繍鏃堕棿</uni-th>
+ <uni-td align="right">{{ coalDetailsData.sendDate || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鎻愮叅鍗曠紪鍙�</uni-th>
+ <uni-td align="right">{{ coalDetailsData.code || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">璁㈠崟缂栧彿</uni-th>
+ <uni-td align="right">{{ coalDetailsData.orderCode || '' }}</uni-td>
+ </uni-tr>
+ </uni-table>
+ </scroll-view>
+ <!-- <view class="bangDanMessage">
<view class="">
- <text>瀹㈡埛锛歿{ coalDetailsData.customerName || '' }}</text>
+ <text>瀹㈡埛锛歿{}}</text>
<text>鐭垮満锛歿{ coalDetailsData.deptName || '' }}</text>
</view>
<view class="">
@@ -20,7 +68,7 @@
<text>鎻愮叅鍗曠紪鍙凤細{{ coalDetailsData.code || '' }}</text>
<text>璁㈠崟缂栧彿锛歿{ coalDetailsData.orderCode || '' }}</text>
</view>
- </view>
+ </view> -->
<view class="timeLine" style="font-size: 16rpx;">
<u--text type="primary" size="30" plain v-for="(item, index) in dayRZ" :key="index" :text="item.taskStatusDes"></u--text>
</view>
@@ -106,7 +154,8 @@
// 鍘熷彂淇℃伅
primarySkin: null,
primaryHair: null,
- primaryClean: null
+ primaryClean: null,
+ scrollTop: 0
};
},
onShow() {
@@ -307,47 +356,73 @@
display: flex;
flex-direction: column;
.bangDanMessage {
- padding: vww(10);
- border: vww(2) solid #dddddd;
- border-radius: vww(20);
- margin: vww(20);
- margin-bottom: vww(10);
- height: 40%;
- font-size: vww(18);
- font-weight: 600;
- view {
- margin-bottom: vww(10);
- }
- view:nth-of-type(1) {
- display: flex;
- text {
- width: 50%;
- text-align: center;
+ width: 96%;
+ margin: 0 auto;
+ height: 50%;
+ }
+ // 琛ㄦ牸鏍峰紡
+ .uni-table {
+ .uni-table-tr {
+ padding: 0;
+ border: vww(1) solid #c6c6c6;
+ .uni-table-th {
+ font-size: vww(14);
+ height: vww(20);
+ line-height: vww(20);
+ // padding: vww(5) vww(10);
+ color: #111111;
+ font-weight: 500;
+ background: #e2e2e2;
}
- }
- view:nth-of-type(2) {
- display: flex;
- text {
- width: 33%;
- text-align: center;
- }
- }
- view:nth-of-type(3) {
- display: flex;
- text {
- width: 50%;
- text-align: center;
- }
- }
- view:nth-of-type(4) {
- display: flex;
- flex-direction: column;
- text {
- margin-bottom: vww(10);
- text-align: center;
+ .uni-table-td {
+ font-size: vww(14);
+ font-weight: 400;
+ height: vww(20);
+ line-height: vww(20);
+ padding: vww(5) vww(10);
+ color: #111111;
}
}
}
+ // .bangDanMessage {
+ // margin: vww(20);
+ // margin-bottom: vww(10);
+ // height: 40%;
+ // font-size: vww(18);
+ // font-weight: 600;
+ // view {
+ // margin-bottom: vww(10);
+ // }
+ // view:nth-of-type(1) {
+ // display: flex;
+ // text {
+ // width: 50%;
+ // text-align: center;
+ // }
+ // }
+ // view:nth-of-type(2) {
+ // display: flex;
+ // text {
+ // width: 33%;
+ // text-align: center;
+ // }
+ // }
+ // view:nth-of-type(3) {
+ // display: flex;
+ // text {
+ // width: 50%;
+ // text-align: center;
+ // }
+ // }
+ // view:nth-of-type(4) {
+ // display: flex;
+ // flex-direction: column;
+ // text {
+ // margin-bottom: vww(10);
+ // text-align: center;
+ // }
+ // }
+ // }
.timeLine {
height: 25%;
margin: vww(20);
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 077c4e2..56c8f25 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
@@ -20,19 +20,60 @@
</view> -->
</view>
</view>
- <view class="bottom" v-if="weighList.orderType == '澶栭攢' || weighList.orderType == '杞嚭' || weighList.orderType == '澶栬喘'">
+ <view class="bottom" v-if="weighList.orderType == '鍐呰喘' || weighList.orderType == '杞叆'">
<view>
<view style="font-weight: 600;">鍘熷彂淇℃伅</view>
- <text v-if="weighList.orderType == '澶栬喘' && weighList.hair == 0">
- 姣涢噸:{{ coalContactHair || '' }}鐨噸:{{ coalContactSkin || '' }}鍑�閲�:{{ (Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2) || '' }}
- </text>
- <text v-else>姣涢噸:{{ primaryHair || '' }}鐨噸:{{ primarySkin || '' }}鍑�閲�:{{ primaryClean || '' }}</text>
+
+ <text>姣涢噸:{{ primaryHair || '' }}鐨噸:{{ primarySkin || '' }}鍑�閲�:{{ primaryClean || '' }}</text>
</view>
+ </view>
+ <view class="bottom" v-else-if="weighList.orderType == '澶栬喘' && weighList.hair == 0">
+ <text>
+ 姣涢噸:{{ coalContactHair || '' }}鐨噸:{{ coalContactSkin || '' }}鍑�閲�:{{ (Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2) || '' }}
+ </text>
</view>
<view class="bottom"><text>TIP:褰撳墠鐘舵�佷负姝ｅ父鏃跺彲浠ョО閲�</text></view>
</view>
<view class="two">
- <p>璁㈠崟缂栧彿锛歿{ weighList.code || '' }}</p>
+ <uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
+ <uni-tr>
+ <uni-th align="left">璁㈠崟缂栧彿</uni-th>
+ <uni-td align="right">{{ weighList.code || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">璁㈠崟绫诲瀷</uni-th>
+ <uni-td align="right">{{ weighList.orderType || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">璁㈠崟浣欓噺</uni-th>
+ <uni-td align="right">{{ weighList.orderSurplus || 0 }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">姣涢噸</uni-th>
+ <uni-td align="right">{{ temporaryWeighObj.hair == 0 ? weighList.hair : temporaryWeighObj.hair }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鐨噸</uni-th>
+ <uni-td align="right">{{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鍑�閲�</uni-th>
+ <uni-td align="right">{{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鐓ょ鍚嶇О</uni-th>
+ <uni-td align="right">{{ weighList.coalName || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鐭垮満鍚嶇О</uni-th>
+ <uni-td align="right">{{ weighList.deptName || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鐓ゅ満鍚嶇О</uni-th>
+ <uni-td align="right">{{ weighList.filedName || '' }}</uni-td>
+ </uni-tr>
+ </uni-table>
+ <!-- <p>璁㈠崟缂栧彿锛歿{ weighList.code || '' }}</p>
<p>璁㈠崟绫诲瀷锛歿{ weighList.orderType || '' }}</p>
<p>璁㈠崟浣欓噺锛歿{ weighList.orderSurplus || 0 }}</p>
<p>鐨噸锛歿{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin }}</p>
@@ -40,7 +81,7 @@
<p>鍑�閲嶏細{{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean }}</p>
<p>鐓ょ鍚嶇О锛歿{ weighList.coalName || '' }}</p>
<p>鍗曚綅鍚嶇О锛歿{ weighList.deptName || '' }}</p>
- <p>鐭垮満鍚嶇О锛歿{ weighList.filedName || '' }}</p>
+ <p>鐭垮満鍚嶇О锛歿{ weighList.filedName || '' }}</p> -->
</view>
<view class="three">
<!-- 鏀剧┖ -->
@@ -129,7 +170,7 @@
takeCoalId: null,
weighHouseCode: '',
isConfirmWeighLoading: false, //纭畾绉伴噸鎸夐挳
- realTimeWeigh: '',
+ realTimeWeigh: 0,
weighList: {},
// 涓存椂绉伴噸瀵硅薄
temporaryWeighObj: {
@@ -162,6 +203,7 @@
if (this.weighList.skin == 0) {
// this.temporaryWeighObj.skin = this.realTimeWeigh;
this.temporaryWeighObj.skin = newV;
+ this.isweigh = this.temporaryWeighObj.skin > this.weighList.orderSurplus;
} else {
// this.temporaryWeighObj.hair = this.realTimeWeigh;
this.temporaryWeighObj.hair = newV;
@@ -172,6 +214,7 @@
if (this.weighList.hair == 0) {
// this.temporaryWeighObj.hair = this.realTimeWeigh;
this.temporaryWeighObj.hair = newV;
+ this.isweigh = this.temporaryWeighObj.hair > this.weighList.orderSurplus;
} else {
// this.temporaryWeighObj.skin = this.realTimeWeigh;
this.temporaryWeighObj.skin = newV;
@@ -186,11 +229,13 @@
this.weighData.weigh = this.realTimeWeigh = v;
console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
},
- deep: true
+ deep: true,
+ immediate: true
}
},
onShow() {
this.init();
+ this.realTimeWeigh = 0;
// this.initWebSocket();
},
computed: {
@@ -389,12 +434,12 @@
display: flex;
flex-direction: column;
.one {
- flex: 2;
+ flex: 3;
border: vww(2) solid #dddddd;
margin: vww(20) vww(20) 0 vww(20);
border-radius: vww(15);
.top {
- height: 80%;
+ height: 75%;
display: flex;
.top_left {
flex: 3;
@@ -415,8 +460,13 @@
}
.bottom {
text-align: center;
- position: relative;
- top: vww(-30);
+ height: 25%;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ flex-direction: column;
+ // position: relative;
+ // top: vww(-10);
}
}
.two {
@@ -425,6 +475,29 @@
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);
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 36c7b7a..a9e141c 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -13,8 +13,15 @@
<card v-for="(item, index) in driverBillOfLoadingData.list1" :key="index" :name="item.id" backgroundType="2">
<template v-slot:left>
<view class="card-left__top">
- <text>{{ item.carNum }}</text>
- 寮�
+ <view>
+ {{ item.carNum }}
+ <text>寮�</text>
+ </view>
+
+ <view>
+ {{ item.carNum - item.taskNum }}
+ <text>寮�</text>
+ </view>
</view>
<view class="card-left__utils">
<u-button @tap.stop="qiangDanBtn(item)" text="鎶㈠崟" type="primary" shape="circle" v-if="item.carNum - item.taskNum !== 0"></u-button>
@@ -77,20 +84,18 @@
<uni-tr>
<uni-th align="center">鐭垮満</uni-th>
<uni-th align="center">鐓ょ</uni-th>
- <uni-th align="center">宸查绾�</uni-th>
+ <uni-th align="center">鍙戣繍鏃ユ湡</uni-th>
</uni-tr>
<uni-tr>
<uni-td align="left">{{ item.deptName || '' }}</uni-td>
<uni-td align="left">{{ item.coalName || '' }}</uni-td>
- <uni-td align="left">{{ item.cars || 0 }} 杞︽</uni-td>
+ <uni-td align="left">{{ item.sendDate || '' }}</uni-td>
</uni-tr>
- <uni-tr>
- <uni-th align="center">鍙戣繍鏃ユ湡</uni-th>
+ <uni-tr style="margin: 0 auto;">
<uni-th align="center">鐓ゅ満</uni-th>
<uni-th align="center">瀹㈡埛</uni-th>
</uni-tr>
- <uni-tr>
- <uni-td align="left">{{ item.sendDate || '' }}</uni-td>
+ <uni-tr style="margin: 0 auto;">
<uni-td align="left">{{ item.filedName || '' }}</uni-td>
<uni-td align="left">{{ item.customerName || '' }}</uni-td>
</uni-tr>
@@ -244,12 +249,35 @@
margin-bottom: vww(56);
// 鍗＄墖鏍峰紡
.card-left__top {
- margin-top: vww(26);
+ margin: vww(10) 0;
+ padding-left: vww(4);
+ display: flex;
+ flex-direction: column;
+ flex-wrap: wrap;
+ justify-content: flex-start;
+ height: vww(80);
text-align: center;
color: #ffffff;
- text {
+ &:after {
+ content: '';
+ position: absolute;
+ width: 5px;
+ height: vww(80);
+ background-color: #fff;
+ left: vww(81);
+ }
+ view {
font-size: vww(48);
font-weight: 800;
+ width: 50%;
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ align-items: center;
+ text {
+ font-size: vww(16);
+ font-weight: bold;
+ }
}
}
.card-left__utils {
diff --git a/pages/driver-page/drvier-my/drvier-my.vue b/pages/driver-page/drvier-my/drvier-my.vue
index 1233de8..be412fd 100644
--- a/pages/driver-page/drvier-my/drvier-my.vue
+++ b/pages/driver-page/drvier-my/drvier-my.vue
@@ -52,7 +52,7 @@
<u-button text="閫�鍑虹櫥褰�" type="primary" @click="logout"></u-button>
<u-button text="淇敼涓汉璧勬枡" type="primary" @click="editBtnClick"></u-button>
</view>
- <view class="statistics"><u-button text="鍙戣繍缁熻" type="primary" @click="statistics"></u-button></view>
+ <!-- <view class="statistics"><u-button text="鍙戣繍缁熻" type="primary" @click="statistics"></u-button></view> -->
</view>
<!-- 鍥剧墖棰勮寮瑰嚭妗� -->
diff --git a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
index ce38fc7..b34a2f0 100644
--- a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
+++ b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
@@ -32,26 +32,39 @@
<view class="history-numbers">
<combined-title title="鍘嗗彶鎻愮叅鍗�"></combined-title>
<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y" @scrolltolower="historyScrolltolower">
- <uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁" :loading="loading">
- <uni-tr>
- <uni-th width="100" align="center">鍙戣繍鏃ユ湡</uni-th>
- <uni-th width="100" align="center">鎵�灞炲崟浣�</uni-th>
- <uni-th align="center" width="150">鐓ゅ満鍚嶇О</uni-th>
- <uni-th align="center" width="100">鐓ょ鍚嶇О</uni-th>
- <uni-th align="center" width="150">璁㈠崟缂栧彿</uni-th>
- <uni-th align="center" width="100">璁㈠崟鍓╀綑閲�</uni-th>
- <uni-th align="center" width="80">鎻愮叅鍗曚釜鏁�</uni-th>
- </uni-tr>
- <uni-tr v-for="(item, index) in historyCoalData" :key="index">
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.sendDate || '' }}</uni-td>
- <uni-td align="left" @row-click="faYundetail(item)">{{ item.deptName || '' }}</uni-td>
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.filedName || '' }}</uni-td>
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.coalName || '' }}</uni-td>
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.orderCode || '' }}</uni-td>
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.carNumSurplus || '' }}</uni-td>
- <uni-td align="center" @row-click="faYundetail(item)">{{ item.tmCount || '' }}</uni-td>
- </uni-tr>
- </uni-table>
+ <view class="history-information" v-for="(item, index) in historyCoalData" :key="index" @click="faYundetail(item)">
+ <view class="history-sendate">
+ <text>鍙戣繍鏃ユ湡 {{ item.sendDate || '' }}</text>
+ <view class="view-more">
+ <text style="color: #449cfc;">璇︽儏</text>
+ <view class="arrow-right"><u-icon name="arrow-right" size="40" color="#449cfc"></u-icon></view>
+ </view>
+ </view>
+ <view class="history-main">
+ <view class="main-left">
+ <view class="history-body">
+ <text>鎵�灞炲崟浣� {{ item.deptName || '' }}</text>
+ </view>
+ <view class="history-body">
+ <text>鐓ゅ満鍚嶇О {{ item.filedName || '' }}</text>
+ </view>
+ <view class="history-body">
+ <text>鐓ょ鍚嶇О {{ item.coalName || '' }}</text>
+ </view>
+ </view>
+ <view class="main-right">
+ <view class="history-body">
+ <text style="word-break: break-all;">璁㈠崟缂栧彿 {{ item.orderCode || '' }}</text>
+ </view>
+ <view class="history-body">
+ <text>璁㈠崟鍓╀綑閲� {{ item.carNumSurplus || '' }}</text>
+ </view>
+ <view class="history-body">
+ <text>鎻愮叅鍗曚釜鏁� {{ item.tmCount || '' }}</text>
+ </view>
+ </view>
+ </view>
+ </view>
<view class="more_text" v-if="showMoreData && historyCoalData.length !== 0">娌℃湁鏁版嵁浜�...</view>
</scroll-view>
</view>
@@ -186,10 +199,52 @@
<style lang="scss" scoped>
.scroll-Y {
- height: 600rpx;
- margin-bottom: vww(50);
+ height: 900rpx;
+ background-color: #e2e2e2;
+ border-radius: vww(10);
+ .history-information {
+ width: 94%;
+ display: flex;
+ flex-direction: column;
+ border: 1px solid #e2e2e2;
+ background-color: #fff;
+ border-radius: vww(10);
+ margin: vww(10);
+ .history-sendate {
+ height: vww(40);
+ border-bottom: 1px solid #e2e2e2;
+ line-height: vww(40);
+ padding-left: vww(8);
+ position: relative;
+ .view-more {
+ display: flex;
+ width: vww(80);
+ position: absolute;
+ right: vww(10);
+ top: vww(-1);
+ .arrow-right {
+ position: absolute;
+ right: vww(27);
+ top: vww(12);
+ }
+ }
+ }
+ .history-main {
+ min-height: vww(120);
+ display: flex;
+ justify-content: space-between;
+ .main-left,
+ .main-right {
+ width: 45%;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ padding: vww(4) vww(4);
+ }
+ }
+ }
.more_text {
- color: #999;
+ color: #333;
font-size: 24rpx;
text-align: center;
}
diff --git a/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue b/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue
index 01a7f7b..0d5ea35 100644
--- a/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue
+++ b/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue
@@ -35,7 +35,7 @@
</u-popup>
</view>
- <view class="statistics"><u-button text="鍙戣繍缁熻" type="primary" @click="statistics"></u-button></view>
+ <!-- <view class="statistics"><u-button text="鍙戣繍缁熻" type="primary" @click="statistics"></u-button></view> -->
<view class="utils"><u-button text="閫�鍑虹櫥褰�" type="primary" @click="logout"></u-button></view>
<!-- 鍒犻櫎杞﹂槦妯℃�佹 -->
diff --git a/pages/public-page/forward/forward.vue b/pages/public-page/forward/forward.vue
index 57a8e42..76b4d16 100644
--- a/pages/public-page/forward/forward.vue
+++ b/pages/public-page/forward/forward.vue
@@ -11,7 +11,7 @@
<u-form-item label="杈撳叆鏁伴噺" labelWidth="20%" ref="item1">
<view class="forward-card-amount">
<view class="forward-card-amount-input"><u--input v-model="val.carNum" placeholder="璇疯緭鍏ヨ浆鍙戞暟閲�"></u--input></view>
- <u-checkbox-group v-model="val.checkboxValue1" placement="column" @change="v => checkboxChange(v, index)">
+ <u-checkbox-group v-model="val.checkboxValue1" placement="column" @change="v => checkboxChange(v, index, val)">
<u-checkbox :customStyle="{ marginBottom: '8px' }" size="30" labelSize="30" label="鍏ㄩ儴杞彂" name="鍏ㄩ儴杞彂" :disabled="val.ischecked"></u-checkbox>
</u-checkbox-group>
</view>
@@ -131,7 +131,9 @@
cars2: '',
carNum: '',
carNumSurplusHuodai: '',
- formNum: 1
+ formNum: 1,
+ // 涓汉杞彂鏁版嵁
+ personalForward: {}
};
},
onShow() {
@@ -154,7 +156,6 @@
},
methods: {
init() {
- console.log('roleType', this.roleType);
switch (this.roleType) {
case 1:
this.getAllHuoDaiByCustomerId();
@@ -185,7 +186,7 @@
return Number(x);
}
},
- checkboxChange(value, index) {
+ checkboxChange(value, index, v) {
uni.setStorageSync('allrelay', this.jhOrderPlanForwardList[index].carNum);
this.jhOrderPlanForwardList = this.jhOrderPlanForwardList.map((v, i) => {
return {
@@ -196,17 +197,23 @@
if (value.length != 0) {
let tempforwardSurplus = this.forwardSurplus;
let tempcarNumSurplus1 = this.carNumSurplus1;
- // 璁＄畻鍏ㄩ儴杞彂鏁�
- // 瀹㈡埛
- if (this.roleType == 1) {
- this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.jhOrderPlanForwardList[index].carNum, tempcarNumSurplus1);
- }
- tempcarNumSurplus1 = 0;
- // 璐т唬
- if (this.roleType == 2) {
- this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.jhOrderPlanForwardList[index].carNum, tempforwardSurplus);
- }
- tempforwardSurplus = 0;
+ let jhorderplanforward = () => {
+ this.$reqGet('jhorderplanforward', { forwardId: v.id }).then(res => {
+ this.personalForward = res.data;
+ // 璁＄畻鍏ㄩ儴杞彂鏁�
+ // 瀹㈡埛
+ if (this.roleType == 1) {
+ this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.personalForward.carNum, tempcarNumSurplus1);
+ }
+ tempcarNumSurplus1 = 0;
+ // 璐т唬
+ if (this.roleType == 2) {
+ this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.personalForward.carNum, tempforwardSurplus);
+ }
+ tempforwardSurplus = 0;
+ });
+ };
+ jhorderplanforward();
// 閫夋嫨涓�涓悗鍏朵綑绂佹澶嶉��
this.jhOrderPlanForwardList.forEach((v, i) => {
if (i !== index) {
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index a4ff57e..83b66ea 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -249,12 +249,12 @@
this.messageList = JSON.parse(res.data.slice(5));
this.messagePushShow = true;
} else {
- console.log('websocket杩樺湪娲荤潃');
+ console.log('websocket鍚姩涓�');
}
});
socket.onClose(e => {
console.log('webSocketClose', e);
- this.$u.toast('杩炴帴宸叉柇寮�锛岃閲嶆柊杩涘叆璇ラ〉闈紝閲嶈瘯锛侊紒');
+ // this.$u.toast('杩炴帴宸叉柇寮�锛岃閲嶆柊杩涘叆璇ラ〉闈紝閲嶈瘯锛侊紒');
this.isconnect = false;
});
socket.onError(err => {
diff --git a/pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue b/pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue
index 0630731..6c2651f 100644
--- a/pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue
+++ b/pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue
@@ -3,7 +3,7 @@
<customer-my-page v-if="roleType == 1" ref="customerMyPageRef"></customer-my-page>
<freight-forwarder-my-page v-if="roleType == 2" ref="freightForwarderMyPageRef"></freight-forwarder-my-page>
<driver-my-page v-if="roleType == 3" ref="driverMyRef"></driver-my-page>
- <tab-bar :current="1"></tab-bar>
+ <tab-bar :current="2"></tab-bar>
</view>
</template>
diff --git a/static/tabBar-icon/statistics.png b/static/tabBar-icon/statistics.png
new file mode 100644
index 0000000..bb5e108
--- /dev/null
+++ b/static/tabBar-icon/statistics.png
Binary files differ
diff --git a/static/tabBar-icon/statisticsactive.png b/static/tabBar-icon/statisticsactive.png
new file mode 100644
index 0000000..6d72c35
--- /dev/null
+++ b/static/tabBar-icon/statisticsactive.png
Binary files differ
diff --git a/store/index.js b/store/index.js
index badfcb9..45b8230 100644
--- a/store/index.js
+++ b/store/index.js
@@ -11,6 +11,12 @@
text: '棣栭〉'
},
{
+ pagePath: 'pages/customer-page/customer-my/faYunstatistics/faYunstatistics',
+ iconPath: '../../static/tabBar-icon/statistics.png',
+ selectedIconPath: '../../static/tabBar-icon/statisticsactive.png',
+ text: '鍙戣繍缁熻'
+ },
+ {
pagePath: 'pages/tabbar-page/myPage-tabbar/myPage-tabbar',
iconPath: '../../static/tabBar-icon/Gmine10.png',
selectedIconPath: '../../static/tabBar-icon/Bmine57.png',
@@ -24,6 +30,12 @@
text: '棣栭〉'
},
{
+ pagePath: 'pages/customer-page/customer-my/faYunstatistics/faYunstatistics',
+ iconPath: '../../static/tabBar-icon/statistics.png',
+ selectedIconPath: '../../static/tabBar-icon/statisticsactive.png',
+ text: '鍙戣繍缁熻'
+ },
+ {
pagePath: 'pages/tabbar-page/myPage-tabbar/myPage-tabbar',
iconPath: '../../static/tabBar-icon/Gmine10.png',
selectedIconPath: '../../static/tabBar-icon/Bmine57.png',
--
Gitblit v1.9.1