Commit fc5e1811 authored by youjie's avatar youjie

no message

parent c16d7b4a
...@@ -19,11 +19,6 @@ export interface Result { ...@@ -19,11 +19,6 @@ export interface Result {
class Api { class Api {
constructor() {} constructor() {}
static Post = (cmd: string, msg: any): Promise<HttpResponse> => { static Post = (cmd: string, msg: any): Promise<HttpResponse> => {
if (useUserStore().getDenied && cmd != 'triptemplate_GetFontList') {
return new Promise((resolve, reject) => {
reject('Access Denied')
})
}
let datas: any let datas: any
let language = 'zh_CN' let language = 'zh_CN'
let currencyCode = 'CNY' let currencyCode = 'CNY'
......
...@@ -41,7 +41,6 @@ export const useUserStore = defineStore('user', { ...@@ -41,7 +41,6 @@ export const useUserStore = defineStore('user', {
state: () => ({ state: () => ({
token: '' as string, token: '' as string,
userInfo: {} as any, userInfo: {} as any,
denied: false,
memberData: {} as any, memberData: {} as any,
}), }),
getters: { getters: {
...@@ -76,7 +75,6 @@ export const useUserStore = defineStore('user', { ...@@ -76,7 +75,6 @@ export const useUserStore = defineStore('user', {
// 登录成功,保存用户信息 // 登录成功,保存用户信息
this.token = response.token || '' this.token = response.token || ''
this.userInfo = response.userInfo this.userInfo = response.userInfo
this.denied = false
return { return {
status: 'SUCCESS', status: 'SUCCESS',
verify: false, verify: false,
...@@ -111,7 +109,6 @@ export const useUserStore = defineStore('user', { ...@@ -111,7 +109,6 @@ export const useUserStore = defineStore('user', {
console.log('Google login response:', response) console.log('Google login response:', response)
this.token = response.token || '' this.token = response.token || ''
this.userInfo = response.userInfo || {} this.userInfo = response.userInfo || {}
this.denied = false
this.memberData = response.memberData this.memberData = response.memberData
return { return {
status: 'SUCCESS', status: 'SUCCESS',
...@@ -138,7 +135,6 @@ export const useUserStore = defineStore('user', { ...@@ -138,7 +135,6 @@ export const useUserStore = defineStore('user', {
console.log('Google login response:', response) console.log('Google login response:', response)
this.token = response.token || '' this.token = response.token || ''
this.userInfo = response.userInfo || {} this.userInfo = response.userInfo || {}
this.denied = false
this.memberData = response.memberData this.memberData = response.memberData
return { return {
status: 'SUCCESS', status: 'SUCCESS',
...@@ -187,23 +183,14 @@ export const useUserStore = defineStore('user', { ...@@ -187,23 +183,14 @@ export const useUserStore = defineStore('user', {
// await UserService.logoutAsync() // await UserService.logoutAsync()
this.token = '' this.token = ''
this.userInfo = null this.userInfo = null
this.denied = false
} catch (error) { } catch (error) {
console.error('Sign out error:', error) console.error('Sign out error:', error)
} finally { } finally {
// 清空用户信息 // 清空用户信息
this.token = '' this.token = ''
this.userInfo = null this.userInfo = null
this.denied = false
} }
}, },
/**
* 设置访问被拒绝状态
*/
setUserDeniedStatus(denied: boolean) {
this.denied = denied
},
/** /**
* 注册 * 注册
......
...@@ -391,15 +391,7 @@ const handleLogin = async () => { ...@@ -391,15 +391,7 @@ const handleLogin = async () => {
const init = async () => { const init = async () => {
// 如果已经登录且是正常代理商,直接跳转到仪表盘 // 如果已经登录且是正常代理商,直接跳转到仪表盘
if (userStore.getUserToken && userStore.getUser) { if (userStore.getUserToken && userStore.getUser) {
const userStatus = userStore.getUser.status router.replace('/')
const disableStatus = userStore.getUser.disableStatus
// 只有状态正常的代理商才跳转到仪表盘
// 申请中(PendingReview)和被拒绝(Rejected)状态不跳转,允许继续登录
if (userStatus !== 'PendingReview' && userStatus !== 'Rejected' && disableStatus !== 'Disable') {
// router.replace('/dashboard')
return
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment