From 2955092b50791a50a59b8dead69346182f8601f8 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 23 Aug 2023 14:58:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subpkg/property/vehicle.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/subpkg/property/vehicle.vue b/subpkg/property/vehicle.vue
index c84525d..e491cf0 100644
--- a/subpkg/property/vehicle.vue
+++ b/subpkg/property/vehicle.vue
@@ -21,7 +21,7 @@
 							</view>
 							<view v-if="address.terminus">{{address.terminus.address}}</view>
 						</view>
-						<view :class="{lg_status1:address.terminus.status==2,lg_status2:address.terminus.status==1}">
+						<view :class="{lg_status1:address.terminus.status==2,lg_status2:address.terminus.status==1}" style="margin-top: 10rpx;">
 							<text class="cir" style="background-color: transparent;"></text>
 							<text>车辆状态：</text><text v-if="address.terminus.status==2">已完成</text>
 							<text v-else style="color: #FF7C32;">进行中</text>
@@ -35,10 +35,11 @@
 							</view>
 							<view v-if="address.transfer">{{address.transfer.address}}</view>
 						</view>
-						<view :class="{lg_status1:address.transfer.status==2,lg_status2:address.transfer.status==1}">
+						<view :class="{lg_status1:address.transfer.status==2,lg_status2:address.transfer.status==1&&address.terminus.status==2}" style="margin-top: 10rpx;">
 							<text class="cir" style="background-color: transparent;"></text>
 							<text class="status">车辆状态：</text><text v-if="address.transfer.status==2">已完成</text>
-							<text v-else style=" color: #FF7C32;">进行中</text>
+							<text v-else-if="address.terminus.status==1">未开始</text>
+              <text v-else style="color: #FF7C32;">进行中</text>
 						</view>
 
 					</view>
@@ -207,8 +208,6 @@
 			// 计算距离
 			getDistance(point1, point2) {
 				const rad = Math.PI / 180.0;
-
-
 				const lat1 = point1.latitude;
 				const lng1 = point1.longitude;
 				const lat2 = point2.latitude;
@@ -336,6 +335,7 @@
 
 		.li {
 			margin: 20rpx 0;
+      line-height: 40rpx;
 		}
 
 		.cir {