From 05273ace3da665cb10c36ca0dac4413a8284302a Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 17 五月 2023 18:10:36 +0800
Subject: [PATCH] 增加部分限制，增加新功能
---
pages/driver-page/driver-index/driver-index.vue | 100 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 74 insertions(+), 26 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 65ca4f9..e20bc70 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -6,6 +6,7 @@
<view class="wait-collection" style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/diverbanner.png') no-repeat;background-size:contain"></view>
<view class="collection-form">
<view class="collection-form-item" v-for="(item, index) in driverBillOfLoadingData.list1" :key="index">
+ <view class="main-divider"></view>
<view class="first-line">
<view class="main-information">
<view class="sign">瑁�</view>
@@ -14,7 +15,6 @@
<text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerNameCopy }}</text>
</view>
</view>
- <view class="main-divider"></view>
<view class="point-number">
<text class="residue">{{ item.carNum - item.taskNum }}</text>
<text>/{{ item.carNum }}</text>
@@ -31,12 +31,15 @@
</view>
</view>
</view>
- <view class="second-line">
+ <!-- <view class="second-line">
<view class="coal-name">{{ item.coalName }}</view>
- </view>
+ </view> -->
<view class="third-line">
<view class="time-icon"><u-icon name="clock" color="#515151" size="40"></u-icon></view>
<view class="send-date">{{ item.sendDate }}</view>
+ <view class="type">
+ <view class="coal-name">{{ item.coalName }}</view>
+ </view>
</view>
<view class="fourth-line" @click="qiangDanBtn(item)" v-if="item.carNum - item.taskNum !== 0"><view class="button-img">绔嬪嵆鎶㈠崟</view></view>
</view>
@@ -59,6 +62,7 @@
<view class="appointment-form">
<view class="appointment-form-item" v-for="(item, index) in driverBillOfLoadingData.list3" :key="index">
+ <view class="main-divider"></view>
<view class="first-line">
<view class="main-information">
<view class="sign">瑁�</view>
@@ -67,12 +71,11 @@
<text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerName }}</text>
</view>
</view>
- <view class="main-divider"></view>
<view class="map-icon" @click.stop="skipMap(item)">
<view><u-icon name="map" color="#4978F0" size="40"></u-icon></view>
</view>
</view>
- <view class="second-line">
+ <view class="first-extra">
<view class="main-information">
<view class="sign">鍗�</view>
<view class="filedname exceedHide">
@@ -111,6 +114,7 @@
></u-empty>
<view class="appointment-form">
<view class="appointment-form-item" v-for="(item, index) in driverBillOfLoadingData.list2" :key="index" @click="list3CardIconClick(item)">
+ <view class="main-divider"></view>
<view class="first-line">
<view class="main-information">
<view class="sign">瑁�</view>
@@ -119,7 +123,6 @@
<text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerName }}</text>
</view>
</view>
- <view class="main-divider"></view>
<view class="map-icon" @click.stop="skipMap(item)">
<view><u-icon name="map" color="#4978F0" size="40"></u-icon></view>
</view>
@@ -380,6 +383,14 @@
display: flex;
flex-direction: column;
justify-content: space-around;
+ .main-divider {
+ width: 560rpx;
+ height: 2rpx;
+ background: #e3e3e3;
+ position: absolute;
+ top: 122rpx;
+ left: 128rpx;
+ }
.first-line {
width: 94%;
height: vww(68);
@@ -404,14 +415,6 @@
color: #ffffff;
margin-right: vww(20);
}
- }
- .main-divider {
- width: 548rpx;
- height: 1rpx;
- background: #e3e3e3;
- position: absolute;
- top: 115rpx;
- left: vww(50);
}
.point-number {
position: absolute;
@@ -505,10 +508,33 @@
width: 148rpx;
height: 24rpx;
margin-left: vww(14);
+ margin-right: vww(56);
line-height: 24rpx;
font-size: 28rpx;
font-weight: 300;
color: #515151;
+ }
+ .type {
+ flex: 1;
+ margin-right: vww(10);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ .coal-name {
+ width: 120rpx;
+ height: 42rpx;
+ line-height: 42rpx;
+ border: 2px solid #035cfb;
+ border-radius: 4rpx;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #035cfb;
+ text-align: center;
+ padding: vww(3) vww(11);
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
}
}
.fourth-line {
@@ -518,8 +544,8 @@
display: flex;
justify-content: flex-end;
position: relative;
- left: vww(190);
- bottom: vww(10);
+ left: vww(203);
+ bottom: vww(3);
.button-img {
width: 100%;
height: 100%;
@@ -546,6 +572,15 @@
@include formItem;
height: vww(191);
justify-content: space-between;
+ overflow: hidden;
+ .main-divider {
+ width: 560rpx;
+ height: 1rpx;
+ background: #e3e3e3;
+ position: absolute;
+ top: 122rpx;
+ left: 128rpx;
+ }
.first-line {
position: relative;
@include firstLine;
@@ -555,7 +590,6 @@
display: flex;
justify-content: flex-start;
align-items: center;
-
.sign {
width: vww(28);
height: vww(28);
@@ -569,13 +603,27 @@
margin-right: vww(20);
}
}
- .main-divider {
- width: 548rpx;
- height: 1rpx;
- background: #e3e3e3;
- position: absolute;
- top: vww(40);
- left: vww(50);
+ }
+ .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 {
@@ -608,9 +656,9 @@
justify-content: flex-start;
margin-left: vww(18);
.clock {
- width: 33%;
+ width: 40%;
height: vww(21);
- margin-right: vww(70);
+ margin-right: vww(50);
line-height: vww(21);
@include flex;
justify-content: flex-start;
--
Gitblit v1.9.1