From a12ac4f4388672c62c6fb59c5ef975e5dff5fc06 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 16 五月 2023 11:08:45 +0800
Subject: [PATCH] 修改部分问题
---
pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue | 119 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 79 insertions(+), 40 deletions(-)
diff --git a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
index f4d80ff..04e9c87 100644
--- a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
+++ b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
@@ -8,21 +8,28 @@
<view class="collection-form">
<view class="collection-form-item" v-for="(item, index) in orderPlanData" :key="index" @click="cardBodyClick(item)">
<view class="first-line">
- <view class="dispatch-receive">
- <view v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'" class="container">
- <view class="dispatch">{{ item.deptName }}</view>
- <view class="receive-icon"></view>
- <view class="receive">{{ item.customerName }}</view>
- </view>
- <view v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'" class="container">
- <view class="dispatch">{{ item.customerName }}</view>
- <view class="receive-icon"></view>
- <view class="receive">{{ item.deptName }}</view>
+ <view class="main-information">
+ <view class="sign">瑁�</view>
+ <view class="filedname">
+ <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.deptName.slice(0, 16) }}</text>
+ <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerName.slice(0, 16) }}</text>
+ <text v-show="item.deptName.length >= 15 || item.customerName.length >= 15">...</text>
</view>
</view>
+ <view class="main-divider"></view>
<view class="point-number">
<text class="residue">{{ item.carNumSurplusHuodai || 0 }}</text>
<text>/{{ item.carNum }}</text>
+ </view>
+ </view>
+ <view class="first-extra">
+ <view class="main-information">
+ <view class="sign">鍗�</view>
+ <view class="filedname">
+ <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.customerName.slice(0, 16) }}</text>
+ <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.deptName.slice(0, 16) }}</text>
+ <text v-show="item.customerName.length >= 15 || item.deptName.length >= 15">...</text>
+ </view>
</view>
</view>
<view class="second-line">
@@ -72,7 +79,7 @@
<view class="third-line_num" v-else-if="roleType == 2">{{ item.carNumSurplus }}</view>
</view>
<view class="third-line">
- <view class="third-line_text">鎻愮叅鍗曚釜鏁帮細锛�</view>
+ <view class="third-line_text">鎻愮叅鍗曚釜鏁帮細</view>
<view class="third-line_num">{{ item.tmCount }}</view>
</view>
</view>
@@ -235,6 +242,13 @@
justify-content: space-between;
align-items: center;
}
+@mixin firstLine {
+ width: 94%;
+ height: vww(68);
+ margin: vww(18) vww(16) 0 vww(16);
+ display: flex;
+ justify-content: space-between;
+}
.scroll-Y {
height: 900rpx;
.more_text {
@@ -345,12 +359,13 @@
top: vww(-144);
.collection-form-item {
width: 690rpx;
- height: 300rpx;
+ height: 340rpx;
background: #ffffff;
box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15);
border-radius: 20rpx;
overflow: hidden;
- @include flex flex-direction: column;
+ @include flex;
+ flex-direction: column;
position: relative;
align-items: flex-start;
margin-top: vww(10);
@@ -360,34 +375,36 @@
margin: vww(10) vww(16) 0 vww(16);
display: flex;
justify-content: space-between;
- .dispatch-receive {
- width: 70%;
+ .main-information {
+ width: 88%;
+ height: vww(28);
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
align-items: center;
- .container {
- width: 100%;
- display: flex;
- justify-content: space-between;
- align-items: center;
- }
- .receive-icon {
- width: 62rpx;
- height: 14rpx;
- border-bottom: 3px solid #275fa5;
- position: relative;
- &:after {
- content: '';
- position: absolute;
- width: 3px;
- height: 10px;
- background-color: #275fa5;
- right: 0;
- transform: rotate(-45deg);
- }
+ .sign {
+ width: vww(28);
+ height: vww(28);
+ line-height: vww(28);
+ text-align: center;
+ background: url('https://mx.jzeg.cn:9095/appimg/image/banner/blueblock.png') no-repeat;
+ background-size: contain;
+ font-size: 30rpx;
+ font-weight: 400;
+ color: #ffffff;
+ margin-right: vww(20);
}
}
+ .main-divider {
+ width: 548rpx;
+ height: 1rpx;
+ background: #e3e3e3;
+ position: absolute;
+ top: 98rpx;
+ left: vww(50);
+ }
.point-number {
+ position: absolute;
+ right: 0;
width: 15%;
text {
font-size: 24rpx;
@@ -401,10 +418,32 @@
}
}
}
+ .first-extra {
+ @include firstLine;
+ .main-information {
+ width: 100%;
+ height: vww(28);
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+ .sign {
+ width: vww(28);
+ height: vww(28);
+ line-height: vww(28);
+ text-align: center;
+ background: url('https://mx.jzeg.cn:9095/appimg/image/banner/redblock.png') no-repeat;
+ background-size: contain;
+ font-size: 30rpx;
+ font-weight: 400;
+ color: #ffffff;
+ margin-right: vww(20);
+ }
+ }
+ }
.second-line {
width: 100%;
- height: vww(30);
- margin-left: vww(12);
+ height: vww(40);
+ margin-left: vww(18);
display: flex;
justify-content: flex-start;
align-items: center;
@@ -436,8 +475,8 @@
}
.third-line {
width: 40%;
- height: vww(30);
- margin-left: vww(15);
+ height: vww(50);
+ margin-left: vww(18);
display: flex;
justify-content: flex-start;
align-items: center;
--
Gitblit v1.9.1