Merge branch 'master' of https://gitlab.ezijing.com/webapp/fd-learn

.env

 VITE_BASE_URL=https://learn-api.ezijing.com
 VITE_LOGIN_URL=https://login.ezijing.com/auth/login/index
-VITE_X_TRAINING_URL=https://x-training.ezijing.com

.env.dev

 VITE_BASE_URL=https://learn-api.ezijing.com
-VITE_LOGIN_URL=https://login.ezijing.com/xlearn/login/index
-VITE_X_TRAINING_URL=https://x-training.ezijing.com
+VITE_LOGIN_URL=https://login.ezijing.com/auth/login/index

.env.test

 VITE_BASE_URL=https://learn-api2.ezijing.com
-VITE_LOGIN_URL=https://login2.ezijing.com/xlearn/login/index
-VITE_X_TRAINING_URL=https://x-training2.ezijing.com
+VITE_LOGIN_URL=https://login2.ezijing.com/auth/login/index

package.json

@@ -10,13 +10,13 @@
     "lint": "eslint --ext .js,.vue --ignore-path .gitignore --fix src"
   },
   "dependencies": {
-    "axios": "^0.24.0",
+    "axios": "^0.25.0",
     "blueimp-md5": "^2.19.0",
     "echarts": "^5.2.2",
     "element-ui": "^2.15.6",
     "js-base64": "^3.7.2",
     "lodash": "^4.17.21",
-    "query-string": "^7.0.1",
+    "query-string": "^7.1.0",
     "vue": "^2.6.14",
     "vue-html2pdf": "^1.8.0",
     "vue-router": "^3.5.3",
@@ -34,8 +34,8 @@
     "eslint-plugin-promise": "^5.1.1",
     "eslint-plugin-vue": "^7.20.0",
     "sass": "1.43.5",
-    "vite": "^2.6.14",
-    "vite-plugin-vue2": "^1.9.0",
+    "vite": "^2.7.13",
+    "vite-plugin-vue2": "^1.9.2",
     "vue-template-compiler": "^2.6.14"
   }
 }

src/components/layout/aside.vue

@@ -28,12 +28,7 @@
               </template>
             </el-menu-item>
           </el-submenu>
-          <el-menu-item
-            :index="item.path"
-            :key="item.title"
-            @click="handleClick(item.path, item)"
-            v-else
-          >
+          <el-menu-item :index="item.path" :key="item.title" @click="handleClick(item.path, item)" v-else>
             <i class="iconfont" :class="item.icon"></i>
             <span slot="title">{{ item.title }}</span>
           </el-menu-item>
@@ -65,6 +60,7 @@ export default {
           tag: 'menu_course',
           title: '我的课程',
           icon: 'icon-bianzu6-hong',
+          path: '/course',
           children: [{ tag: 'menu_course_learn', title: '课程学习', path: '/course/learn' }]
         },
         {
@@ -137,7 +133,7 @@ export default {
     // 退出登录
     logout() {
       this.$store.dispatch('logout').then(() => {
-        window.location.href = import.meta.env.VITE_LOGIN_URL
+        window.location.href = `${import.meta.env.VITE_LOGIN_URL}?rd=${encodeURIComponent(window.location.href)}`
       })
     },
     handleClick(path, item) {

src/components/layout/header.vue

@@ -31,7 +31,7 @@ export default {
   },
   computed: {
     user() {
-      return this.$store.state.user
+      return this.$store.state.user || {}
     },
     avatar() {
       return this.user.avatar || defaultAvatar
@@ -44,7 +44,7 @@ export default {
     // 退出登录
     logout() {
       this.$store.dispatch('logout').then(() => {
-        window.location.href = import.meta.env.VITE_LOGIN_URL
+        window.location.href = `${import.meta.env.VITE_LOGIN_URL}?rd=${encodeURIComponent(window.location.href)}`
       })
     }
   }

src/utils/axios.js

@@ -41,13 +41,11 @@ httpRequest.interceptors.response.use(
   },
   function (error) {
     if (error.response) {
-      const { status, message, code } = error.response.data
+      const { status, message } = error.response.data
       // 未登录
       if (status === 403) {
         window.location.href = `${import.meta.env.VITE_LOGIN_URL}?rd=${encodeURIComponent(window.location.href)}`
-      } else if (status === 400 && code === 401) {
-        // router.push('/role')
-      } else if (status === 402) {
+      } else if (status === 401) {
         router.push('/index')
       } else {
         Message.error(message || error.response.data)

vite.config.js

@@ -4,7 +4,7 @@ import { defineConfig } from 'vite'
 import { createVuePlugin } from 'vite-plugin-vue2'
 import eslint from '@rollup/plugin-eslint'
 export default defineConfig({
-  base: process.env.BUILD_ENV === 'prod' ? 'https://webapp-pub.ezijing.com/website/prod/x-learn/' : '/',
+  base: process.env.BUILD_ENV === 'prod' ? 'https://webapp-pub.ezijing.com/website/prod/fd-learn/' : '/',
   plugins: [eslint({ include: '**/*.+(vue|js|jsx|ts|tsx)' }), createVuePlugin()],
   server: {
     open: true,