V2.0.0

mutolee · mutolee · commit 37ee87c34208 · 2022-07-09T22:40:12.000+08:00
diff --git a/docs/assets/index.227dd38f.js b/docs/assets/index.227dd38f.js
diff --git a/docs/assets/index.78bc41ed.css b/docs/assets/index.78bc41ed.css
diff --git a/docs/index.html b/docs/index.html
@@ -6,8 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <title>Vue + ElementPlus 搭建的一个后台管理页面骨架</title>
     
-  <script type="module" crossorigin src="assets/index.227dd38f.js"></script>
-  <link rel="stylesheet" href="assets/index.78bc41ed.css">
+  <script type="module" crossorigin src="assets/index.1fccf380.js"></script>
+  <link rel="stylesheet" href="assets/index.d784a310.css">
 </head>
 <body>
 <div id="app"></div>
diff --git a/src/components/aframe/vel-frame-welcome.vue b/src/components/aframe/vel-frame-welcome.vue
@@ -4,7 +4,7 @@
       <el-col :span="24">
         <el-card shadow="never" class="vel_el_card_override vel_el_card_introduce">
           <div class="introduce_avatar">
-            <el-avatar :size="60" :src="'/static/imgs/jimeng.webp'"/>
+            <el-avatar :size="60" :src="avatarUrl"/>
           </div>
           <div class="introduce_desc">
             <p class="tit">你好呀，{{ userNick }}，又是元气满满的一天！</p>
@@ -182,18 +182,20 @@
 </template>
 
 <script setup>
-import {ref, computed, getCurrentInstance} from "vue";
+import {computed, getCurrentInstance} from "vue";
 import EchartsDemo1 from "../commons/welcome/echarts-demo-1.vue";
 import EchartsDemo2 from "../commons/welcome/echarts-demo-2.vue";
 import EchartsDemo3 from "../commons/welcome/echarts-demo-3.vue";
 import TableDemo1 from "../commons/welcome/table-demo-1.vue";
 import ProgressDemo1 from "../commons/welcome/progress-demo-1.vue";
 import * as Constant from "../../config/constant";
+import envConfig from "../../config/envConfig";
 
 const globalCfg = getCurrentInstance().appContext.config.globalProperties
 
 const name = 'vel-frame-welcome'
-const githubUrl = ref('https://github.com/mutolee/vel-admin-web')
+const githubUrl = 'https://github.com/mutolee/vel-admin-web'
+const avatarUrl = envConfig.baseUrl() + '/static/imgs/jimeng.webp'
 
 // 用户名称
 const userNick = computed(() => globalCfg.$store.getters[Constant.USERINFO_USER_NICK_GET_KEY])
diff --git a/src/config/envConfig.js b/src/config/envConfig.js
@@ -0,0 +1,13 @@
+import {BASE_URL, BASE_URL_DEV} from "./constant";
+
+/**
+ * 根据环境获取Http请求所需要的baseUrl
+ * @returns {string}
+ */
+const baseUrl = ()=>{
+    return process.env.NODE_ENV === 'production' ? BASE_URL : BASE_URL_DEV
+}
+
+export default {
+    baseUrl
+}
diff --git a/src/config/httpConfig.js b/src/config/httpConfig.js
@@ -1,17 +1,16 @@
 import axios from 'axios'
 import {isAuthenticated, logout} from "../router/modules/auth";
-import {BASE_URL, BASE_URL_DEV, STATUS_CODE} from "./constant";
+import envConfig from "./envConfig";
 import {ElMessage} from "element-plus";
 
-
 /**
  * 创建一个Axios实例，应用中的请求基于该实例配置
  * <br/>
  * 文档地址：https://axios-http.com/zh/docs/intro
  */
 const service = axios.create({
     // 配置当前实例的BaseURL
-    baseURL: process.env.NODE_ENV === 'production' ? BASE_URL : BASE_URL_DEV, // 配置当前实例的超时时间
+    baseURL: envConfig.baseUrl(), // 配置当前实例的超时时间
     timeout: 10 * 1000
 })
 
diff --git a/src/router/modules/routes.js b/src/router/modules/routes.js
@@ -127,7 +127,8 @@ let loopRoutes = (routesArr, routes, breadcrumb) => {
 // router.addRoute() 挂载到路由系统中
 // 关于路由懒加载，文档地址：https://router.vuejs.org/zh/guide/advanced/lazy-loading.html
 let addRoute = (routesArr) => {
-
+    // 导入所有vue视图模块
+    const modules = import.meta.globEager("../../components/views/**/*.vue")
     for (let i = 0; i < routesArr.length; i++) {
         let route = routesArr[i]
         // 过滤掉内置的静态路由
@@ -137,7 +138,7 @@ let addRoute = (routesArr) => {
         // 添加子路由，子路由挂载在`gen`路由下
         router.addRoute('gen', {
             path: route.path, // 路由懒加载
-            component: () => import(`../../components/views${route.component}.vue`)
+            component: modules[`../../components/views${route.component}.vue`].default
         });
     }
 
diff --git a/src/vuex/index.js b/src/vuex/index.js
@@ -1,4 +1,4 @@
-import { createStore } from 'vuex'
+import {createStore} from 'vuex'
 
 // 模块化管理Vue中的状态
 let modules = {}
@@ -11,6 +11,7 @@ let modulesFiles = import.meta.globEager('./modules/*.js')
 
 // 遍历所有模块进行装配
 for (let path in modulesFiles) {
+    console.log(path)
     let module = modulesFiles[path].default
     modules[module.name] = module
 }
