From b5ef02292796dce304aaeb79b3d297840c10055a Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Thu, 24 Aug 2023 11:52:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/oaLogin/oaLogin.vue   |  2 +-
 pages/oaMy/oaMy.vue         |  7 ++++++-
 subpkg/property/vehicle.vue | 20 +++++++++++++++-----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/pages/oaLogin/oaLogin.vue b/pages/oaLogin/oaLogin.vue
index df1eb87..3a335d5 100644
--- a/pages/oaLogin/oaLogin.vue
+++ b/pages/oaLogin/oaLogin.vue
@@ -13,7 +13,7 @@
 						<u-tabs :list="tabList" @click="changeTabs" lineColor="#0122c7"
 							itemStyle="padding-left: 15px; padding-right: 15px; height: 34px;font-size: 32rpx;"></u-tabs>
 					</view>
-					<input v-if="current == 0" @click="getId" class="mobile item" v-model="formData.account"
+					<input v-if="current == 0" @click="getId" class="mobile item" v-model="formData.account" type="tel"
 						placeholder="输入账号" />
 					<input v-if="current == 0" @click="getId" class="mobile item" v-model="formData.password"
 						maxlength="26" placeholder="输入密码" password type="safe-password" />
diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue
index 30424ef..97e5ed9 100644
--- a/pages/oaMy/oaMy.vue
+++ b/pages/oaMy/oaMy.vue
@@ -3,7 +3,7 @@
 		<view class="head_box" style="position: relative;">
 			<!-- <image class="head_img" src="../../static/img/home/head-bg.png"></image> -->
       <view style="position: absolute;bottom: 0;left: 0;overflow: hidden;border-radius: 0 0 30rpx 30rpx;">
-        <hx-lottie :options="options" ref="lottie" style="width: 100vw;height: 400rpx;transform: scale(1.2);background-color: #033d94;"/>
+        <hx-lottie :options="options" ref="lottie" style="width: 100vw;height: 460rpx;transform: scale(1.2);background-color: #033d94;"/>
       </view>
 			<!-- #ifdef APP-PLUS||H5 -->
 			<view style="height: var(--status-bar-height);"></view>
@@ -124,6 +124,11 @@
 				};
 			}
 		},
+    watch:{
+      modelShow: function(n,o){
+        
+      }
+    },
 		methods: {
 			...mapActions(['getWxLogin']),
 			login() {
diff --git a/subpkg/property/vehicle.vue b/subpkg/property/vehicle.vue
index cb3b440..003be8a 100644
--- a/subpkg/property/vehicle.vue
+++ b/subpkg/property/vehicle.vue
@@ -22,11 +22,17 @@
 							</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}" style="margin-top: 10rpx;">
+						<view v-if="status!=5||address.terminus.status==2" :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>车辆状态：</text>
+              <text v-if="address.terminus.status==2">已完成</text>
 							<text v-else style="color: #FF7C32;">进行中</text>
 						</view>
+            <view v-else class="red" style="margin-top: 10rpx;">
+            	<text class="cir" style="background-color: transparent;"></text>
+            	<text>车辆状态：</text>
+            	<text>未完成</text>
+            </view>
 					</view>
 					<view class="li">
 						<view style="display: flex;justify-content: left;">
@@ -38,12 +44,12 @@
 						</view>
 						<view :class="{red: address.transfer.status!=2&&address.terminus.status==1,yellow:address.terminus.status!=1&&address.transfer.status!=2, green: address.transfer.status==2}" style="margin-top: 10rpx;">
 							<text class="cir" style="background-color: transparent;"></text>
-							<text >车辆状态：</text>
+							<text :class="{red: status==5}">车辆状态：</text>
               <text v-if="address.transfer.status==2">已完成</text>
 							<text v-else-if="address.terminus.status==1">未开始</text>
-              <text v-else>进行中</text>
+              <text v-else-if="status!=5">进行中</text>
+              <text v-else :class="{red: status==5}">未完成</text>
 						</view>
-
 					</view>
 				</view>
 			</view>
@@ -51,6 +57,7 @@
 		<mybtn v-if="status==1" @click="modelShow=true" text="抵达地点(中转站) 1/2"></mybtn>
 		<mybtn v-else-if="status==2" @click="modelShow=true" text="抵达地点(终点) 2/2"></mybtn>
 		<mybtn v-else-if="status==3" text="任务已完成" my_btn_disabled></mybtn>
+		<mybtn v-else-if="status==5" text="任务已关闭" my_btn_disabled></mybtn>
     <cover-view v-show="modelShow" class="cover">
       <cover-view class="cover_model">
         <cover-view class="model_title">标题</cover-view>
@@ -147,6 +154,9 @@
 					this.address.transfer['status'] = 2;
 					this.status = 3;
 				} else this.address.transfer['status'] = 1;
+        if(res.data.status==5){
+          this.status = 5;
+        }
 			},
 			// 位置
 			locationFn() {