From 3b2e941a83ad49d3167df864a5a06a81ef944470 Mon Sep 17 00:00:00 2001
From: zhangchen <1652267879@qq.com>
Date: 星期三, 24 九月 2025 23:55:45 +0800
Subject: [PATCH] Merge branch 'ID2130-未签到页面优化' into test
---
src/views/mobile/bedsideAuxiliaryScreen/components/Login/index.vue | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/views/mobile/bedsideAuxiliaryScreen/components/Login/index.vue b/src/views/mobile/bedsideAuxiliaryScreen/components/Login/index.vue
index 697cd71..a30b281 100644
--- a/src/views/mobile/bedsideAuxiliaryScreen/components/Login/index.vue
+++ b/src/views/mobile/bedsideAuxiliaryScreen/components/Login/index.vue
@@ -69,6 +69,16 @@
};
});
+ const userInfo = computed(() => {
+ const userInfo = bedsideAuxiliaryScreenStore.userInfo;
+ if (!userInfo) return null;
+ return {
+ ...userInfo,
+ 床号: bedsideAuxiliaryScreenStore.deviceData.devicdeNo,
+ 设备编号: bedsideAuxiliaryScreenStore.deviceCode
+ }
+ });
+
const openDialog = () => {
state.show = true;
};
@@ -87,19 +97,16 @@
.then(async() => {
state.loading = true
try {
- await bedsideAuxiliaryScreenStore.logout(bedsideAuxiliaryScreenStore.deviceCode);
+ await bedsideAuxiliaryScreenStore.logout(`deviceCode=${bedsideAuxiliaryScreenStore.deviceCode}`);
handleCancel();
ElMessage.success('退出登录成功')
handleCancel();
} catch (error) {
- ElMessage.success('退出登录失败')
+ console.error('error: ', error)
+ // ElMessage.error('退出登录失败')
} finally {
state.loading = false;
}
- ElMessage({
- type: "success",
- message: "退出成功！",
- });
})
.catch(() => {});
};
@@ -112,6 +119,7 @@
handleCancel,
openDialog,
onLogout,
+ userInfo,
};
},
};
--
Gitblit v1.8.0