diff --git a/src/App.vue b/src/App.vue index 754836f..7cdbb55 100644 --- a/src/App.vue +++ b/src/App.vue @@ -21,7 +21,7 @@ export default class extends Vue { if (mini && token) { console.log(`link from partner, token: ${token}`) AppModule.SetMini(1) - // UserModule.updatePageToken(token) + UserModule.updatePageToken(token) } } } diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts index 5760158..f9e4171 100644 --- a/src/store/modules/app.ts +++ b/src/store/modules/app.ts @@ -1,5 +1,5 @@ import { VuexModule, Module, Mutation, Action, getModule } from 'vuex-module-decorators' -import { getSidebarStatus, getSize, setSidebarStatus, setLanguage, setSize } from '@/utils/cookies' +import { getSidebarStatus, getSize, setSidebarStatus, setLanguage, setSize, setMini, getMini } from '@/utils/cookies' import { getLocale } from '@/lang' import store from '@/store' @@ -29,7 +29,7 @@ class App extends VuexModule implements IAppState { public device = DeviceType.Desktop public language = getLocale() public size = getSize() || 'medium' - public mini = 0 + public mini = getMini() ? Number(getMini()) : 0 @Mutation private TOGGLE_SIDEBAR(withoutAnimation: boolean) { @@ -69,6 +69,7 @@ class App extends VuexModule implements IAppState { @Mutation private SET_MINI(mini: number) { this.mini = mini + setMini(mini + '') } @Action @@ -99,7 +100,7 @@ class App extends VuexModule implements IAppState { @Action public SetMini(mini: number) { this.SET_MINI(mini) - this.CloseSideBar(false) + if (mini) this.CloseSideBar(false) } } diff --git a/src/utils/cookies.ts b/src/utils/cookies.ts index b27d480..b1c241b 100644 --- a/src/utils/cookies.ts +++ b/src/utils/cookies.ts @@ -13,6 +13,10 @@ const sizeKey = 'size' export const getSize = () => Cookies.get(sizeKey) export const setSize = (size: string) => Cookies.set(sizeKey, size) +const miniKey = 'mini' +export const getMini = () => Cookies.get(miniKey) +export const setMini = (mini: string) => Cookies.set(miniKey, mini) + // User const tokenKey = 'vue_typescript_admin_access_token' export const getToken = () => Cookies.get(tokenKey) diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 5dad789..16687cf 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -25,6 +25,7 @@ diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 1d83abc..b8c278f 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -95,6 +95,7 @@ import { UserModule } from '@/store/modules/user' import { isValidUsername } from '@/utils/validate' import LangSelect from '@/components/LangSelect/index.vue' import SocialSign from './components/SocialSignin.vue' +import { AppModule } from '@/store/modules/app' @Component({ name: 'Login', @@ -149,6 +150,10 @@ export default class extends Vue { } } + created() { + AppModule.SetMini(0) + } + mounted() { if (this.loginForm.username === '') { (this.$refs.username as Input).focus()