From af436aa050f76584cd5cb88e413e45cd08c15d50 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 17 五月 2023 14:14:04 +0800
Subject: [PATCH] 修改部分错误，增加新功能
---
pages/driver-page/driver-index/driver-index.vue | 118 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 73 insertions(+), 45 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 12a9ef6..116235f 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,19 +23,23 @@
<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>
- <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>
@@ -64,12 +65,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.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 +78,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)">
@@ -120,12 +117,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.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 +130,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 +151,7 @@
</view>
</view>
</view>
- <view class="white-block" v-if="driverBillOfLoadingData.list2.length !== 0">娌℃湁鏁版嵁浜�...</view>
+ <view class="white-block"></view>
</view>
</view>
</view>
@@ -190,7 +183,11 @@
},
data() {
return {
- driverBillOfLoadingData: {},
+ driverBillOfLoadingData: {
+ list1: [],
+ list2: [],
+ list3: []
+ },
// 鎶㈠崟妯℃�佹
qiangDanShow: false,
qiangDanTitle: '鎶㈠崟鎻愮ず',
@@ -209,7 +206,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}` : ''
}`
});
},
@@ -354,6 +351,11 @@
line-height: vww(40);
}
}
+.exceedHide {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
::v-deep.driver-index {
width: 100%;
margin: 0 auto;
@@ -455,20 +457,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);
@@ -499,7 +500,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;
@@ -507,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 {
@@ -520,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%;
@@ -608,10 +632,11 @@
@include thirdLine;
width: 94%;
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;
@@ -627,7 +652,7 @@
align-items: center;
.order-type,
.coal-name {
- // min-width: 120rpx;
+ width: 120rpx;
height: 42rpx;
line-height: 42rpx;
border: 2px solid #035cfb;
@@ -637,6 +662,9 @@
color: #035cfb;
text-align: center;
padding: vww(3) vww(11);
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
}
}
--
Gitblit v1.9.1