From 1133937391324486242aa6e9b6f8884567058651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Tue, 23 May 2023 14:35:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Nursingstationserviceorder/Nursingstationserviceorder.vue | 3 ++-
 pages/login/login.vue                                         | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
index 0804fe1..8ba7b13 100644
--- a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
+++ b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
@@ -6,7 +6,8 @@
 					{{item.createTime}}
 					<span>{{item.orderStatus=='WAIT_PAY'?'待付款':''}}
 						{{item.orderStatus=='PAY'?'已付款':''}}
-						{{item.orderStatus=='WAIT_DISPATCH'?'待服务':''}}
+						{{item.orderStatus=='WAIT_DISPATCH'&&item.orderType!='COMPANION_IN_HOSPITAL'?'待服务':''}}
+						{{item.orderStatus=='WAIT_DISPATCH'&&item.orderType=='COMPANION_IN_HOSPITAL'?'服务完成':''}}
 						{{item.orderStatus=='NOT_FINISH'?'待完成':''}}
 						{{item.orderStatus=='COMPLETE'?'待评价':''}}
 						{{item.orderStatus=='EVALUATED'?'服务完成':''}}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 69873ed..6bd4482 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -82,7 +82,9 @@
 				uni.clearStorageSync();
 				createMobileToken().then(res => {
 					uni.setStorageSync("token", res.data.token)
-					uni.setStorageSync("scenenurseStationId", this.scenenurseStationId)
+					if (this.scenenurseStationId) {
+						uni.setStorageSync("scenenurseStationId", this.scenenurseStationId)
+					}
 					that.login()
 				})
 			},