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 |   62 +++++++++++++++++++++----------
 1 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 116235f..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>
@@ -62,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>
@@ -70,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">
@@ -114,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>
@@ -122,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>
@@ -383,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);
@@ -407,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;
@@ -572,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;
@@ -581,7 +590,6 @@
 						display: flex;
 						justify-content: flex-start;
 						align-items: center;
-
 						.sign {
 							width: vww(28);
 							height: vww(28);
@@ -595,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 {

--
Gitblit v1.9.1