From d8974c0d693b51760ba5ab935aa240512a873a93 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 25 四月 2023 08:37:29 +0800
Subject: [PATCH] 修改样式，修复已知bug
---
pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue | 117 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 91 insertions(+), 26 deletions(-)
diff --git a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
index 226a699..fed08d0 100644
--- a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
+++ b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
@@ -8,9 +8,7 @@
<text>{{ item.carNum }}</text>
寮�
</view>
- <view class="card-left__utils">
- <u-button text="杞彂" type="primary" @tap.stop="forwardClick(item)" shape="circle" v-if="item.carNumSurplusHuodai !== 0"></u-button>
- </view>
+ <view class="card-left__utils"><u-button text="杞彂" type="primary" @tap.stop="forwardClick(item)" shape="circle"></u-button></view>
</template>
<template v-slot:right-top>
<view class="right-top">
@@ -34,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>
@@ -125,6 +136,7 @@
if (res.data.records) {
if (this.pageCurrent > 1) {
this.historyCoalData = this.historyCoalData.concat(res.data.records);
+ this.historyCoalData = this.ArrSet(this.historyCoalData, 'id');
this.loading = false;
} else {
this.historyCoalData = res.data.records;
@@ -138,6 +150,15 @@
if (this.pageCurrent * this.pageSize >= this.total) return (this.showMoreData = true);
this.pageCurrent++;
this.getJhOrderPlanDataPage();
+ },
+ //fix 鐐瑰嚮鎻愮叅鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
+ ArrSet(Arr, id) {
+ var obj = {};
+ const arrays = Arr.reduce((setArr, item) => {
+ obj[item[id]] ? '' : (obj[item[id]] = true && setArr.push(item));
+ return setArr;
+ }, []);
+ return arrays;
},
init() {
this.huoDaiList();
@@ -178,9 +199,53 @@
<style lang="scss" scoped>
.scroll-Y {
- height: 600rpx;
+ height: 900rpx;
+ background-color: #e2e2e2;
+ border-radius: vww(10);
+ margin-bottom: vww(55);
+ .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;
}
@@ -190,7 +255,7 @@
margin: 0 auto;
// 涓讳綋
.freightForwarder-index-body {
- margin-bottom: vww(56);
+ margin-bottom: vww(10);
// 鍗＄墖鏍峰紡
.card-left__top {
--
Gitblit v1.9.1