From 309b5a2eb4a99f20b2dcceca41c7ed1275bcc6ae Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期二, 22 七月 2025 17:26:08 +0800
Subject: [PATCH] '注册导航上传loading'

---
 src/views/login/index.vue |   52 +++++++++++++++++++++++++++++-----------------------
 1 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index d8954bc..6fdd381 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -30,7 +30,7 @@
 // import darkIcon from "@/assets/svg/dark.svg?component";
 import Lock from "~icons/ri/lock-fill";
 import User from "~icons/ri/user-3-fill";
-import { captcha, phoneNumberCode, exRole } from "@/api/register/index.ts";
+import { captcha, phoneNumberCode, exRole } from "@/api/register/index";
 
 defineOptions({
   name: "Login"
@@ -50,11 +50,8 @@
 // 鑾峰彇楠岃瘉鐮�
 const getCaptcha = async () => {
   // if (!state.captchaEnabled) return;
-
   state.ruleForm.code = "";
   const res = await captcha();
-  console.log(res);
-
   state.captchaImage = "data:text/html;base64," + res.result?.img;
   state.expirySeconds = res.result?.expirySeconds;
   state.ruleForm.codeId = res.result?.id;
@@ -66,9 +63,8 @@
     nickName: "",
     phone: "",
     phoneVCode: "",
-    // tenantId: props.tenantInfo.id,
     code: "",
-    codeId: 0,
+    codeId: "",
     email: "",
     exRoleCode: ""
   },
@@ -133,6 +129,7 @@
 
   // 鑾峰彇楠岃瘉鐮�
   getCaptcha();
+
   exRole().then(res => {
     state.roleList = res.result;
     const role = route.query;
@@ -141,7 +138,7 @@
     } else {
       state.nowRole = state.roleList[0];
     }
-    state.ruleForm.exRoleCode = state.nowRole?.code;
+    state.ruleForm.exRoleCode = state.nowRole.code;
   });
   // 娉ㄥ唽楠岃瘉鐮佽繃鏈熻鏃跺櫒
   // if (state.captchaEnabled) {
@@ -167,24 +164,33 @@
   if (!formEl) return;
   await formEl.validate(valid => {
     if (valid) {
+      let obj = {
+        phone: state.ruleForm.phone,
+        code: state.ruleForm.phoneVCode,
+        exRuleCode: state.ruleForm.exRoleCode
+      };
       loading.value = true;
       useUserStoreHook()
-        .loginByUsername({
-          phone: state.ruleForm.phone,
-          code: state.ruleForm.phoneVCode,
-          exRuleCode: state.ruleForm.exRoleCode
-        })
+        .loginByUsername(obj)
         .then(res => {
           if (res.code == 200) {
             // 鑾峰彇鍚庣璺敱
             return initRouter().then(() => {
-              disabled.value = true;
-              router
-                .replace("index")
-                .then(() => {
-                  message("鐧诲綍鎴愬姛", { type: "success" });
-                })
-                .finally(() => (disabled.value = false));
+              console.log(res, "=-=-=-=", res.result.exRoles[0].hasFlsh);
+              if (!res.result.exRoles[0].hasFlsh) {
+                disabled.value = true;
+                router
+                  .replace({
+                    name: "RegisterNav",
+                    query: { code: res.result.exRoles[0].code }
+                  })
+                  .then(() => {
+                    message("鐧诲綍鎴愬姛", { type: "success" });
+                  })
+                  .finally(() => (disabled.value = false));
+              } else {
+                router.replace("welcome");
+              }
             });
           } else {
             message(res?.message || "鐧诲綍澶辫触", { type: "error" });
@@ -232,16 +238,16 @@
       <img width="400px" :src="logo1" class="logo1" />
     </div>
     <!-- <img :src="bg" class="wave" /> -->
-    <div class="flex-c absolute right-5 top-3">
-      <!-- 涓婚 -->
-      <el-switch
+    <!-- <div class="flex-c absolute right-5 top-3"> -->
+    <!-- 涓婚 -->
+    <!-- <el-switch
         v-model="dataTheme"
         inline-prompt
         :active-icon="dayIcon"
         :inactive-icon="darkIcon"
         @change="dataThemeChange"
       />
-    </div>
+    </div> -->
     <div class="login-container">
       <div class="img">
         <!-- <component :is="toRaw(illustration)" /> -->

--
Gitblit v1.9.1