diff --git a/src/App.vue b/src/App.vue index c595bc0..9821271 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,13 +1,13 @@ diff --git a/src/stores/userInfo.ts b/src/stores/userInfo.ts index ef7d558..835d8ae 100644 --- a/src/stores/userInfo.ts +++ b/src/stores/userInfo.ts @@ -1,70 +1,46 @@ // 每一个存储的模块，命名规则use开头，store结尾 +import router from '@/router' import { defineStore } from 'pinia' import { ref, computed } from 'vue' import { removeLocal, setLocal } from '@/utils/local' import MyEvent from '@/utils/myEvent' export const useUserInfoStore = defineStore('userInfo', () => { - const state = ref({ + const state = ref({ userInfo: {}, token: '', - generateParams: { - stylist: '', - sex: '', - stylistImage: '' - } - }) - // getters - const getUserInfo = computed(() => state.value.userInfo) + }) - // actions - const setUserInfo = (data: any) => { - state.value.userInfo = data - } + // getters + const getUserInfo = computed(() => state.value.userInfo) - const setToken = (data: string) => { - state.value.token = data - // setLocal(data, 'token') - } + // actions + const setUserInfo = (data: any) => { + state.value.userInfo = data + } - const getGenerateParams = () => { - return state.value.generateParams - } + const setToken = (data: string) => { + state.value.token = data + // setLocal(data, 'token') + } - const setGenerateParams = (data: any) => { - state.value.generateParams = data - } + const logOut = async () => { + // 处理退出登录的一些逻辑 + state.value.token = '' + state.value.userInfo = {} + // removeLocal('token') + // MyEvent.emit('clear-generate-state') + // MyEvent.emit('clear-client-state') + // MyEvent.emit('clearAllCache') + router.push({ name: 'login' }) + return "" + } - const resetGenerateParams = () => { - state.value.generateParams = { - stylist: '', - sex: '', - stylistImage: '' - } - } - - const logOut = () => { - // 处理退出登录的一些逻辑 - return new Promise((resolve) => { - state.value.token = '' - state.value.userInfo = {} - removeLocal('token') - resetGenerateParams() - MyEvent.emit('clear-generate-state') - MyEvent.emit('clear-client-state') - MyEvent.emit('clearAllCache') - resolve('') - }) - } - - return { - state, - getUserInfo, - setToken, - setUserInfo, - setGenerateParams, - getGenerateParams, - resetGenerateParams, - logOut - } + return { + state, + getUserInfo, + setToken, + setUserInfo, + logOut + } }) diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 86057fc..bd9b8aa 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -15,12 +15,14 @@
+ + + diff --git a/src/views/home/setting/LearnMore.vue b/src/views/home/setting/LearnMore.vue new file mode 100644 index 0000000..721608a --- /dev/null +++ b/src/views/home/setting/LearnMore.vue @@ -0,0 +1,33 @@ + + + + + diff --git a/src/views/home/setting/Profile.vue b/src/views/home/setting/Profile.vue new file mode 100644 index 0000000..a9f784c --- /dev/null +++ b/src/views/home/setting/Profile.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/views/home/setting/index.vue b/src/views/home/setting/index.vue new file mode 100644 index 0000000..9195ae7 --- /dev/null +++ b/src/views/home/setting/index.vue @@ -0,0 +1,126 @@ + + + + + diff --git a/src/views/home/top-nav.vue b/src/views/home/top-nav.vue index cfab55c..6d5e6c4 100644 --- a/src/views/home/top-nav.vue +++ b/src/views/home/top-nav.vue @@ -12,13 +12,38 @@ - + + +
+
+ {{ email }} +
+

+
+ + Settings +
+
+ + Log out +
+
+ diff --git a/src/views/login/login.vue b/src/views/login/login.vue index 21f46f7..6ef36a6 100644 --- a/src/views/login/login.vue +++ b/src/views/login/login.vue @@ -104,6 +104,9 @@ .then((res) => { if (res) { userInfoStore.setToken(res) + userInfoStore.setUserInfo({ + email: formData.email + }) router.push({ name: 'mainInput' }) } }) diff --git a/src/views/login/register.vue b/src/views/login/register.vue index fc127b7..3598ccc 100644 --- a/src/views/login/register.vue +++ b/src/views/login/register.vue @@ -111,6 +111,9 @@ .then((res) => { if (res) { userInfoStore.setToken(res) + userInfoStore.setUserInfo({ + email: formData.email + }) router.push({ name: 'nuic' }) } }) diff --git a/src/views/nuic/index.vue b/src/views/nuic/index.vue index 8d453c9..9114474 100644 --- a/src/views/nuic/index.vue +++ b/src/views/nuic/index.vue @@ -25,7 +25,7 @@
- +
{{ $t('Nuic.loadingTip') }}
@@ -167,7 +167,7 @@ top: 50%; left: 50%; transform: translate(-50%, -50%); - width: 14.4rem; + width: 60rem; height: auto; opacity: 0; &.loading {