From c5557c038cb32473fe9a5a52000cf0cb2d6afb2a Mon Sep 17 00:00:00 2001
From: lyt <1105290566@qq.com>
Date: Wed, 16 Dec 2020 18:25:59 +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=E8=B7=AF=E7=94=B1=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue-admin-wonderful-next/source.d.ts          |   4 +++
 vue-admin-wonderful-next/src/App.vue          |   2 +-
 .../src/assets/index.scss                     |  23 ------------------
 vue-admin-wonderful-next/src/main.ts          |   8 +++---
 .../src/{assets => style}/element-icons.ttf   | Bin
 .../src/{assets => style}/element-icons.woff  | Bin
 .../{assets => style}/element-variables.scss  |   0
 vue-admin-wonderful-next/src/style/index.scss |  23 ++++++++++++++++++
 .../src/{assets => style}/transition.scss     |   0
 vue-admin-wonderful-next/vite.config.ts       |  23 +++---------------
 10 files changed, 36 insertions(+), 47 deletions(-)
 create mode 100644 vue-admin-wonderful-next/source.d.ts
 delete mode 100644 vue-admin-wonderful-next/src/assets/index.scss
 rename vue-admin-wonderful-next/src/{assets => style}/element-icons.ttf (100%)
 rename vue-admin-wonderful-next/src/{assets => style}/element-icons.woff (100%)
 rename vue-admin-wonderful-next/src/{assets => style}/element-variables.scss (100%)
 create mode 100644 vue-admin-wonderful-next/src/style/index.scss
 rename vue-admin-wonderful-next/src/{assets => style}/transition.scss (100%)

diff --git a/vue-admin-wonderful-next/source.d.ts b/vue-admin-wonderful-next/source.d.ts
new file mode 100644
index 0000000..bbe11d4
--- /dev/null
+++ b/vue-admin-wonderful-next/source.d.ts
@@ -0,0 +1,4 @@
+declare const React: string;
+declare module '*.json';
+declare module '*.png';
+declare module '*.jpg';
\ No newline at end of file
diff --git a/vue-admin-wonderful-next/src/App.vue b/vue-admin-wonderful-next/src/App.vue
index b625415..733cd44 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/11.png" />
+  <img src="/@/assets/11.png" />
 </template>
 
 <script lang="ts">
diff --git a/vue-admin-wonderful-next/src/assets/index.scss b/vue-admin-wonderful-next/src/assets/index.scss
deleted file mode 100644
index 43a4809..0000000
--- a/vue-admin-wonderful-next/src/assets/index.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-@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/main.ts b/vue-admin-wonderful-next/src/main.ts
index 0f79dcd..ca57534 100644
--- a/vue-admin-wonderful-next/src/main.ts
+++ b/vue-admin-wonderful-next/src/main.ts
@@ -2,8 +2,8 @@ import { createApp } from 'vue'
 import App from './App.vue'
 
 import ElementPlus from 'element-plus';
-import '/@/assets/index.scss';
+// import 'element-plus/lib/theme-chalk/index.css';
+import '/@/style/index.scss';
+
+createApp(App).use(ElementPlus).mount('#app')
 
-const app = createApp(App)
-app.use(ElementPlus)
-app.mount('#app')
diff --git a/vue-admin-wonderful-next/src/assets/element-icons.ttf b/vue-admin-wonderful-next/src/style/element-icons.ttf
similarity index 100%
rename from vue-admin-wonderful-next/src/assets/element-icons.ttf
rename to vue-admin-wonderful-next/src/style/element-icons.ttf
diff --git a/vue-admin-wonderful-next/src/assets/element-icons.woff b/vue-admin-wonderful-next/src/style/element-icons.woff
similarity index 100%
rename from vue-admin-wonderful-next/src/assets/element-icons.woff
rename to vue-admin-wonderful-next/src/style/element-icons.woff
diff --git a/vue-admin-wonderful-next/src/assets/element-variables.scss b/vue-admin-wonderful-next/src/style/element-variables.scss
similarity index 100%
rename from vue-admin-wonderful-next/src/assets/element-variables.scss
rename to vue-admin-wonderful-next/src/style/element-variables.scss
diff --git a/vue-admin-wonderful-next/src/style/index.scss b/vue-admin-wonderful-next/src/style/index.scss
new file mode 100644
index 0000000..9a0404c
--- /dev/null
+++ b/vue-admin-wonderful-next/src/style/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/transition.scss b/vue-admin-wonderful-next/src/style/transition.scss
similarity index 100%
rename from vue-admin-wonderful-next/src/assets/transition.scss
rename to vue-admin-wonderful-next/src/style/transition.scss
diff --git a/vue-admin-wonderful-next/vite.config.ts b/vue-admin-wonderful-next/vite.config.ts
index 8dac4d5..b079902 100644
--- a/vue-admin-wonderful-next/vite.config.ts
+++ b/vue-admin-wonderful-next/vite.config.ts
@@ -1,28 +1,13 @@
 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'),
-};
+import path from 'path';
 
 const viteConfig: UserConfig = {
     port: 8080,
     hostname: 'localhost',
     open: false,
-    root,
-    alias,
-    // transforms: [
-    //     globbyTransform({
-    //       root: root,
-    //       alias: alias
-    //     })
-    //   ],
+    alias: {
+        '/@/': path.resolve(__dirname, './src')
+    },
 }
 
 export default viteConfig