优化

src/store/modules/user/index.ts

@@ -2,7 +2,7 @@ import { defineStore } from 'pinia';
 import type { providerType, UserState } from './types';
 import { getUserProfile, login, logout as userLogout, register } from '@/api/user/index';
 import { clearToken, setCompanyId, setToken } from '@/utils/auth';
-import type { RegisterParams } from '@/api/user/types';
+import type { LoginResult, RegisterParams } from '@/api/user/types';
 
 const useUserStore = defineStore('user', {
   state: (): UserState => <UserState>({
@@ -14,7 +14,8 @@ const useUserStore = defineStore('user', {
     telephone: '',
     balance: 0,
     integration: 0,
-    birthday: ''
+    birthday: '',
+    companyId: ''
   }),
 
   persist: {
@@ -90,7 +91,8 @@ const useUserStore = defineStore('user', {
               const res = await login({
                 code: result.code,
                 userInfo: userInfo,
-                referrerUserId: '1731886841265598466'
+                referrerUserId: '1727303781559697409'
+                // referrerUserId: '1731886841265598466'
               });
 
               if(res.user == undefined || res.user.id === null) {
@@ -106,12 +108,16 @@ const useUserStore = defineStore('user', {
                   creatorId: res.user.creatorId,
                   gender: res.user.gender
                 };
-                await this.userRegister(registerForm);
+                const registerResult = await this.userRegister(registerForm);
+                console.log(registerResult);
+                this.setUserInfo(registerResult as LoginResult);
+                setToken(res.token);
+                setCompanyId(res.user.companyId);
+              } else {
+                this.setUserInfo(res.user);
+                setToken(res.token);
+                setCompanyId(res.user.companyId);
               }
-
-              this.setUserInfo(res.user);
-              setToken(res.token);
-              setCompanyId(res.user.companyId);
               resolve(res);
             } else {
               reject(new Error(result.errMsg));