From f41e52e3debf30558d556dc0451776f5422fb9b8 Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期五, 08 十一月 2024 14:20:02 +0800
Subject: [PATCH] Merge branch 'test' of http://47.103.154.90:83/r/WI/Web.V1.0 into test
---
src/layout/component/sidebar/components/MenuList.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/layout/component/sidebar/components/MenuList.vue b/src/layout/component/sidebar/components/MenuList.vue
index f189dfb..f818f64 100644
--- a/src/layout/component/sidebar/components/MenuList.vue
+++ b/src/layout/component/sidebar/components/MenuList.vue
@@ -75,9 +75,7 @@
<el-form-item prop="verifyCode" label="楠岃瘉鐮�">
<el-input v-model="state.loginPhoneForm.verifyCode" placeholder="璇疯緭鍏ュ洓浣嶉獙璇佺爜" maxlength="6" clearable>
<template #append>
- <el-button type="primary" @click="handleSendVerifyCode" :disabled="countdown > 0">{{
- countdown > 0 ? `${countdown}绉掑悗閲嶈瘯` : '鑾峰彇楠岃瘉鐮�'
- }}</el-button>
+ <el-button type="primary" @click="handleSendVerifyCode" :disabled="hasSended">{{ sendCodeMsg }}</el-button>
</template>
</el-input>
</el-form-item>
@@ -102,11 +100,12 @@
import { accessSessionKey, userNameKey } from '/@/utils/request';
import { gotoRoute } from '/@/utils/route';
import { Local, LoginInfo } from '/@/utils/storage';
+import { isSharePage } from '/@/stores/chatRoom';
const loginFormRef = ref<FormInstance>(null); //璐︽埛瀵嗙爜鐧诲綍
const formPhoneRef = ref(); //鎵嬫満鍙风櫥褰�
const isLoginStatus = ref(!!Local.get(accessSessionKey));
const userName = ref('');
-const countdown = ref(0);
+const countdown = ref(null);
const firstUserCharacter = computed(() => userName.value?.[0]?.toUpperCase());
watchEffect(() => {
if (!isLoginStatus.value) return;
@@ -162,18 +161,26 @@
verifyCode: [{ required: true, message: '璇疯緭鍏ラ獙璇佺爜', trigger: 'blur' }],
};
const handleClick = (item) => {
- if(!item.routerName) return;
+ if (!item.routerName) return;
gotoRoute({ name: item.routerName });
};
const LOGIN_CLIENT = 'Web绔�';
//鐧诲綍
const openLoginDlg = async () => {
+ // 鍒嗕韩椤典笉闇�瑕�
+ if (isSharePage.value) return;
state.isShowLogin = true;
};
const handleClose = () => {
state.isShowLogin = false;
};
+const hasSended = computed(() => {
+ return countdown.value !== null;
+});
+const sendCodeMsg = computed(() => {
+ return !hasSended.value ? '鑾峰彇楠岃瘉鐮�' : `${countdown.value} 绉掑悗閲嶈瘯`;
+});
//鐧诲綍
const onSubmit = async () => {
if (state.activeLoginName === 'accountUser') {
@@ -184,7 +191,6 @@
user: state.loginForm.account,
pass: state.loginForm.pwd,
client: LOGIN_CLIENT,
-
});
if (!res.json_ok) {
return ElMessage.error(res.json_msg);
@@ -199,7 +205,6 @@
phone: state.loginPhoneForm.phoneUser,
code: state.loginPhoneForm.verifyCode,
client: LOGIN_CLIENT,
-
});
if (!res.json_ok) {
return ElMessage.error(res.json_msg);
--
Gitblit v1.9.3