Merge 6ab64a99062c9c764835a897dd3515f03429585d into b004c224c25e8897573829853c11b93901e6e693

src/components/ReIcon/src/hooks.ts

@@ -1,11 +1,6 @@
 import type { iconType } from "./types";
 import { h, defineComponent, type Component } from "vue";
-import {
-  FontIcon,
-  getIconOffline,
-  IconifyIconOnline,
-  IconifyIconOffline
-} from "../index";
+import { FontIcon, IconifyIconOnline, IconifyIconOffline } from "../index";
 
 /**
  * 支持 `iconfont`、自定义 `svg` 以及 `iconify` 中所有的图标
@@ -57,7 +52,7 @@ export function useRenderIcon(icon: any, attrs?: iconType): Component {
         const IconifyIcon =
           icon && icon.includes(":") ? IconifyIconOnline : IconifyIconOffline;
         return h(IconifyIcon, {
-          icon: getIconOffline(icon),
+          icon,
           ...attrs
         });
       }

src/components/ReIcon/src/iconifyIconOffline.ts

@@ -1,4 +1,5 @@
 import { h, defineComponent } from "vue";
+import { getIconOffline } from "../index";
 import { Icon as IconifyIcon, addIcon } from "@iconify/vue/dist/offline";
 
 // Iconify Icon在Vue里本地使用（用于内网环境）
@@ -17,7 +18,7 @@ export default defineComponent({
       return h(
         IconifyIcon,
         {
-          icon: this.icon,
+          icon: getIconOffline(this.icon),
           "aria-hidden": false,
           style: attrs?.style
             ? Object.assign(attrs.style, { outline: "none" })

src/views/login/components/LoginPhone.vue

@@ -10,6 +10,7 @@ import { useVerifyCode } from "../utils/verifyCode";
 import { useUserStoreHook } from "@/store/modules/user";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 import Iphone from "~icons/ep/iphone";
+import Keyhole from "~icons/ri/shield-keyhole-line";
 
 const { t } = useI18n();
 const loading = ref(false);
@@ -64,7 +65,7 @@ function onBack() {
             v-model="ruleForm.verifyCode"
             clearable
             :placeholder="t('login.pureSmsVerifyCode')"
-            :prefix-icon="useRenderIcon('ri:shield-keyhole-line')"
+            :prefix-icon="useRenderIcon(Keyhole)"
           />
           <el-button
             :disabled="isDisabled"

src/views/login/components/LoginRegist.vue

@@ -12,6 +12,7 @@ import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 import Lock from "~icons/ri/lock-fill";
 import Iphone from "~icons/ep/iphone";
 import User from "~icons/ri/user-3-fill";
+import Keyhole from "~icons/ri/shield-keyhole-line";
 
 const { t } = useI18n();
 const checked = ref(false);
@@ -118,7 +119,7 @@ function onBack() {
             v-model="ruleForm.verifyCode"
             clearable
             :placeholder="t('login.pureSmsVerifyCode')"
-            :prefix-icon="useRenderIcon('ri:shield-keyhole-line')"
+            :prefix-icon="useRenderIcon(Keyhole)"
           />
           <el-button
             :disabled="isDisabled"

src/views/login/components/LoginUpdate.vue

@@ -11,6 +11,7 @@ import { useUserStoreHook } from "@/store/modules/user";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 import Lock from "~icons/ri/lock-fill";
 import Iphone from "~icons/ep/iphone";
+import Keyhole from "~icons/ri/shield-keyhole-line";
 
 const { t } = useI18n();
 const loading = ref(false);
@@ -88,7 +89,7 @@ function onBack() {
             v-model="ruleForm.verifyCode"
             clearable
             :placeholder="t('login.pureSmsVerifyCode')"
-            :prefix-icon="useRenderIcon('ri:shield-keyhole-line')"
+            :prefix-icon="useRenderIcon(Keyhole)"
           />
           <el-button
             :disabled="isDisabled"

src/views/login/index.vue

@@ -32,6 +32,7 @@ import Lock from "~icons/ri/lock-fill";
 import Check from "~icons/ep/check";
 import User from "~icons/ri/user-3-fill";
 import Info from "~icons/ri/information-line";
+import Keyhole from "~icons/ri/shield-keyhole-line";
 
 defineOptions({
   name: "Login"
@@ -224,7 +225,7 @@ watch(loginDay, value => {
                   v-model="ruleForm.verifyCode"
                   clearable
                   :placeholder="t('login.pureVerifyCode')"
-                  :prefix-icon="useRenderIcon('ri:shield-keyhole-line')"
+                  :prefix-icon="useRenderIcon(Keyhole)"
                 >
                   <template v-slot:append>
                     <ReImageVerify v-model:code="imgCode" />