Skip to content

L
learn-fdc
提交 e8aa4acf authored 作者: lihuihui's avatar lihuihui
浏览文件
操作

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

上级 224620af 5dfb0dc5
隐藏空白字符变更
内嵌 并排
正在显示 包含 75 行增加 和 84 行删除
.env
浏览文件 @ e8aa4acf
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
浏览文件 @ e8aa4acf
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
浏览文件 @ e8aa4acf
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-lock.json
浏览文件 @ e8aa4acf
{
"name": "x-learn",
"name": "fd-learn",
"version": "0.0.0",
"lockfileVersion": 2,
"requires": true,
......@@ -7,13 +7,13 @@
"": {
"version": "0.0.0",
"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",
......@@ -31,8 +31,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"
}
},
......@@ -1362,11 +1362,11 @@
"integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
},
"node_modules/axios": {
"version": "0.24.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",
"integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
"version": "0.25.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
"integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
"dependencies": {
"follow-redirects": "^1.14.4"
"follow-redirects": "^1.14.7"
}
},
"node_modules/babel-code-frame": {
......@@ -3614,9 +3614,9 @@
"dev": true
},
"node_modules/follow-redirects": {
"version": "1.14.5",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz",
"integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==",
"version": "1.14.7",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
"integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==",
"funding": [
{
"type": "individual",
......@@ -4866,9 +4866,9 @@
}
},
"node_modules/nanoid": {
"version": "3.1.30",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz",
"integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==",
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz",
"integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==",
"dev": true,
"bin": {
"nanoid": "bin/nanoid.cjs"
......@@ -5240,9 +5240,9 @@
"dev": true
},
"node_modules/postcss": {
"version": "8.4.4",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.4.tgz",
"integrity": "sha512-joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q==",
"version": "8.4.5",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz",
"integrity": "sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==",
"dev": true,
"dependencies": {
"nanoid": "^3.1.30",
......@@ -5423,9 +5423,9 @@
}
},
"node_modules/query-string": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-7.0.1.tgz",
"integrity": "sha512-uIw3iRvHnk9to1blJCG3BTc+Ro56CBowJXKmNNAm3RulvPBzWLRqKSiiDk+IplJhsydwtuNMHi8UGQFcCLVfkA==",
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.0.tgz",
"integrity": "sha512-wnJ8covk+S9isYR5JIXPt93kFUmI2fQ4R/8130fuq+qwLiGVTurg7Klodgfw4NSz/oe7xnyi09y3lSrogUeM3g==",
"dependencies": {
"decode-uri-component": "^0.2.0",
"filter-obj": "^1.1.0",
......@@ -5868,9 +5868,9 @@
}
},
"node_modules/source-map-js": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz",
"integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==",
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
"dev": true,
"engines": {
"node": ">=0.10.0"
......@@ -6422,15 +6422,15 @@
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
},
"node_modules/vite": {
"version": "2.6.14",
"resolved": "https://registry.npmjs.org/vite/-/vite-2.6.14.tgz",
"integrity": "sha512-2HA9xGyi+EhY2MXo0+A2dRsqsAG3eFNEVIo12olkWhOmc8LfiM+eMdrXf+Ruje9gdXgvSqjLI9freec1RUM5EA==",
"version": "2.7.13",
"resolved": "https://registry.npmjs.org/vite/-/vite-2.7.13.tgz",
"integrity": "sha512-Mq8et7f3aK0SgSxjDNfOAimZGW9XryfHRa/uV0jseQSilg+KhYDSoNb9h1rknOy6SuMkvNDLKCYAYYUMCE+IgQ==",
"dev": true,
"dependencies": {
"esbuild": "^0.13.2",
"postcss": "^8.3.8",
"esbuild": "^0.13.12",
"postcss": "^8.4.5",
"resolve": "^1.20.0",
"rollup": "^2.57.0"
"rollup": "^2.59.0"
},
"bin": {
"vite": "bin/vite.js"
......@@ -6459,9 +6459,9 @@
}
},
"node_modules/vite-plugin-vue2": {
"version": "1.9.0",
"resolved": "https://registry.npmjs.org/vite-plugin-vue2/-/vite-plugin-vue2-1.9.0.tgz",
"integrity": "sha512-4vmcoiOmOTGjRnA0hk8tHYqk96ZxRpe4AmeCqJJ8jQuNo+SDF1zXPyhxAUIK1tuK354No77WVHHIimVvZQuvIA==",
"version": "1.9.2",
"resolved": "https://registry.npmjs.org/vite-plugin-vue2/-/vite-plugin-vue2-1.9.2.tgz",
"integrity": "sha512-y6a7tlqXe2OtwD0N7mNvlrZaQu2aeqGXzwk+MjEacUsOd70t/K1Qno1eNqH3+7evC/Klbou9VdYc/Pu0Sp7PfA==",
"dev": true,
"dependencies": {
"@babel/core": "^7.15.8",
......@@ -7860,11 +7860,11 @@
"integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
},
"axios": {
"version": "0.24.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",
"integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
"version": "0.25.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
"integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
"requires": {
"follow-redirects": "^1.14.4"
"follow-redirects": "^1.14.7"
}
},
"babel-code-frame": {
......@@ -9675,9 +9675,9 @@
"dev": true
},
"follow-redirects": {
"version": "1.14.5",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz",
"integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA=="
"version": "1.14.7",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
"integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="
},
"forever-agent": {
"version": "0.6.1",
......@@ -10642,9 +10642,9 @@
}
},
"nanoid": {
"version": "3.1.30",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz",
"integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==",
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz",
"integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==",
"dev": true
},
"natural-compare": {
......@@ -10923,9 +10923,9 @@
"dev": true
},
"postcss": {
"version": "8.4.4",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.4.tgz",
"integrity": "sha512-joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q==",
"version": "8.4.5",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz",
"integrity": "sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==",
"dev": true,
"requires": {
"nanoid": "^3.1.30",
......@@ -11063,9 +11063,9 @@
}
},
"query-string": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-7.0.1.tgz",
"integrity": "sha512-uIw3iRvHnk9to1blJCG3BTc+Ro56CBowJXKmNNAm3RulvPBzWLRqKSiiDk+IplJhsydwtuNMHi8UGQFcCLVfkA==",
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.0.tgz",
"integrity": "sha512-wnJ8covk+S9isYR5JIXPt93kFUmI2fQ4R/8130fuq+qwLiGVTurg7Klodgfw4NSz/oe7xnyi09y3lSrogUeM3g==",
"requires": {
"decode-uri-component": "^0.2.0",
"filter-obj": "^1.1.0",
......@@ -11403,9 +11403,9 @@
"devOptional": true
},
"source-map-js": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz",
"integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==",
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
"dev": true
},
"sourcemap-codec": {
......@@ -11851,22 +11851,22 @@
}
},
"vite": {
"version": "2.6.14",
"resolved": "https://registry.npmjs.org/vite/-/vite-2.6.14.tgz",
"integrity": "sha512-2HA9xGyi+EhY2MXo0+A2dRsqsAG3eFNEVIo12olkWhOmc8LfiM+eMdrXf+Ruje9gdXgvSqjLI9freec1RUM5EA==",
"version": "2.7.13",
"resolved": "https://registry.npmjs.org/vite/-/vite-2.7.13.tgz",
"integrity": "sha512-Mq8et7f3aK0SgSxjDNfOAimZGW9XryfHRa/uV0jseQSilg+KhYDSoNb9h1rknOy6SuMkvNDLKCYAYYUMCE+IgQ==",
"dev": true,
"requires": {
"esbuild": "^0.13.2",
"esbuild": "^0.13.12",
"fsevents": "~2.3.2",
"postcss": "^8.3.8",
"postcss": "^8.4.5",
"resolve": "^1.20.0",
"rollup": "^2.57.0"
"rollup": "^2.59.0"
}
},
"vite-plugin-vue2": {
"version": "1.9.0",
"resolved": "https://registry.npmjs.org/vite-plugin-vue2/-/vite-plugin-vue2-1.9.0.tgz",
"integrity": "sha512-4vmcoiOmOTGjRnA0hk8tHYqk96ZxRpe4AmeCqJJ8jQuNo+SDF1zXPyhxAUIK1tuK354No77WVHHIimVvZQuvIA==",
"version": "1.9.2",
"resolved": "https://registry.npmjs.org/vite-plugin-vue2/-/vite-plugin-vue2-1.9.2.tgz",
"integrity": "sha512-y6a7tlqXe2OtwD0N7mNvlrZaQu2aeqGXzwk+MjEacUsOd70t/K1Qno1eNqH3+7evC/Klbou9VdYc/Pu0Sp7PfA==",
"dev": true,
"requires": {
"@babel/core": "^7.15.8",
......
package.json
浏览文件 @ e8aa4acf
......@@ -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
浏览文件 @ e8aa4acf
......@@ -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
浏览文件 @ e8aa4acf
......@@ -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
浏览文件 @ e8aa4acf
......@@ -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
浏览文件 @ e8aa4acf
......@@ -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,
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论