Browse Source

修改授权登录

ZaiZai 1 year ago
parent
commit
820e85abac
3 changed files with 5 additions and 3 deletions
  1. 1 1
      public/version.json
  2. 2 1
      src/views/home/auth.vue
  3. 2 1
      src/views/user/auth.vue

+ 1 - 1
public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20240119151856"
+  "value": "20240125152607"
 }

+ 2 - 1
src/views/home/auth.vue

@@ -17,7 +17,7 @@
 import { onMounted, ref } from 'vue'
 import { useAppStore } from '~src/store'
 import { loginByToken } from '~api/user'
-import { setUserAppInfo } from '~sto/user'
+import { setUserAppInfo, setUserTenantInfo } from '~sto/user'
 import { useRoute, useRouter } from 'vue-router'
 import { getObjVal, isNullES } from 'js-fast-way'
 import svg403 from '~src/assets/view/403.svg'
@@ -50,6 +50,7 @@ onMounted(() => {
 
 //请求授权登录
 const loginByTokenApi = async (form) => {
+    await setUserTenantInfo()
     const { error, code, data } = await loginByToken(form)
     const res = getObjVal(data)
     if (!error && code === 200 && res) {

+ 2 - 1
src/views/user/auth.vue

@@ -16,7 +16,7 @@
 <script setup>
 import { onMounted, ref } from 'vue'
 import { useAppStore } from '~src/store'
-import { useAppLogin } from '~sto/user'
+import { setUserTenantInfo, useAppLogin } from '~sto/user'
 import { useRoute, useRouter } from 'vue-router'
 import { getObjValue, isNullES } from 'js-fast-way'
 import svg403 from '~src/assets/view/403.svg'
@@ -49,6 +49,7 @@ onMounted(() => {
 
 //获取用户信息
 const queryCurrentUserData = async (tenantId) => {
+    await setUserTenantInfo()
     const { error, code, data } = await userApi.queryCurrentUserData()
     if (!error && code === 200) {
         await useAppLoginApi({