From ae1aad66a165ee7253bed2127a3b53baa40c2361 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 17 五月 2023 08:35:33 +0800
Subject: [PATCH] 修复错误，增加验证
---
pages/driver-page/driver-index/driver-index.vue | 78 +++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 40 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 060535d..65ca4f9 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -9,12 +9,9 @@
<view class="first-line">
<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.customerNameCopy.slice(0, 16) }}
- </text>
- <text v-show="item.deptName.length >= 15 || item.customerNameCopy.length >= 15">...</text>
+ <view class="filedname exceedHide">
+ <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.deptName }}</text>
+ <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerNameCopy }}</text>
</view>
</view>
<view class="main-divider"></view>
@@ -26,10 +23,11 @@
<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.customerNameCopy.slice(0, 16) }}</text>
- <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.deptName.slice(0, 16) }}</text>
- <text v-show="item.customerNameCopy.length >= 15 || item.deptName.length >= 15">...</text>
+ <view class="filedname exceedHide">
+ <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">
+ {{ item.customerNameCopy ? item.customerNameCopy : item.customerName }}
+ </text>
+ <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.deptName }}</text>
</view>
</view>
</view>
@@ -59,17 +57,14 @@
v-if="driverBillOfLoadingData.list3 ? (driverBillOfLoadingData.list3.length == 0 ? true : false) : true"
></u-empty>
- <view class="appointment-form" v-if="driverBillOfLoadingData.list3 && driverBillOfLoadingData.list3.length !== 0">
+ <view class="appointment-form">
<view class="appointment-form-item" v-for="(item, index) in driverBillOfLoadingData.list3" :key="index">
<view class="first-line">
<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 class="filedname exceedHide">
+ <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.deptName }}</text>
+ <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerName }}</text>
</view>
</view>
<view class="main-divider"></view>
@@ -80,10 +75,9 @@
<view class="second-line">
<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.deptName.length >= 15 || item.customerName.length >= 15">...</text>
+ <view class="filedname exceedHide">
+ <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.customerName }}</text>
+ <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.deptName }}</text>
</view>
</view>
<view class="map-icon" @click.stop="skipMap(item)">
@@ -115,17 +109,14 @@
iconSize="1000"
v-if="driverBillOfLoadingData.list2 ? (driverBillOfLoadingData.list2.length == 0 ? true : false) : true"
></u-empty>
- <view class="appointment-form" v-if="driverBillOfLoadingData.list2 && driverBillOfLoadingData.list2.length !== 0">
+ <view class="appointment-form">
<view class="appointment-form-item" v-for="(item, index) in driverBillOfLoadingData.list2" :key="index" @click="list3CardIconClick(item)">
<view class="first-line">
<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 class="filedname exceedHide">
+ <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.deptName }}</text>
+ <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerName }}</text>
</view>
</view>
<view class="main-divider"></view>
@@ -136,10 +127,9 @@
<view class="second-line">
<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.deptName.length >= 15 || item.customerName.length >= 15">...</text>
+ <view class="filedname exceedHide">
+ <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.customerName }}</text>
+ <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.deptName }}</text>
</view>
</view>
<view class="map-icon" @click.stop="skipMap(item)">
@@ -158,7 +148,7 @@
</view>
</view>
</view>
- <view class="white-block" v-if="driverBillOfLoadingData.list2.length !== 0">娌℃湁鏁版嵁浜�...</view>
+ <view class="white-block"></view>
</view>
</view>
</view>
@@ -213,7 +203,7 @@
skipMap(val) {
uni.navigateTo({
url: `/pages/public-page/mapRoute/mapRoute?customerId=${val.customerId}&filedId=${val.filedId}&orderType=${val.orderType}${
- val.toFiledId ? `&toFiledId=${val.toFiledId}` : ''
+ val.toFiledId ? `&toFiledId=${val.toFiledId}&filedId=${val.filedId}` : ''
}`
});
},
@@ -358,6 +348,11 @@
line-height: vww(40);
}
}
+.exceedHide {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
::v-deep.driver-index {
width: 100%;
margin: 0 auto;
@@ -459,20 +454,19 @@
.second-line {
width: 100%;
height: vww(68);
- margin-left: vww(12);
+ margin-left: vww(21);
display: flex;
justify-content: flex-start;
align-items: center;
.coal-name {
min-width: vww(50);
- height: 30rpx;
+ height: 35rpx;
font-size: 30rpx;
-
font-weight: 300;
color: #515151;
position: relative;
display: flex;
- justify-content: center;
+ justify-content: flex-start;
}
.black-block {
min-width: vww(50);
@@ -503,7 +497,7 @@
.third-line {
width: 100%;
height: vww(68);
- margin-left: vww(15);
+ margin-left: vww(21);
display: flex;
justify-content: flex-start;
align-items: center;
@@ -612,6 +606,7 @@
@include thirdLine;
width: 94%;
justify-content: flex-start;
+ margin-left: vww(18);
.clock {
width: 33%;
height: vww(21);
@@ -631,7 +626,7 @@
align-items: center;
.order-type,
.coal-name {
- // min-width: 120rpx;
+ width: 120rpx;
height: 42rpx;
line-height: 42rpx;
border: 2px solid #035cfb;
@@ -641,6 +636,9 @@
color: #035cfb;
text-align: center;
padding: vww(3) vww(11);
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
}
}
--
Gitblit v1.9.1