From 7a5f4725d9da9bd076ff08b758392e01aaa68de4 Mon Sep 17 00:00:00 2001
From: KuroSago <kurosago@outlook.com>
Date: Thu, 19 Sep 2024 15:03:10 +0800
Subject: [PATCH] xx

---
 src/pages/colorCard/ColorPalette.vue |  22 ++--
 src/pages/login/index.vue            |  11 ++
 src/types/import-components.d.ts     |   1 -
 unocss.config.ts                     | 151 ++++++++++++++-------------
 4 files changed, 100 insertions(+), 85 deletions(-)

diff --git a/src/pages/colorCard/ColorPalette.vue b/src/pages/colorCard/ColorPalette.vue
index 1b28b91..62a9b39 100644
--- a/src/pages/colorCard/ColorPalette.vue
+++ b/src/pages/colorCard/ColorPalette.vue
@@ -1,27 +1,29 @@
-<script lang="ts">
+<script lang="ts" setup>
 import type { PropType } from 'vue';
 import { defineComponent } from 'vue';
+import ColorPaletteComponent from './ColorPalette.vue';
 
-export default defineComponent({
-  name: 'ColorPalette',
-  props: {
-    palette: {
-      type: Object as PropType<Record<string, any>>,
-      required: true,
-    },
+const props = defineProps({
+  palette: {
+    type: Object as PropType<Record<string, any>>,
+    required: true,
   },
 });
+
+defineComponent({
+  name: 'ColorPalette',
+});
 </script>
 
 <template>
   <div
-    v-for="(value, keyName) in palette" :key="keyName" class="flex flex-col"
+    v-for="(value, keyName) in props.palette" :key="keyName" class="flex flex-col"
   >
     <h2 v-if="typeof value === 'object'">
       {{ keyName }}
     </h2>
     <div v-if="typeof value === 'object'" class="flex haha flex-1">
-      <ColorPalette :palette="value" />
+      <ColorPaletteComponent :palette="value" />
     </div>
     <div
       v-else
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 19ec109..2610453 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>
@@ -59,6 +66,10 @@ async function submit(e: any) {
         <button form-type="submit" class="submit-btn" hover-class="none">
           登录
         </button>
+
+        <button @click="toColorCard">
+          色卡
+        </button>
       </form>
     </view>
   </view>
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']
   }
 }
diff --git a/unocss.config.ts b/unocss.config.ts
index 5f7c19d..2d901b4 100644
--- a/unocss.config.ts
+++ b/unocss.config.ts
@@ -1,75 +1,78 @@
-/**
- * unocss defineConfig
- * @link unocss: https://github.com/unocss/unocss
- * @link unocss-preset-weapp: https://github.com/MellowCo/unocss-preset-weapp
- */
 
-import { defineConfig, presetIcons } from 'unocss';
-import presetWeapp from 'unocss-preset-weapp';
-import { transformerAttributify, transformerClass } from 'unocss-preset-weapp/transformer';
-import transformerDirectives from '@unocss/transformer-directives';
-
-const transformRules = {
-  '.': '-d111-',
-  '/': '-s111-',
-  ':': '-c111-',
-  '%': '-p111-',
-  '!': '-e111-',
-  '#': '-w111-',
-  '(': '-b111l-',
-  ')': '-b111r-',
-  '[': '-f111l-',
-  ']': '-f111r-',
-  '$': '-r111-',
-  ',': '-r222-',
-};
-
-const prefix = '';
-
-export default defineConfig({
-  presets: [
-    // https://github.com/MellowCo/unocss-preset-weapp
-    presetWeapp({
-      nonValuedAttribute: true,
-      prefix,
-      whRpx: true,
-      transform: true,
-      platform: 'uniapp',
-      transformRules,
-    }),
-    // 由 Iconify 提供支持的纯 CSS 图标解决方案
-    presetIcons({
-      scale: 1,
-      warn: true,
-      extraProperties: {
-        'display': 'inline-block',
-        'vertical-align': 'middle',
-      },
-    }),
-  ],
-  // transformers: [transformerDirectives()],
-  // attributify: false,
-  shortcuts: [
-    {
-      'border-base': 'border border-gray-500_10',
-      'z-tar-both': 'z-988',
-      'head-fixed': 'fixed top-0 left-0 w-full z-tar-both',
-      'center': 'flex justify-center items-center',
-    },
-  ],
-  theme: { extend: { opacity: { disabled: 'var(--opacity-disabled)' } }, colors: { primary: 'var(--colors-primary)', secondary: 'var(--colors-secondary)', accent: 'var(--colors-accent)', success: 'var(--colors-success)', warning: 'var(--colors-warning)', error: 'var(--colors-error)', disable: 'var(--colors-disable)', danger: 'var(--colors-danger)', mark: 'var(--colors-mark)', title: 'var(--colors-title)', subtitle: 'var(--colors-subtitle)', paragraph: 'var(--colors-paragraph)', fontColorblack: 'var(--colors-fontColorblack)', fontColorPrimary: 'var(--colors-fontColorPrimary)', fontColorInverse: 'var(--colors-fontColorInverse)', fontColorGrey: 'var(--colors-fontColorGrey)', fontColorPlaceholder: 'var(--colors-fontColorPlaceholder)', fontColorDisable: 'var(--colors-fontColorDisable)', fontColorBottomText: 'var(--colors-fontColorBottomText)', container: 'var(--colors-container)', page: 'var(--colors-page)', containerInverse: 'var(--colors-containerInverse)', containerHover: 'var(--colors-containerHover)', secondaryHover: 'var(--colors-secondaryHover)', containerMask: 'var(--colors-containerMask)', iconButton: 'var(--colors-iconButton)', borderColor: 'var(--colors-borderColor)' }, fontSize: { sm: 'var(--fontSize-sm)', base: 'var(--fontSize-base)', lg: 'var(--fontSize-lg)', title: 'var(--fontSize-title)', subtitle: 'var(--fontSize-subtitle)', paragraph: 'var(--fontSize-paragraph)' }, borderRadius: { sm: 'var(--borderRadius-sm)', base: 'var(--borderRadius-base)', lg: 'var(--borderRadius-lg)', circle: 'var(--borderRadius-circle)' }, spacing: { rowSm: 'var(--spacing-rowSm)', rowBase: 'var(--spacing-rowBase)', rowLg: 'var(--spacing-rowLg)', colSm: 'var(--spacing-colSm)', colBase: 'var(--spacing-colBase)', colLg: 'var(--spacing-colLg)' } },
-  transformers: [
-    transformerDirectives({
-      applyVariable: ['--at-apply', '--uno-apply', '--uno'],
-      enforce: 'pre',
-    }),
-    transformerAttributify({
-      classPrefix: prefix,
-      transformRules,
-      nonValuedAttribute: true,
-    }),
-    transformerClass({
-      transformRules,
-    }),
-  ],
-});
+  
+  /**
+   * unocss defineConfig
+   * @link unocss: https://github.com/unocss/unocss
+   * @link unocss-preset-weapp: https://github.com/MellowCo/unocss-preset-weapp
+   * */
+  
+  import { defineConfig, presetIcons } from 'unocss';
+  import presetWeapp from 'unocss-preset-weapp';
+  import { transformerAttributify, transformerClass } from 'unocss-preset-weapp/transformer';
+  import transformerDirectives from '@unocss/transformer-directives';
+  
+    const transformRules = {
+        '.': '-d111-',
+        '/': '-s111-',
+        ':': '-c111-',
+        '%': '-p111-',
+        '!': '-e111-',
+        '#': '-w111-',
+        '(': '-b111l-',
+        ')': '-b111r-',
+        '[': '-f111l-',
+        ']': '-f111r-',
+        $: '-r111-',
+        ',': '-r222-',
+    };
+    
+    const prefix = '';
+    
+    export default defineConfig({
+        presets: [
+            // https://github.com/MellowCo/unocss-preset-weapp
+            presetWeapp({
+                nonValuedAttribute: true,
+                prefix: prefix,
+                whRpx: true,
+                transform: true,
+                platform: 'uniapp',
+                transformRules,
+            }),
+            // 由 Iconify 提供支持的纯 CSS 图标解决方案
+            presetIcons({
+                scale: 1,
+                warn: true,
+                extraProperties: {
+                    'display': 'inline-block',
+                    'vertical-align': 'middle',
+                },
+            }),
+        ],
+        // transformers: [transformerDirectives()],
+        // attributify: false,
+        shortcuts: [
+            {
+                'border-base': 'border border-gray-500_10',
+                'z-tar-both': 'z-988',
+                'head-fixed': 'fixed top-0 left-0 w-full z-tar-both',
+                center: 'flex justify-center items-center',
+            },
+        ],
+        theme: {"extend":{"opacity":{"disabled":"var(--opacity-disabled)"}},"colors":{"primary":"var(--colors-primary)","secondary":"var(--colors-secondary)","accent":"var(--colors-accent)","success":"var(--colors-success)","warning":"var(--colors-warning)","error":"var(--colors-error)","disable":"var(--colors-disable)","danger":"var(--colors-danger)","mark":"var(--colors-mark)","title":"var(--colors-title)","subtitle":"var(--colors-subtitle)","paragraph":"var(--colors-paragraph)","fontColorblack":"var(--colors-fontColorblack)","fontColorPrimary":"var(--colors-fontColorPrimary)","fontColorInverse":"var(--colors-fontColorInverse)","fontColorGrey":"var(--colors-fontColorGrey)","fontColorPlaceholder":"var(--colors-fontColorPlaceholder)","fontColorDisable":"var(--colors-fontColorDisable)","fontColorBottomText":"var(--colors-fontColorBottomText)","container":"var(--colors-container)","page":"var(--colors-page)","containerInverse":"var(--colors-containerInverse)","containerHover":"var(--colors-containerHover)","secondaryHover":"var(--colors-secondaryHover)","containerMask":"var(--colors-containerMask)","iconButton":"var(--colors-iconButton)","borderColor":"var(--colors-borderColor)"},"fontSize":{"sm":"var(--fontSize-sm)","base":"var(--fontSize-base)","lg":"var(--fontSize-lg)","title":"var(--fontSize-title)","subtitle":"var(--fontSize-subtitle)","paragraph":"var(--fontSize-paragraph)"},"borderRadius":{"sm":"var(--borderRadius-sm)","base":"var(--borderRadius-base)","lg":"var(--borderRadius-lg)","circle":"var(--borderRadius-circle)"},"spacing":{"rowSm":"var(--spacing-rowSm)","rowBase":"var(--spacing-rowBase)","rowLg":"var(--spacing-rowLg)","colSm":"var(--spacing-colSm)","colBase":"var(--spacing-colBase)","colLg":"var(--spacing-colLg)"}},
+        transformers: [
+            transformerDirectives({
+                applyVariable: ['--at-apply', '--uno-apply', '--uno'],
+                enforce: 'pre'
+            }),
+            transformerAttributify({
+                classPrefix: prefix,
+                transformRules,
+                nonValuedAttribute: true,
+            }),
+            transformerClass({
+                transformRules,
+            }),
+        ],
+    });
+  
\ No newline at end of file