perf: 登录逻辑调整

2025-09-11 12:04:54 +08:00
parent 44e1ea9a06
commit 7e6e086098
11 changed files with 103 additions and 104 deletions
--- a/src/views/login/components/login-form/index.vue
+++ b/src/views/login/components/login-form/index.vue
@ -108,7 +108,6 @@ import { computed, onUnmounted, reactive, ref } from 'vue';
 import { useUserStore } from '@/stores';
 import { useEnterpriseStore } from '@/stores/modules/enterprise';
 import { handleUserLogin } from '@/utils/user';
-import router from '@/router';
 import { useRoute } from 'vue-router';

 import icon1 from '@/assets/img/login/icon-close.png';
@ -265,24 +264,18 @@ const onTabChange = () => {
 const getProfileInfo = async () => {
  const { code, data } = await fetchProfileInfo();
  if (code === 200) {
-    userStore.setUserInfo(data);
-    // 已开通
-    if (userStore.isOpenEnterprise) {
-      const enterprises = data['enterprises'];
-      mobileNumber.value = data['mobile'];
-      accounts.value = enterprises;
+    const enterprises = data['enterprises'];
+    mobileNumber.value = data['mobile'];
+    accounts.value = enterprises;

-      if (enterprises.length > 0) {
-        enterpriseStore.setEnterpriseInfo(data.enterprises[0]);
-        if (enterprises.length === 1) {
-          handleUserLogin();
-        } else {
-          // 多个企业时候需要弹窗让用户选择企业
-          selectAccountModalRef.value.open();
-        }
+    if (enterprises.length > 0) {
+      enterpriseStore.setEnterpriseInfo(data.enterprises[0]);
+      if (enterprises.length === 1) {
+        handleUserLogin();
+      } else {
+        // 多个企业时候需要弹窗让用户选择企业
+        selectAccountModalRef.value.open();
      }
-    } else {
-      router.push({ name: 'Trial' });
    }
  }
 };
--- a/src/views/login/components/register-form/index.vue
+++ b/src/views/login/components/register-form/index.vue
@ -85,37 +85,30 @@
 </template>

 <script setup lang="js">
-import {
-  Checkbox,
-  Modal,
-  Button,
-  Form,
-  FormItem,
-  Input,
-  Space,
-  message,
-  Typography,
-  Card,
-  List,
-  Tabs,
-} from 'ant-design-vue';
-const { Link } = Typography;
-const { TabPane } = Tabs;
+import { Button, Checkbox, Form, FormItem, Input, message, Tabs, Typography } from 'ant-design-vue';
 import PuzzleVerification from '../PuzzleVerification.vue';
 import SelectAccountModal from '../select-account-modal/index.vue';
 import { postClearRateLimiter } from '@/api/all/common';
-import { postRegisterCaptcha,postForgetPasswordCaptcha, fetchProfileInfo, postRegister, postForgetPassword } from '@/api/all/login';
+import {
+  fetchProfileInfo,
+  postForgetPassword,
+  postForgetPasswordCaptcha,
+  postRegister,
+  postRegisterCaptcha,
+} from '@/api/all/login';
 import { joinEnterpriseByInviteCode } from '@/api/all';
-import { ref, reactive, onUnmounted, computed } from 'vue';
+import { computed, onUnmounted, ref } from 'vue';
 import { useUserStore } from '@/stores';
 import { useEnterpriseStore } from '@/stores/modules/enterprise';
-import { handleUserLogin, goUserLogin } from '@/utils/user';
-import router from '@/router';
+import { handleUserLogin } from '@/utils/user';
 import { useRoute } from 'vue-router';

 import icon1 from '@/assets/img/login/icon-close.png';
 import icon2 from '@/assets/img/login/icon-open.png';

+const { Link } = Typography;
+const { TabPane } = Tabs;
+
 const setPageType = inject('setPageType');
 const pageType = inject('pageType');

@ -173,9 +166,9 @@ const formRules = {
        // if (value.length < 6) {
        //   return Promise.reject('密码长度不能小于6位');
        // }
-				if(formData.value.confirm_password) {
-					formRef.value.validateFields('confirm_password');
-				}
+        if (formData.value.confirm_password) {
+          formRef.value.validateFields('confirm_password');
+        }
        return Promise.resolve();
      },
      trigger: ['blur'],
@ -268,7 +261,7 @@ const getCaptcha = async () => {
    const fn = isResetPassword.value ? postForgetPasswordCaptcha : postRegisterCaptcha;
    const { code, message: msg } = await fn({ mobile: formData.value.mobile });
    if (code === 200) {
-      startCountdown()
+      startCountdown();
      message.success(msg);
    }
  } catch (error) {
@ -293,26 +286,19 @@ const handleVerificationSubmit = async () => {
 const getProfileInfo = async () => {
  const { code, data } = await fetchProfileInfo();
  if (code === 200) {
-    userStore.setUserInfo(data);
+    const enterprises = data['enterprises'];
+    mobileNumber.value = data['mobile'];
+    accounts.value = enterprises;

-    // 已开通
-    if (userStore.isOpenEnterprise) {
-      const enterprises = data['enterprises'];
-      mobileNumber.value = data['mobile'];
-      accounts.value = enterprises;
-
-      if (enterprises.length > 0) {
-        enterpriseStore.setEnterpriseInfo(data.enterprises[0]);
-        if (enterprises.length === 1) {
-          setTimeout(() => {
-            handleUserLogin();
-          }, 1500);
-        } else {
-          selectAccountModalRef.value.open();
-        }
+    if (enterprises.length > 0) {
+      enterpriseStore.setEnterpriseInfo(data.enterprises[0]);
+      if (enterprises.length === 1) {
+        setTimeout(() => {
+          handleUserLogin();
+        }, 1500);
+      } else {
+        selectAccountModalRef.value.open();
      }
-    } else {
-      router.push({name: 'Trial'})
    }
  }
 };
@ -342,13 +328,14 @@ const handleSubmit = async () => {

    if (code === 200) {
      message.success(isResetPassword.value ? '重置成功' : '注册成功');
-			// 注册成功后跳转登录页
-			if(!isResetPassword.value) {
-				setTimeout(() => {
-					setPageType('loginForm');
-				}, 1500);
-				return;
-			};
+      // 注册成功后跳转登录页
+      if (!isResetPassword.value) {
+        setTimeout(() => {
+          setPageType('loginForm');
+        }, 1500);
+        return;
+      }
+      ;

      userStore.setToken(data.access_token);

@ -378,7 +365,7 @@ const startCountdown = () => {
  timer.value = setInterval(() => {
    countdown.value--;
    if (countdown.value <= 0) {
-      clearInterval(timer.value );
+      clearInterval(timer.value);
      timer.value = null;
    }
  }, 1000);
--- a/src/views/trial/index.vue
+++ b/src/views/trial/index.vue
@ -65,7 +65,7 @@
        </section>

        <!-- 建立商务联系中 -->
-        <section class="w-full" v-if="primary_enterprise?.audit_status === 1">
+        <section class="w-full" v-if="enterpriseStore.enterpriseInfo?.audit_status === 1">
          <div class="rounded-16px bg-#fff px-36px pt-80px pb-60px flex flex-col items-center">
            <img :src="icon2" width="96" height="96" class="mb-8px" />
            <p class="cts !text-18px !lh-26px mb-8px">您的试用申请已提交</p>
@ -87,7 +87,7 @@
        </section>

        <!-- 试用到期 -->
-        <section class="w-full" v-if="primary_enterprise?.subscribe_status === 4">
+        <section class="w-full" v-if="enterpriseStore.enterpriseInfo?.subscribe_status === 4">
          <div class="rounded-16px bg-#fff px-36px pt-80px pb-60px flex flex-col items-center">
            <img :src="icon1" width="96" height="96" class="mb-8px" />
            <p class="cts !text-18px !lh-26px mb-8px">试用已到期</p>
@ -121,6 +121,7 @@ import { postCreateEnterprises } from '@/api/all/login';
 import { exactFormatTime } from '@/utils/tools';
 import { handleUserHome } from '@/utils/user';
 import { useUserStore } from '@/stores';
+import { useEnterpriseStore } from '@/stores/modules/enterprise';

 import icon1 from './img/icon-info.png';
 import icon2 from './img/icon-check.png';
@ -130,6 +131,8 @@ type Status = 0 | 1 | 2 | 3 | 4;

 const router = useRouter();
 const userStore = useUserStore();
+const enterpriseStore = useEnterpriseStore();
+
 const formRef = ref();
 const submitting = ref(false);
 // const status = ref<Status>(1);
@ -178,12 +181,13 @@ const formRules = {
 };

 const primary_enterprise = computed(() => userStore.userInfo?.primary_enterprise);
-const hasOpenEnterprise = computed(() => userStore.isOpenEnterprise);
+const hasOpenEnterprise = computed(() => enterpriseStore.isOpenEnterprise);
+
 const trialingStepsItems = computed(() => {
  return [
    {
      title: '提交申请',
-      description: exactFormatTime(primary_enterprise.value?.created_at),
+      description: exactFormatTime(enterpriseStore.enterpriseInfo?.created_at),
    },
    {
      title: '人工审核',
@ -199,7 +203,7 @@ const trialEndStepsItems = computed(() => {
  return [
    {
      title: '提交申请',
-      description: exactFormatTime(primary_enterprise.value?.created_at),
+      description: exactFormatTime(enterpriseStore.enterpriseInfo?.created_at),
    },
    {
      title: '人工审核',