Merge pull request #23 from hujinbin/main

fix: 去除启动的报错日志
LOG1997 · Nov 26, 2024 · 0bd0a21 · 0bd0a21
2 parents 79ddd46 + d7b0fad
commit 0bd0a21
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -76,4 +76,4 @@
         "vitest": "^1.6.0",
         "vue-tsc": "^2.0.24"
     }
-}
+}
diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue
@@ -43,7 +43,6 @@ const addCount = () => {
 </template>
 
 <style scoped lang="scss">
-// @import "@/style/global.scss";
 .read-the-docs {
   color: #888;
 }

diff --git a/src/views/Config/Prize/PrizeConfig.vue b/src/views/Config/Prize/PrizeConfig.vue
@@ -217,7 +217,7 @@ watch(() => prizeList.value, (val: IPrizeConfig[]) => {
                         <span class="label-text">图片</span>
                     </div>
                     <select class="w-full max-w-xs select select-warning select-sm" v-model="item.picture">
-                        <option v-if="item.picture.id" :value="{ id: '', name: '', url: '' }"><span>❌</span></option>
+                        <option v-if="item.picture.id" :value="{ id: '', name: '', url: '' }">❌</option>
                         <option disabled selected>选择一张图片</option>
                         <option v-for="picItem in localImageList" :key="picItem.id" :value="picItem">{{ picItem.name }}
                         </option>

diff --git a/src/views/Home/PrizeList.vue b/src/views/Home/PrizeList.vue
@@ -150,7 +150,7 @@ onMounted(() => {
                             <span class="label-text">图片</span>
                         </div>
                         <select class="flex-1 w-12 select select-warning select-sm" v-model="temporaryPrize.picture">
-                            <option v-if="temporaryPrize.picture.id" :value="{ id: '', name: '', url: '' }"><span>❌</span>
+                            <option v-if="temporaryPrize.picture.id" :value="{ id: '', name: '', url: '' }">❌
                             </option>
                             <option disabled selected>选择一张图片</option>
                             <option class="w-auto" v-for="picItem in localImageList" :key="picItem.id" :value="picItem">{{

diff --git a/vite.config.ts b/vite.config.ts
@@ -67,7 +67,7 @@ export default defineConfig(({ mode }) => {
         css: {
             preprocessorOptions: {
                 scss: {
-                    additionalData: '@import "@/style/global.scss";',
+                    additionalData: '@use "@/style/global.scss" as *;',
                 },
             },
             // postcss: {
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,4 +76,4 @@ @@
             "vitest": "^1.6.0",
             "vue-tsc": "^2.0.24"
         }
-    }
+    }