From 8e4ecc18726f32d208f9dc7f618926a292bc2fce Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期四, 14 十一月 2024 16:24:46 +0800
Subject: [PATCH] Merge branch 'test' of http://47.103.154.90:83/r/WI/Web.V1.0 into test
---
src/views/project/ch/home/Home.vue | 15 ++++++++++-----
src/stores/chatRoom.ts | 4 +++-
src/layout/component/login/Login.vue | 8 ++++----
3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/layout/component/login/Login.vue b/src/layout/component/login/Login.vue
index 89733e9..18b3533 100644
--- a/src/layout/component/login/Login.vue
+++ b/src/layout/component/login/Login.vue
@@ -56,7 +56,7 @@
import { ElMessage, type FormInstance } from 'element-plus';
import { computed, reactive, ref } from 'vue';
import { PostLogin, loginMessageUser, loginVerifyMessage } from '/@/api/ai/user';
-import { isLoginStatus, isShowLogin } from '/@/stores/chatRoom';
+import { isLoginStatus, isNewOldUser, isShowLogin } from '/@/stores/chatRoom';
import { LoginInfo } from '/@/utils/storage';
@@ -115,7 +115,7 @@
if (!res.json_ok) {
return ElMessage.error(res.json_msg);
}
-
+ isNewOldUser.value = res.web_login;
LoginInfo.set(res.hswatersession, state.loginForm.account);
} else if (state.activeLoginName === 'phoneUser') {
//鎵嬫満鐧诲綍
@@ -130,11 +130,11 @@
return ElMessage.error(res.json_msg);
}
LoginInfo.set(res.hswatersession, state.loginPhoneForm.phoneUser);
+ isNewOldUser.value = res.web_login;
}
-
isShowLogin.value = false;
isLoginStatus.value = true;
- window.location.reload();
+ // window.location.reload();
};
const countdown = ref(null);
diff --git a/src/stores/chatRoom.ts b/src/stores/chatRoom.ts
index f3040be..75fb5c8 100644
--- a/src/stores/chatRoom.ts
+++ b/src/stores/chatRoom.ts
@@ -175,4 +175,6 @@
}
};
// 鏄惁宸茬粡灞曠ず寮曞
-export const hadShowFirstGuide = ref(false);
\ No newline at end of file
+export const hadShowFirstGuide = ref(false);
+//鏄惁鏄柊鑰佺敤鎴�
+export const isNewOldUser = ref(null);
diff --git a/src/views/project/ch/home/Home.vue b/src/views/project/ch/home/Home.vue
index 0396f8c..521b04c 100644
--- a/src/views/project/ch/home/Home.vue
+++ b/src/views/project/ch/home/Home.vue
@@ -36,17 +36,19 @@
<script setup lang="ts">
import { driver } from 'driver.js';
import 'driver.js/dist/driver.css';
-import { onMounted, reactive, ref } from 'vue';
+import { nextTick, onMounted, reactive, ref } from 'vue';
import waterBottom from './component/waterRight/bottom.vue';
import waterCenter from './component/waterRight/center.vue';
import waterTop from './component/waterRight/top.vue';
import CustomDrawer from '/@/components/drawer/CustomDrawer.vue';
-import { exampleSceneList, hadShowFirstGuide } from '/@/stores/chatRoom';
+import { exampleSceneList, hadShowFirstGuide, isNewOldUser } from '/@/stores/chatRoom';
import { accessSessionKey } from '/@/utils/request';
import { Local } from '/@/utils/storage';
let state = reactive({
isShowAdvanceExample: false,
});
+// 寮曞姝ラ
+
const driverObj = driver({
showProgress: true,
allowClose: true,
@@ -62,6 +64,7 @@
],
onCloseClick: () => {
driverObj.destroy();
+ hadShowFirstGuide.value = false;
},
});
const topRef = ref(null);
@@ -90,9 +93,11 @@
onMounted(() => {
isFinishPromise = new Promise(async (resolve) => {
await getSelectListSample();
- if (!!Local.get(accessSessionKey) && !hadShowFirstGuide.value ) {
- driverObj.drive();
- hadShowFirstGuide.value = true;
+ if (!!Local.get(accessSessionKey) && !hadShowFirstGuide.value && !isNewOldUser.value) {
+ nextTick(() => {
+ driverObj.drive();
+ hadShowFirstGuide.value = true;
+ });
}
resolve(true);
});
--
Gitblit v1.9.3