From ca33912c944e89428da50f4b95c7c8c6a7500c93 Mon Sep 17 00:00:00 2001
From: xiangheng <11675084@qq.com>
Date: Fri, 25 Oct 2024 13:26:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=BC=BA=E8=A1=A5=E6=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/.vscode/settings.json                          |  1 +
 admin/src/components/flow/XForm/index.vue            |  2 +-
 admin/src/components/link/shop-pages.vue             |  3 ++-
 admin/src/components/material/file.vue               |  6 +++++-
 admin/src/components/overflow-tooltip/index.vue      |  4 ++--
 admin/src/components/verify/Verify/VerifySlide.vue   |  6 +++---
 admin/src/components/verify/utils/ase.ts             |  4 ++--
 admin/src/layout/default/components/header/index.vue | 12 ++++++++++--
 .../src/layout/default/components/setting/drawer.vue |  5 ++++-
 .../src/layout/default/components/sidebar/index.vue  |  4 ++--
 admin/src/layout/default/components/sidebar/logo.vue |  8 ++++----
 admin/src/stores/modules/app.ts                      |  1 +
 12 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/admin/.vscode/settings.json b/admin/.vscode/settings.json
index 396dcdd..3713d23 100644
--- a/admin/.vscode/settings.json
+++ b/admin/.vscode/settings.json
@@ -16,6 +16,7 @@
         "echarts",
         "execa",
         "highlightjs",
+        "iconfont",
         "logicflow",
         "nprogress",
         "pinia",
diff --git a/admin/src/components/flow/XForm/index.vue b/admin/src/components/flow/XForm/index.vue
index 6600085..3463b95 100644
--- a/admin/src/components/flow/XForm/index.vue
+++ b/admin/src/components/flow/XForm/index.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, onMounted } from 'vue'
 import 'vform3-builds/dist/designer.style.css' //引入VForm3样式
 const designerRef = ref(null)
 function setData(json) {
diff --git a/admin/src/components/link/shop-pages.vue b/admin/src/components/link/shop-pages.vue
index e5c747b..1984343 100644
--- a/admin/src/components/link/shop-pages.vue
+++ b/admin/src/components/link/shop-pages.vue
@@ -18,8 +18,9 @@
 </template>
 
 <script lang="ts" setup>
+import { ref } from 'vue'
 import type { PropType } from 'vue'
-import { LinkTypeEnum, type Link } from '.'
+import { LinkTypeEnum, type Link } from './index'
 
 defineProps({
     modelValue: {
diff --git a/admin/src/components/material/file.vue b/admin/src/components/material/file.vue
index 7efe7a7..2070559 100644
--- a/admin/src/components/material/file.vue
+++ b/admin/src/components/material/file.vue
@@ -49,7 +49,11 @@ export default defineComponent({
     position: relative;
     border-radius: 4px;
     overflow: hidden;
-    @apply bg-br-extra-light border border-br-extra-light;
+
+    background-color: var(--el-border-color-extra-light);
+    border-width: 1px;
+    border-color: var(--el-border-color-extra-light);
+
     .image,
     .video {
         display: block;
diff --git a/admin/src/components/overflow-tooltip/index.vue b/admin/src/components/overflow-tooltip/index.vue
index b04caff..1b30946 100644
--- a/admin/src/components/overflow-tooltip/index.vue
+++ b/admin/src/components/overflow-tooltip/index.vue
@@ -4,7 +4,7 @@
             <div
                 ref="textRef"
                 class="overflow-text truncate"
-                :style="{ textOverflow: overfloType }"
+                :style="{ textOverflow: overflowType }"
             >
                 {{ content }}
             </div>
@@ -28,7 +28,7 @@ const props = defineProps({
         type: String as PropType<Placement>,
         default: 'top'
     },
-    overfloType: {
+    overflowType: {
         type: String as PropType<'ellipsis' | 'unset' | 'clip'>,
         default: 'ellipsis'
     }
diff --git a/admin/src/components/verify/Verify/VerifySlide.vue b/admin/src/components/verify/Verify/VerifySlide.vue
index 587adb7..f5e3787 100644
--- a/admin/src/components/verify/Verify/VerifySlide.vue
+++ b/admin/src/components/verify/Verify/VerifySlide.vue
@@ -149,7 +149,7 @@ const secretKey = ref(''), //后端返回的ase加密秘钥
     blockBackImgBase = ref(''), //验证滑块的背景图片
     backToken = ref(''), //后端返回的唯一token值
     startMoveTime = ref(), //移动开始的时间
-    endMovetime = ref(), //移动结束的时间
+    endMoveTime = ref(), //移动结束的时间
     tipWords = ref(''),
     text = ref(''),
     finishText = ref(''),
@@ -257,7 +257,7 @@ function move(e) {
 
 //鼠标松开
 function end() {
-    endMovetime.value = +new Date()
+    endMoveTime.value = +new Date()
     //判断是否重合
     if (status.value && isEnd.value == false) {
         let moveLeftDistance = parseInt((moveBlockLeft.value || '').replace('px', ''))
@@ -284,7 +284,7 @@ function end() {
                     }, 1500)
                 }
                 passFlag.value = true
-                tipWords.value = `${((endMovetime.value - startMoveTime.value) / 1000).toFixed(
+                tipWords.value = `${((endMoveTime.value - startMoveTime.value) / 1000).toFixed(
                     2
                 )}s验证成功`
                 setTimeout(() => {
diff --git a/admin/src/components/verify/utils/ase.ts b/admin/src/components/verify/utils/ase.ts
index 764b964..778b35b 100644
--- a/admin/src/components/verify/utils/ase.ts
+++ b/admin/src/components/verify/utils/ase.ts
@@ -5,8 +5,8 @@ import CryptoJS from 'crypto-js'
  *  */
 export function aesEncrypt(word, keyWord = 'XwKsGlMcdPMEhR1B') {
     const key = CryptoJS.enc.Utf8.parse(keyWord)
-    const srcs = CryptoJS.enc.Utf8.parse(word)
-    const encrypted = CryptoJS.AES.encrypt(srcs, key, {
+    const src = CryptoJS.enc.Utf8.parse(word)
+    const encrypted = CryptoJS.AES.encrypt(src, key, {
         mode: CryptoJS.mode.ECB,
         padding: CryptoJS.pad.Pkcs7
     })
diff --git a/admin/src/layout/default/components/header/index.vue b/admin/src/layout/default/components/header/index.vue
index bb24e49..caf57c7 100644
--- a/admin/src/layout/default/components/header/index.vue
+++ b/admin/src/layout/default/components/header/index.vue
@@ -51,9 +51,17 @@ const settingStore = useSettingStore()
 <style lang="scss">
 .navbar {
     height: var(--navbar-height);
-    @apply flex px-2 bg-body;
+
+    display: flex;
+    padding-left: 8px;
+    padding-right: 8px;
+    background-color: var(--el-bg-color);
     .navbar-item {
-        @apply h-full  flex justify-center items-center  hover:bg-page;
+        height: 100%;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        background-color: var(--el-bg-color-page);
     }
 }
 </style>
diff --git a/admin/src/layout/default/components/setting/drawer.vue b/admin/src/layout/default/components/setting/drawer.vue
index 305ea18..304b26a 100644
--- a/admin/src/layout/default/components/setting/drawer.vue
+++ b/admin/src/layout/default/components/setting/drawer.vue
@@ -215,7 +215,10 @@ const resetTheme = () => {
 
 <style lang="scss" scoped>
 .icon-select {
-    @apply absolute left-1/2 top-1/2;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+
     transform: translate(-50%, -50%);
 }
 </style>
diff --git a/admin/src/layout/default/components/sidebar/index.vue b/admin/src/layout/default/components/sidebar/index.vue
index 3f844ff..390666a 100644
--- a/admin/src/layout/default/components/sidebar/index.vue
+++ b/admin/src/layout/default/components/sidebar/index.vue
@@ -3,7 +3,7 @@
         <el-drawer
             v-model="showMenuDrawer"
             direction="ltr"
-            :size="drawderSize"
+            :size="drawerSize"
             title="主题设置"
             :with-header="false"
         >
@@ -33,7 +33,7 @@ const showMenuDrawer = computed({
     }
 })
 
-const drawderSize = computed(() => {
+const drawerSize = computed(() => {
     return `${settingStore.sideWidth + 1}px`
 })
 </script>
diff --git a/admin/src/layout/default/components/sidebar/logo.vue b/admin/src/layout/default/components/sidebar/logo.vue
index 5f034f4..791fb69 100644
--- a/admin/src/layout/default/components/sidebar/logo.vue
+++ b/admin/src/layout/default/components/sidebar/logo.vue
@@ -1,18 +1,18 @@
 <template>
     <div class="logo">
-        <image-contain :width="szie" :height="szie" :src="config.webLogo" />
+        <image-contain :width="size" :height="size" :src="config.webLogo" />
         <transition name="title-width">
             <div
                 v-show="showTitle"
                 class="logo-title overflow-hidden whitespace-nowrap"
                 :class="{ 'text-white': theme == ThemeEnum.DARK }"
-                :style="{ left: `${szie + 16}px` }"
+                :style="{ left: `${size + 16}px` }"
             >
                 <overflow-tooltip
                     :content="title || config.webName"
                     :teleported="true"
                     placement="bottom"
-                    overflo-type="unset"
+                    overflow-type="unset"
                 >
                 </overflow-tooltip>
             </div>
@@ -28,7 +28,7 @@ defineOptions({
     name: 'SideLogo'
 })
 defineProps({
-    szie: { type: Number, default: 34 },
+    size: { type: Number, default: 34 },
     title: { type: String },
     theme: { type: String },
     showTitle: { type: Boolean, default: true }
diff --git a/admin/src/stores/modules/app.ts b/admin/src/stores/modules/app.ts
index 8e2229a..e52a3f5 100644
--- a/admin/src/stores/modules/app.ts
+++ b/admin/src/stores/modules/app.ts
@@ -1,5 +1,6 @@
 import { getConfig } from '@/api/app'
 import { defineStore } from 'pinia'
+import { nextTick } from 'vue'
 interface AppSate {
     config: Record<string, any>
     isMobile: boolean