Merge branch 'newVersion' into online

src/views/App.module.less

@@ -17,7 +17,9 @@
     border-radius: 10px !important;
   }
 }
-
+:global {
+  @import url('element-plus/dist/index.css');
+}
 :root {
   --theme-color: #2dc7aa;
 }

src/views/musicLibrary/modals/searchAlbum.tsx

@@ -64,7 +64,7 @@ export default defineComponent({
       }
     }
     const getList = (val: any) => {
-      state.search = { ...val,idAndName:val.search }
+      state.search = { ...val,idAndName:val.search,subjectIds:val.subject }
       state.pageInfo.page = 1
       getAlbumList()
     }

vite.config.ts

@@ -32,6 +32,13 @@ export default defineConfig({
       resolvers: [ElementPlusResolver()]
     })
   ],
+  css: {
+    preprocessorOptions: {
+      scss: {
+        charset: false
+      }
+    }
+  },
   resolve: {
     alias: {
       '@': resolve('./src'),