From e0f732a531baa61549210e1dbb376530aef434f7 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Fri, 22 Mar 2024 20:24:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E8=AE=B0=E4=BD=8F=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E5=BA=94=E9=BB=98=E8=AE=A4=E5=8F=96=E6=B6=88=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/Login.vue | 2 +-
 src/views/login/index1.vue           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index 4665ad1..82684c7 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -26,7 +26,7 @@ const formRef = ref();
 const formRefSms = ref();
 const message = useMessage();
 const loading = ref(false);
-const autoLogin = ref(true);
+const autoLogin = ref(false);
 const LOGIN_NAME = PageEnum.BASE_LOGIN_NAME;
 const userStore = useUserStore();
 const router = useRouter();
diff --git a/src/views/login/index1.vue b/src/views/login/index1.vue
index d9d7786..96b6a97 100644
--- a/src/views/login/index1.vue
+++ b/src/views/login/index1.vue
@@ -17,7 +17,7 @@ interface FormState {
 const formRef = ref()
 const message = useMessage()
 const loading = ref(false)
-const autoLogin = ref(true)
+const autoLogin = ref(false)
 const LOGIN_NAME = PageEnum.BASE_LOGIN_NAME
 const userStore = useUserStore()
 const router = useRouter()
@@ -127,7 +127,7 @@ function handleSubmit(e) {
                 </n-button>
               </n-form-item>
               <n-form-item class="default-color">
-                <div class="w-full flex justify-between">
+                <div class="flex justify-between w-full">
                   <div class="flex-initial">
                     <n-checkbox v-model:checked="autoLogin">
                       记住账号
@@ -162,7 +162,7 @@ function handleSubmit(e) {
                 </n-button>
               </n-form-item>
               <n-form-item class="default-color">
-                <div class="w-full flex justify-between">
+                <div class="flex justify-between w-full">
                   <div class="flex-initial">
                     <n-checkbox v-model:checked="autoLogin">
                       记住账号

From 54e3296fc658af80e4288b11cf6bb10c754f5b01 Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Fri, 22 Mar 2024 20:40:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E7=99=BB=E5=BD=95=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/Login.vue | 94 +++++++++++++++++++++++-----
 1 file changed, 77 insertions(+), 17 deletions(-)

diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index 82684c7..dc77039 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, reactive, ref } from "vue";
+import { computed, onMounted, reactive, ref } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import { useMessage } from "naive-ui";
 
@@ -34,19 +34,18 @@ const route = useRoute();
 const show = ref(false);
 const flag = ref(true);
 const loginSuccess = ref(true);
-const loginRejectMessge = ref('');
-
-const formInline: FormState = reactive({
-  enterprisecode: "演示公司",
-  username: "yanshi01",
-  password: "123456",
-
-  // enterprisecode: "",
-  // username: "",
-  // password: ""
+const loginRejectMessge = ref("");
+
+let formInline: FormState = reactive({
+  // enterprisecode: "演示公司",
+  // username: "yanshi01",
+  // password: "123456",
+  enterprisecode: "",
+  username: "",
+  password: ""
 });
 
-const formSms: FormSms = reactive({
+let formSms: FormSms = reactive({
   agentcode: "",
   phone: "",
   phonecode: "",
@@ -54,7 +53,23 @@ const formSms: FormSms = reactive({
 const tab = ref(0);
 const countTime = ref("获取验证码");
 const rules = {
-  enterprisecode: [{ required: true, message: "请输入企业编码", trigger: "blur" },{
+  enterprisecode: [
+    { required: true, message: "请输入企业编码", trigger: "blur" },
+    {
+      trigger: ["blur"],
+      level: "error",
+      validator(_rule, value) {
+        if (loginSuccess.value) {
+          return true;
+        } else {
+          return new Error(loginRejectMessge.value);
+        }
+      },
+    },
+  ],
+  agentcode: [
+    { required: true, message: "请输入企业编码", trigger: "blur" },
+    {
       trigger: ["blur"],
       level: "error",
       validator(_rule, value) {
@@ -64,8 +79,8 @@ const rules = {
           return new Error(loginRejectMessge.value);
         }
       },
-    },],
-  agentcode: { required: true, message: "请输入企业编码", trigger: "blur" },
+    },
+  ],
   phone: { required: true, message: "请输入手机号", trigger: "blur" },
   phonecode: [
     { required: true, message: "请输入验证码", trigger: "blur" },
@@ -84,7 +99,20 @@ const rules = {
       },
     },
   ],
-  username: { required: true, message: "请输入用户名", trigger: "blur" },
+  username: [
+    { required: true, message: "请输入用户名", trigger: "blur" },
+    {
+      trigger: ["blur"],
+      level: "error",
+      validator(_rule, value) {
+        if (loginSuccess.value) {
+          return true;
+        } else {
+          return new Error(loginRejectMessge.value);
+        }
+      },
+    },
+  ],
   password: { required: true, message: "请输入密码", trigger: "blur" },
   captcha: { required: true, message: "请输入验证码", trigger: "blur" },
 };
@@ -107,6 +135,12 @@ function handleSubmit(e) {
         const { code, message: msg } = await userStore.login(params);
         loginRejectMessge.value = msg;
         if (code === ResultEnum.SUCCESS) {
+          // 是否保存账号
+          if (autoLogin.value) {
+            localStorage.setItem("LOGIN_FORM_PASS", JSON.stringify(formInline));
+          } else {
+            localStorage.removeItem("LOGIN_FORM_PASS");
+          }
           loginSuccess.value = true;
           await userStore.getInformation();
           message.destroyAll();
@@ -128,6 +162,25 @@ function handleSubmit(e) {
   });
 }
 
+onMounted(() => {
+  let data:any = localStorage.getItem("LOGIN_FORM_SMS");
+  if (data) {
+    data = JSON.parse(data) as any
+    formSms.agentcode = data.agentcode;
+    formSms.phone = data.phone;
+    formSms.phonecode = "";
+    autoLogin.value = true;
+  }
+  data = localStorage.getItem("LOGIN_FORM_PASS");
+  if (data) {
+    data = JSON.parse(data) as any;
+    formInline.username = data.username;
+    formInline.password = data.password;
+    formInline.enterprisecode = data.enterprisecode;
+    autoLogin.value = true;
+  }
+});
+
 function handleSmsSubmit(e) {
   e.preventDefault();
   formRefSms.value.validate(async (errors) => {
@@ -143,11 +196,17 @@ function handleSmsSubmit(e) {
           phonecode,
         });
         const { code, message: msg } = res;
+        loginRejectMessge.value = msg;
         if (code === ResultEnum.SUCCESS) {
+          // 是否保存账号
+          if (autoLogin.value) {
+            localStorage.setItem("LOGIN_FORM_SMS", JSON.stringify(formSms));
+          } else {
+            localStorage.removeItem("LOGIN_FORM_SMS");
+          }
           loginSuccess.value = true;
           // const { code, message: msg } = await userStore.login(params)
           await userStore.getInformation();
-
           message.destroyAll();
           const toPath = decodeURIComponent((route.query?.redirect || "/") as string);
           message.success("登录成功，即将进入系统");
@@ -338,6 +397,7 @@ function forget() {
             v-model:value="formSms.phone"
             class="item-input"
             placeholder="请输入手机号"
+            maxlength="11"
           >
             <template #prefix>
               <img