Merge branch 'master' into eta1.3

src/api/index.js

@@ -7,11 +7,11 @@ let config = {
 
 const _axios = axios.create(config);
 _axios.interceptors.request.use(
-    /* function (config) {
+    function (config) {
       
-      config.headers.Authorization=localStorage.getItem('token')||''
+      //config.headers.Authorization=localStorage.getItem('token')||''
       return config;
-    }, */
+    },
     function (error) {
       // Do something with request error
       return Promise.reject(error);

src/assets/css/style.scss

@@ -1,3 +1,7 @@
-.layout-wrap{
-    
+ul,
+li {
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
 }

src/main.js

@@ -1,10 +1,10 @@
 import { createApp } from 'vue'
-import '@/assets/css/style.scss' //公共样式
 import 'normalize.css'
 import App from './App.vue'
 import router from "./router"
 import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
+import '@/assets/css/style.scss' //公共样式
 
 const app = createApp(App)
 app.use(ElementPlus)