From cd055313cb95050182458d9f8603a5e1eb568681 Mon Sep 17 00:00:00 2001
From: "KuroSago@outlook.com" <KuroSago@outlook.com>
Date: Thu, 19 Sep 2024 20:30:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/vitePlugins.ts             |  1 -
 package.json                     |  1 +
 src/pages/colorCard/index.vue    |  6 +++---
 src/pages/demo/index.vue         | 12 ++++++------
 src/pages/login/index.vue        | 11 +++++++++++
 src/types/import-components.d.ts |  1 -
 6 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/build/vitePlugins.ts b/build/vitePlugins.ts
index 4d6748d..a515e17 100644
--- a/build/vitePlugins.ts
+++ b/build/vitePlugins.ts
@@ -19,7 +19,6 @@ export function createVitePlugins({ isProd }: VitePluginConfig): PluginOption[]
     appProvider(),
     buildThemeConfig(),
     createComponents(),
-
     Unocss(),
     autoImport({
       include: [
diff --git a/package.json b/package.json
index 6bc8c16..1101bdd 100644
--- a/package.json
+++ b/package.json
@@ -77,6 +77,7 @@
     "@dcloudio/uni-cli-shared": "3.0.0-alpha-4020620240822002",
     "@dcloudio/uni-stacktracey": "3.0.0-alpha-4020620240822002",
     "@dcloudio/vite-plugin-uni": "3.0.0-alpha-4020620240822002",
+    "@iconify/json": "^2.2.245",
     "@types/crypto-js": "^4.2.2",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^20.16.1",
diff --git a/src/pages/colorCard/index.vue b/src/pages/colorCard/index.vue
index a87f703..22776a2 100644
--- a/src/pages/colorCard/index.vue
+++ b/src/pages/colorCard/index.vue
@@ -16,16 +16,16 @@ const themeColor = computed(() => {
 <template>
   <view class="bg-primary flex-1">
     <div class="py-[32rpx] b flex flex-col b-[#123]">
-      <span>click it to change theme</span>
+      <h2>click it to change theme</h2>
 
       <div class="grid grid-cols-4 gap-4">
         <div v-for="(v, k) in ThemeAssemble" :key="k" class="flex flex-col justify-center items-center" @click="theme = k">
           <div class="w-[100rpx] h-[100rpx] bg-[#123] rounded-[8rpx]" :style="{ backgroundColor: v.primary }" />
-          <span>{{ k }}</span>
+          <h4>{{ k }}</h4>
         </div>
       </div>
 
-      <span>now : {{ theme }}</span>
+      <h4>now : {{ theme }}</h4>
     </div>
 
     <!-- 递归渲染色卡 -->
diff --git a/src/pages/demo/index.vue b/src/pages/demo/index.vue
index 611dcf0..300e6ee 100644
--- a/src/pages/demo/index.vue
+++ b/src/pages/demo/index.vue
@@ -1,17 +1,17 @@
 <script lang="ts" setup>
+import SvgIcon from '@/components/SvgIcon/index.vue';
 </script>
 
 <template>
-  <view class="flex flex-col items-center justify-center pt-36 text-lg font-medium">
+  <view class="flex flex-col items-center justify-center pt-36rpx text-lg font-medium">
     <view class="mt-30px">
       SvgIcon 组件
     </view>
     <view class="mt-30rpx center flex flex-row gap-10px">
-      <svg-icon local-icon="activity" class="text-amber text-30 w-30 h-30" />
-      <svg-icon icon="i-mdi-account-box" size="48" class="text-blue" />
-      <svg-icon icon="i-mdi-account-box" size="32" class="text-green-400" />
-      <svg-icon icon="i-mdi-account-box" class="text-red-400" />
-      <svg-icon icon="i-svg-spinners-12-dots-scale-rotate" />
+      <SvgIcon icon="i-mdi-account-box" size="48" class="text-blue" />
+      <SvgIcon icon="i-mdi-account-box" size="32" class="text-green-400" />
+      <SvgIcon icon="i-mdi-account-box" class="text-red-400" />
+      <SvgIcon icon="i-svg-spinners-12-dots-scale-rotate" />
     </view>
   </view>
 </template>
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 19ec109..45f509b 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -39,6 +39,13 @@ async function submit(e: any) {
     }
   }, 1500);
 }
+
+// fnc : 跳转到色卡页面
+function toColorCard() {
+  router.push({
+    name: 'ColorCard',
+  });
+}
 </script>
 
 <template>
@@ -61,6 +68,10 @@ async function submit(e: any) {
         </button>
       </form>
     </view>
+
+    <button @click="toColorCard">
+      色卡
+    </button>
   </view>
 </template>
 
diff --git a/src/types/import-components.d.ts b/src/types/import-components.d.ts
index 0022afb..7b52828 100644
--- a/src/types/import-components.d.ts
+++ b/src/types/import-components.d.ts
@@ -9,7 +9,6 @@ declare module 'vue' {
   export interface GlobalComponents {
     AppProvider: typeof import('./../components/AppProvider/index.vue')['default']
     BasicButton: typeof import('./../components/BasicButton/index.vue')['default']
-    'svg-icon': typeof import('./../components/SvgIcon/index.vue')['default']
     SvgIcon: typeof import('./../components/SvgIcon/index.vue')['default']
   }
 }