From f1584625b681e61224f9d13bb8ade5737a2cba75 Mon Sep 17 00:00:00 2001
From: lyt-Top <1105290566@qq.com>
Date: Wed, 16 Dec 2020 00:38:52 +0800
Subject: [PATCH] =?UTF-8?q?'admin-20.12.16:=E5=A4=84=E7=90=86=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue-admin-wonderful-next/src/App.vue          |   2 +-
 .../src/assets/{images/logo => }/11.png       | Bin
 .../src/assets/config/config-layout/index.ts  |   0
 .../src/assets/config/config-theme/index.ts   |   0
 .../{style/fonts => }/element-icons.ttf       | Bin
 .../{style/fonts => }/element-icons.woff      | Bin
 .../element => }/element-variables.scss       |   0
 .../src/assets/index.scss                     |  23 ++++++++++++++
 .../src/assets/style/base/index.scss          |  24 --------------
 .../src/assets/theme/theme-classic/index.scss |   0
 .../src/assets/theme/theme-elegant/index.scss |   0
 .../src/assets/theme/theme-fashion/index.scss |   0
 .../src/assets/theme/theme-strange/index.scss |   0
 .../transition/index.scss => transition.scss} |   0
 vue-admin-wonderful-next/src/main.ts          |   2 +-
 vue-admin-wonderful-next/vite.config.ts       |  30 ++++++++++++------
 16 files changed, 45 insertions(+), 36 deletions(-)
 rename vue-admin-wonderful-next/src/assets/{images/logo => }/11.png (100%)
 delete mode 100644 vue-admin-wonderful-next/src/assets/config/config-layout/index.ts
 delete mode 100644 vue-admin-wonderful-next/src/assets/config/config-theme/index.ts
 rename vue-admin-wonderful-next/src/assets/{style/fonts => }/element-icons.ttf (100%)
 rename vue-admin-wonderful-next/src/assets/{style/fonts => }/element-icons.woff (100%)
 rename vue-admin-wonderful-next/src/assets/{style/element => }/element-variables.scss (100%)
 create mode 100644 vue-admin-wonderful-next/src/assets/index.scss
 delete mode 100644 vue-admin-wonderful-next/src/assets/style/base/index.scss
 delete mode 100644 vue-admin-wonderful-next/src/assets/theme/theme-classic/index.scss
 delete mode 100644 vue-admin-wonderful-next/src/assets/theme/theme-elegant/index.scss
 delete mode 100644 vue-admin-wonderful-next/src/assets/theme/theme-fashion/index.scss
 delete mode 100644 vue-admin-wonderful-next/src/assets/theme/theme-strange/index.scss
 rename vue-admin-wonderful-next/src/assets/{style/transition/index.scss => transition.scss} (100%)

diff --git a/vue-admin-wonderful-next/src/App.vue b/vue-admin-wonderful-next/src/App.vue
index 00d599b..b625415 100644
--- a/vue-admin-wonderful-next/src/App.vue
+++ b/vue-admin-wonderful-next/src/App.vue
@@ -13,7 +13,7 @@
     <div class="red">44</div>
   </div>
   <el-color-picker v-model="color" @change="colorChange"></el-color-picker>
-  <img src="/src/assets/images/logo/11.png" />
+  <img src="/src/assets/11.png" />
 </template>
 
 <script lang="ts">
diff --git a/vue-admin-wonderful-next/src/assets/images/logo/11.png b/vue-admin-wonderful-next/src/assets/11.png
similarity index 100%
rename from vue-admin-wonderful-next/src/assets/images/logo/11.png
rename to vue-admin-wonderful-next/src/assets/11.png
diff --git a/vue-admin-wonderful-next/src/assets/config/config-layout/index.ts b/vue-admin-wonderful-next/src/assets/config/config-layout/index.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/vue-admin-wonderful-next/src/assets/config/config-theme/index.ts b/vue-admin-wonderful-next/src/assets/config/config-theme/index.ts
deleted file mode 100644
index e69de29..0000000
diff --git a/vue-admin-wonderful-next/src/assets/style/fonts/element-icons.ttf b/vue-admin-wonderful-next/src/assets/element-icons.ttf
similarity index 100%
rename from vue-admin-wonderful-next/src/assets/style/fonts/element-icons.ttf
rename to vue-admin-wonderful-next/src/assets/element-icons.ttf
diff --git a/vue-admin-wonderful-next/src/assets/style/fonts/element-icons.woff b/vue-admin-wonderful-next/src/assets/element-icons.woff
similarity index 100%
rename from vue-admin-wonderful-next/src/assets/style/fonts/element-icons.woff
rename to vue-admin-wonderful-next/src/assets/element-icons.woff
diff --git a/vue-admin-wonderful-next/src/assets/style/element/element-variables.scss b/vue-admin-wonderful-next/src/assets/element-variables.scss
similarity index 100%
rename from vue-admin-wonderful-next/src/assets/style/element/element-variables.scss
rename to vue-admin-wonderful-next/src/assets/element-variables.scss
diff --git a/vue-admin-wonderful-next/src/assets/index.scss b/vue-admin-wonderful-next/src/assets/index.scss
new file mode 100644
index 0000000..43a4809
--- /dev/null
+++ b/vue-admin-wonderful-next/src/assets/index.scss
@@ -0,0 +1,23 @@
+@import './element-variables.scss';
+@import './transition.scss';
+
+@font-face {
+  font-family: 'element-icons';
+  src: url('./element-icons.woff') format('woff'), /* chrome, firefox */ 
+  url('./element-icons.ttf') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
+  font-weight: normal;
+  // font-display: $--font-display;
+  font-style: normal;
+}
+
+* {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+}
+
+html,
+body {
+  width: 100%;
+  height: 100%;
+}
diff --git a/vue-admin-wonderful-next/src/assets/style/base/index.scss b/vue-admin-wonderful-next/src/assets/style/base/index.scss
deleted file mode 100644
index 8cc5699..0000000
--- a/vue-admin-wonderful-next/src/assets/style/base/index.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-@import '../element/element-variables.scss';
-@import '../transition/index.scss';
-
-@font-face {
-  font-family: 'element-icons';
-  src: url('../fonts/element-icons.woff') format('woff'),
-    /* chrome, firefox */ url('../fonts/element-icons.ttf')
-      format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
-  font-weight: normal;
-  font-display: $--font-display;
-  font-style: normal;
-}
-
-* {
-  margin: 0;
-  padding: 0;
-  box-sizing: border-box;
-}
-
-html,
-body {
-  width: 100%;
-  height: 100%;
-}
diff --git a/vue-admin-wonderful-next/src/assets/theme/theme-classic/index.scss b/vue-admin-wonderful-next/src/assets/theme/theme-classic/index.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/vue-admin-wonderful-next/src/assets/theme/theme-elegant/index.scss b/vue-admin-wonderful-next/src/assets/theme/theme-elegant/index.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/vue-admin-wonderful-next/src/assets/theme/theme-fashion/index.scss b/vue-admin-wonderful-next/src/assets/theme/theme-fashion/index.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/vue-admin-wonderful-next/src/assets/theme/theme-strange/index.scss b/vue-admin-wonderful-next/src/assets/theme/theme-strange/index.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/vue-admin-wonderful-next/src/assets/style/transition/index.scss b/vue-admin-wonderful-next/src/assets/transition.scss
similarity index 100%
rename from vue-admin-wonderful-next/src/assets/style/transition/index.scss
rename to vue-admin-wonderful-next/src/assets/transition.scss
diff --git a/vue-admin-wonderful-next/src/main.ts b/vue-admin-wonderful-next/src/main.ts
index 87cbe76..0f79dcd 100644
--- a/vue-admin-wonderful-next/src/main.ts
+++ b/vue-admin-wonderful-next/src/main.ts
@@ -2,7 +2,7 @@ import { createApp } from 'vue'
 import App from './App.vue'
 
 import ElementPlus from 'element-plus';
-import '/@assets/style/base/index.scss';
+import '/@/assets/index.scss';
 
 const app = createApp(App)
 app.use(ElementPlus)
diff --git a/vue-admin-wonderful-next/vite.config.ts b/vue-admin-wonderful-next/vite.config.ts
index 6827834..8dac4d5 100644
--- a/vue-admin-wonderful-next/vite.config.ts
+++ b/vue-admin-wonderful-next/vite.config.ts
@@ -1,18 +1,28 @@
-import type { UserConfig } from 'vite'
-const path = require('path')
+import type { UserConfig } from 'vite';
+import { resolve } from 'path';
+
+const root: string = process.cwd();
+
+function pathResolve(dir: string) {
+    return resolve(__dirname, '.', dir);
+}
+
+const alias: Record<string, string> = {
+    '/@/': pathResolve('src'),
+};
 
 const viteConfig: UserConfig = {
     port: 8080,
     hostname: 'localhost',
     open: false,
-    base: "./",
-    alias: {
-        '/@/': path.resolve(__dirname, './src'),
-        '/@assets/': path.resolve(__dirname, './src/assets'),
-        '/@views/': path.resolve(__dirname, './src/views'),
-        '/@components/': path.resolve(__dirname, './src/components'),
-        '/@utils/': path.resolve(__dirname, './src/utils')
-    }
+    root,
+    alias,
+    // transforms: [
+    //     globbyTransform({
+    //       root: root,
+    //       alias: alias
+    //     })
+    //   ],
 }
 
 export default viteConfig