This commit is contained in:
weipengfei 2023-08-23 14:58:53 +08:00
parent 1bb374e0fb
commit 2955092b50

View File

@ -21,7 +21,7 @@
</view> </view>
<view v-if="address.terminus">{{address.terminus.address}}</view> <view v-if="address.terminus">{{address.terminus.address}}</view>
</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 class="cir" style="background-color: transparent;"></text>
<text>车辆状态</text><text v-if="address.terminus.status==2">已完成</text> <text>车辆状态</text><text v-if="address.terminus.status==2">已完成</text>
<text v-else style="color: #FF7C32;">进行中</text> <text v-else style="color: #FF7C32;">进行中</text>
@ -35,9 +35,10 @@
</view> </view>
<view v-if="address.transfer">{{address.transfer.address}}</view> <view v-if="address.transfer">{{address.transfer.address}}</view>
</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="cir" style="background-color: transparent;"></text>
<text class="status">车辆状态</text><text v-if="address.transfer.status==2">已完成</text> <text class="status">车辆状态</text><text v-if="address.transfer.status==2">已完成</text>
<text v-else-if="address.terminus.status==1">未开始</text>
<text v-else style="color: #FF7C32;">进行中</text> <text v-else style="color: #FF7C32;">进行中</text>
</view> </view>
@ -207,8 +208,6 @@
// //
getDistance(point1, point2) { getDistance(point1, point2) {
const rad = Math.PI / 180.0; const rad = Math.PI / 180.0;
const lat1 = point1.latitude; const lat1 = point1.latitude;
const lng1 = point1.longitude; const lng1 = point1.longitude;
const lat2 = point2.latitude; const lat2 = point2.latitude;
@ -336,6 +335,7 @@
.li { .li {
margin: 20rpx 0; margin: 20rpx 0;
line-height: 40rpx;
} }
.cir { .cir {