From 29658de29b2eb5292bf0c2fad7427b374b769ebc Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 10 五月 2023 20:29:31 +0800
Subject: [PATCH] 样式修改,引入字体，修改逻辑
---
pages/driver-page/driver-index/driver-index.vue | 56 ++++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 5e5d716..498ea06 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -18,14 +18,14 @@
<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="dispatch">{{ item.deptName || '' }}</view>
<view class="receive-icon"></view>
- <view class="receive">{{ item.customerNameCopy }}</view>
+ <view class="receive">{{ item.customerNameCopy || '' }}}</view>
</view>
<view v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'" class="container">
- <view class="dispatch">{{ item.customerNameCopy }}</view>
+ <view class="dispatch">{{ item.customerNameCopy || '' }}</view>
<view class="receive-icon"></view>
- <view class="receive">{{ item.deptName }}</view>
+ <view class="receive">{{ item.deptName || '' }}}</view>
</view>
</view>
<view class="point-number">
@@ -162,6 +162,7 @@
<script>
import { customerId } from '@/utils/status';
import combinedTitle from '@/components/combined-title/combined-title.vue';
+
export default {
components: {
combinedTitle
@@ -191,7 +192,11 @@
qiangDanOrderPlanId: null,
fleetId: '',
xsUserId: '',
- customerId: ''
+ customerId: '',
+ // 闆嗘垚楂樺痉鍦板浘
+ amapPlugin: null,
+ key: 'e3106700a6225e6a25727d3a41fa54c5',
+ addressName: ''
};
},
onShow() {
@@ -302,12 +307,12 @@
height: 24rpx;
line-height: 24rpx;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
}
.havedclock {
width: 58% !important;
+ margin-right: 0 !important;
.send-date {
width: 100%;
margin-left: vww(12);
@@ -330,10 +335,9 @@
.button-img {
width: 100%;
height: 100%;
- background: url('../../../static/image/banner/button.png') no-repeat;
+ background: url('https://mx.jzeg.cn:9095/appimg/image/banner/button.png') no-repeat;
background-size: cover;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #ffffff;
text-align: center;
@@ -345,7 +349,7 @@
margin: 0 auto;
// 涓讳綋
.driver-index-body {
- margin-bottom: vww(56);
+ // margin-bottom: vww(56);
// 寰呴鍙栨彁鐓ゅ崟
.wait-collection {
width: 100%;
@@ -404,13 +408,12 @@
width: 15%;
text {
font-size: 24rpx;
- font-family: Microsoft YaHei;
+
font-weight: 400;
color: #c78a64;
}
.residue {
font-size: 40rpx;
- font-family: CTCuHeiSJ;
font-weight: 400;
color: #f81414;
}
@@ -427,7 +430,7 @@
min-width: vww(50);
height: 30rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
+
font-weight: 300;
color: #515151;
position: relative;
@@ -438,7 +441,7 @@
min-width: vww(50);
height: 30rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
+
font-weight: 300;
color: #515151;
position: relative;
@@ -456,7 +459,6 @@
min-width: vww(50);
height: 30rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
text-align: center;
@@ -475,7 +477,6 @@
margin-left: vww(14);
line-height: 24rpx;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
}
@@ -492,10 +493,9 @@
.button-img {
width: 100%;
height: 100%;
- background: url('../../../static/image/banner/button.png') no-repeat;
+ background: url('https://mx.jzeg.cn:9095/appimg/image/banner/button.png') no-repeat;
background-size: cover;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #ffffff;
text-align: center;
@@ -518,11 +518,12 @@
justify-content: space-between;
.first-line {
position: relative;
- @include firstLine .main-information {
- width: 40%;
+ @include firstLine;
+ .main-information {
+ width: 100%;
height: vww(28);
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
align-items: center;
.sign {
@@ -530,12 +531,12 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('../../../static/image/banner/blueblock.png') no-repeat;
+ background: url('https://mx.jzeg.cn:9095/appimg/image/banner/blueblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 400;
color: #ffffff;
+ margin-right: vww(20);
}
}
.main-divider {
@@ -551,22 +552,22 @@
@include firstLine margin: 0;
margin-left: vww(16);
.main-information {
- width: 40%;
+ width: 100%;
height: vww(28);
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
align-items: center;
.sign {
width: vww(28);
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('../../../static/image/banner/redblock.png') no-repeat;
+ background: url('https://mx.jzeg.cn:9095/appimg/image/banner/redblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 400;
color: #ffffff;
+ margin-right: vww(20);
}
}
}
@@ -577,7 +578,7 @@
.clock {
width: 33%;
height: vww(21);
- // margin-right: vww(70);
+ margin-right: vww(70);
line-height: vww(21);
@include flex;
justify-content: flex-start;
@@ -599,7 +600,6 @@
border: 2px solid #035cfb;
border-radius: 4rpx;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #035cfb;
text-align: center;
--
Gitblit v1.9.1