From 636201df805fd0914c406a2f78383faaff85342f Mon Sep 17 00:00:00 2001
From: fwindpeak <fwindpeak@gmail.com>
Date: Sat, 28 May 2022 10:10:10 +0800
Subject: [PATCH] fix: correct typos

---
 CHANGELOG.zh_CN.md                           | 2 +-
 locales/zh-CN.yaml                           | 4 ++--
 src/layout/components/navbar.vue             | 2 +-
 src/layout/components/sidebar/horizontal.vue | 2 +-
 src/layout/components/sidebar/mixNav.vue     | 2 +-
 src/store/modules/user.ts                    | 2 +-
 src/views/login/components/phone.vue         | 6 +++---
 src/views/login/index.vue                    | 8 ++++----
 src/views/login/utils/rule.ts                | 4 ++--
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index f50e1c64a..a1c7918cf 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -21,7 +21,7 @@
 
 ### ✔️ refactor
 
-- 重构登陆页，更偏向实际业务场景
+- 重构登录页，更偏向实际业务场景
 - 使用`unocss`替换`windicss`，`unocss`开发环境下性能更好，没有内存泄露，而且`api`使用上兼容`windicss`
 
 ### 🍏 Perf
diff --git a/locales/zh-CN.yaml b/locales/zh-CN.yaml
index 82cd5fbb8..d2d23fc0f 100644
--- a/locales/zh-CN.yaml
+++ b/locales/zh-CN.yaml
@@ -3,7 +3,7 @@ buttons:
   hsfullscreen: 全屏
   hsexitfullscreen: 退出全屏
   hsrefreshRoute: 刷新路由
-  hslogin: 登陆
+  hslogin: 登录
   hsadd: 新增
   hsmark: 标记/取消
   hssave: 保存
@@ -20,7 +20,7 @@ buttons:
   hscloseAllTabs: 关闭全部标签页
 menus:
   hshome: 首页
-  hslogin: 登陆
+  hslogin: 登录
   hssysManagement: 系统管理
   hsUser: 用户管理
   hsDict: 字典管理
diff --git a/src/layout/components/navbar.vue b/src/layout/components/navbar.vue
index 510dc9a1e..1527122a8 100644
--- a/src/layout/components/navbar.vue
+++ b/src/layout/components/navbar.vue
@@ -98,7 +98,7 @@ function translationEn() {
           </el-dropdown-menu>
         </template>
       </el-dropdown>
-      <!-- 退出登陆 -->
+      <!-- 退出登录 -->
       <el-dropdown trigger="click">
         <span class="el-dropdown-link">
           <img v-if="avatars" :src="avatars" :style="avatarsStyle" />
diff --git a/src/layout/components/sidebar/horizontal.vue b/src/layout/components/sidebar/horizontal.vue
index 32fe77c3d..d2a509f12 100644
--- a/src/layout/components/sidebar/horizontal.vue
+++ b/src/layout/components/sidebar/horizontal.vue
@@ -125,7 +125,7 @@ function translationEn() {
           </el-dropdown-menu>
         </template>
       </el-dropdown>
-      <!-- 退出登陆 -->
+      <!-- 退出登录 -->
       <el-dropdown trigger="click">
         <span class="el-dropdown-link">
           <img v-if="avatars" :src="avatars" :style="avatarsStyle" />
diff --git a/src/layout/components/sidebar/mixNav.vue b/src/layout/components/sidebar/mixNav.vue
index a4bbb555c..b436c00a5 100644
--- a/src/layout/components/sidebar/mixNav.vue
+++ b/src/layout/components/sidebar/mixNav.vue
@@ -172,7 +172,7 @@ function translationEn() {
           </el-dropdown-menu>
         </template>
       </el-dropdown>
-      <!-- 退出登陆 -->
+      <!-- 退出登录 -->
       <el-dropdown trigger="click">
         <span class="el-dropdown-link">
           <img v-if="avatars" :src="avatars" :style="avatarsStyle" />
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 806818227..e20e17fdd 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -26,7 +26,7 @@ export const useUserStore = defineStore({
     name,
     // 前端生成的验证码（按实际需求替换）
     verifyCode: "",
-    // 登陆显示组件判断 0：登陆 1：手机登陆 2：二维码登陆 3：注册 4：忘记密码，默认0：登陆
+    // 登录显示组件判断 0：登录 1：手机登录 2：二维码登录 3：注册 4：忘记密码，默认0：登录
     currentPage: 0
   }),
   actions: {
diff --git a/src/views/login/components/phone.vue b/src/views/login/components/phone.vue
index 5f5b6456d..db162809b 100644
--- a/src/views/login/components/phone.vue
+++ b/src/views/login/components/phone.vue
@@ -21,9 +21,9 @@ const onLogin = async (formEl: FormInstance | undefined) => {
   if (!formEl) return;
   await formEl.validate((valid, fields) => {
     if (valid) {
-      // 模拟登陆请求，需根据实际开发进行修改
+      // 模拟登录请求，需根据实际开发进行修改
       setTimeout(() => {
-        message.success("登陆成功");
+        message.success("登录成功");
         loading.value = false;
       }, 2000);
     } else {
@@ -83,7 +83,7 @@ function onBack() {
           :loading="loading"
           @click="onLogin(ruleFormRef)"
         >
-          登陆
+          登录
         </el-button>
       </el-form-item>
     </Motion>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index a71bad6af..15cb7603a 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -49,7 +49,7 @@ const onLogin = async (formEl: FormInstance | undefined) => {
           accessToken: "eyJhbGciOiJIUzUxMiJ9.test"
         });
         initRouter("admin").then(() => {});
-        message.success("登陆成功");
+        message.success("登录成功");
         router.push("/");
       }, 2000);
     } else {
@@ -179,7 +179,7 @@ watch(imgCode, value => {
               <span
                 v-for="(item, index) in thirdParty"
                 :key="index"
-                :title="`${item.title}登陆`"
+                :title="`${item.title}登录`"
               >
                 <IconifyIconOnline
                   :icon="`ri:${item.icon}-fill`"
@@ -190,9 +190,9 @@ watch(imgCode, value => {
             </div>
           </el-form-item>
         </Motion>
-        <!-- 手机号登陆 -->
+        <!-- 手机号登录 -->
         <phone v-if="currentPage === 1" />
-        <!-- 二维码登陆 -->
+        <!-- 二维码登录 -->
         <qrCode v-if="currentPage === 2" />
         <!-- 注册 -->
         <regist v-if="currentPage === 3" />
diff --git a/src/views/login/utils/rule.ts b/src/views/login/utils/rule.ts
index fd28f6ca5..acab92ddf 100644
--- a/src/views/login/utils/rule.ts
+++ b/src/views/login/utils/rule.ts
@@ -10,7 +10,7 @@ export const REGEXP_SIX = /^\d{6}$/;
 export const REGEXP_PWD =
   /^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)]|[()])+$)(?!^.*[\u4E00-\u9FA5].*$)([^(0-9a-zA-Z)]|[()]|[a-z]|[A-Z]|[0-9]){8,18}$/;
 
-/** 登陆校验 */
+/** 登录校验 */
 const loginRules = reactive(<FormRules>{
   username: [{ required: true, message: "请输入账号", trigger: "blur" }],
   password: [
@@ -45,7 +45,7 @@ const loginRules = reactive(<FormRules>{
   ]
 });
 
-/** 手机登陆校验 */
+/** 手机登录校验 */
 const phoneRules = reactive(<FormRules>{
   phone: [
     {