Skip to content

L
learn-fdc
提交 31bcf603 authored 作者: haodaking's avatar haodaking
浏览文件
操作

bug fixes

上级 685cf0e8
隐藏空白字符变更
内嵌 并排
正在显示 包含 74 行增加 和 83 行删除
.env
浏览文件 @ 31bcf603
VITE_BASE_URL=https://learn-api.ezijing.com VITE_BASE_URL=https://learn-api.ezijing.com
VITE_LOGIN_URL=https://login.ezijing.com/auth/login/index VITE_LOGIN_URL=https://login.ezijing.com/auth/login/index
VITE_X_TRAINING_URL=https://x-training.ezijing.com
.env.dev
浏览文件 @ 31bcf603
VITE_BASE_URL=https://learn-api.ezijing.com VITE_BASE_URL=https://learn-api.ezijing.com
VITE_LOGIN_URL=https://login.ezijing.com/xlearn/login/index VITE_LOGIN_URL=https://login.ezijing.com/auth/login/index
VITE_X_TRAINING_URL=https://x-training.ezijing.com
.env.test
浏览文件 @ 31bcf603
VITE_BASE_URL=https://learn-api2.ezijing.com VITE_BASE_URL=https://learn-api2.ezijing.com
VITE_LOGIN_URL=https://login2.ezijing.com/xlearn/login/index VITE_LOGIN_URL=https://login2.ezijing.com/auth/login/index
VITE_X_TRAINING_URL=https://x-training2.ezijing.com
deploy.js
浏览文件 @ 31bcf603
...@@ -40,4 +40,4 @@ function generateUploadTarget(src, dist) { ...@@ -40,4 +40,4 @@ function generateUploadTarget(src, dist) {
}) })
} }
generateUploadTarget('./dist', '/website/prod/x-learn') generateUploadTarget('./dist', '/website/prod/fd-learn')
package-lock.json
浏览文件 @ 31bcf603
{ {
"name": "x-learn", "name": "fd-learn",
"version": "0.0.0", "version": "0.0.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
"": { "": {
"version": "0.0.0", "version": "0.0.0",
"dependencies": { "dependencies": {
"axios": "^0.24.0", "axios": "^0.25.0",
"blueimp-md5": "^2.19.0", "blueimp-md5": "^2.19.0",
"echarts": "^5.2.2", "echarts": "^5.2.2",
"element-ui": "^2.15.6", "element-ui": "^2.15.6",
"js-base64": "^3.7.2", "js-base64": "^3.7.2",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"query-string": "^7.0.1", "query-string": "^7.1.0",
"vue": "^2.6.14", "vue": "^2.6.14",
"vue-html2pdf": "^1.8.0", "vue-html2pdf": "^1.8.0",
"vue-router": "^3.5.3", "vue-router": "^3.5.3",
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
"eslint-plugin-promise": "^5.1.1", "eslint-plugin-promise": "^5.1.1",
"eslint-plugin-vue": "^7.20.0", "eslint-plugin-vue": "^7.20.0",
"sass": "1.43.5", "sass": "1.43.5",
"vite": "^2.6.14", "vite": "^2.7.13",
"vite-plugin-vue2": "^1.9.0", "vite-plugin-vue2": "^1.9.2",
"vue-template-compiler": "^2.6.14" "vue-template-compiler": "^2.6.14"
} }
}, },
...@@ -1362,11 +1362,11 @@ ...@@ -1362,11 +1362,11 @@
"integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
}, },
"node_modules/axios": { "node_modules/axios": {
"version": "0.24.0", "version": "0.25.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz", "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
"integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==", "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
"dependencies": { "dependencies": {
"follow-redirects": "^1.14.4" "follow-redirects": "^1.14.7"
} }
}, },
"node_modules/babel-code-frame": { "node_modules/babel-code-frame": {
...@@ -3614,9 +3614,9 @@ ...@@ -3614,9 +3614,9 @@
"dev": true "dev": true
}, },
"node_modules/follow-redirects": { "node_modules/follow-redirects": {
"version": "1.14.5", "version": "1.14.7",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
"integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==", "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==",
"funding": [ "funding": [
{ {
"type": "individual", "type": "individual",
...@@ -4866,9 +4866,9 @@ ...@@ -4866,9 +4866,9 @@
} }
}, },
"node_modules/nanoid": { "node_modules/nanoid": {
"version": "3.1.30", "version": "3.2.0",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz",
"integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==", "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==",
"dev": true, "dev": true,
"bin": { "bin": {
"nanoid": "bin/nanoid.cjs" "nanoid": "bin/nanoid.cjs"
...@@ -5240,9 +5240,9 @@ ...@@ -5240,9 +5240,9 @@
"dev": true "dev": true
}, },
"node_modules/postcss": { "node_modules/postcss": {
"version": "8.4.4", "version": "8.4.5",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.4.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz",
"integrity": "sha512-joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q==", "integrity": "sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"nanoid": "^3.1.30", "nanoid": "^3.1.30",
...@@ -5423,9 +5423,9 @@ ...@@ -5423,9 +5423,9 @@
} }
}, },
"node_modules/query-string": { "node_modules/query-string": {
"version": "7.0.1", "version": "7.1.0",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-7.0.1.tgz", "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.0.tgz",
"integrity": "sha512-uIw3iRvHnk9to1blJCG3BTc+Ro56CBowJXKmNNAm3RulvPBzWLRqKSiiDk+IplJhsydwtuNMHi8UGQFcCLVfkA==", "integrity": "sha512-wnJ8covk+S9isYR5JIXPt93kFUmI2fQ4R/8130fuq+qwLiGVTurg7Klodgfw4NSz/oe7xnyi09y3lSrogUeM3g==",
"dependencies": { "dependencies": {
"decode-uri-component": "^0.2.0", "decode-uri-component": "^0.2.0",
"filter-obj": "^1.1.0", "filter-obj": "^1.1.0",
...@@ -5868,9 +5868,9 @@ ...@@ -5868,9 +5868,9 @@
} }
}, },
"node_modules/source-map-js": { "node_modules/source-map-js": {
"version": "1.0.1", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
"integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==", "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": ">=0.10.0" "node": ">=0.10.0"
...@@ -6422,15 +6422,15 @@ ...@@ -6422,15 +6422,15 @@
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
}, },
"node_modules/vite": { "node_modules/vite": {
"version": "2.6.14", "version": "2.7.13",
"resolved": "https://registry.npmjs.org/vite/-/vite-2.6.14.tgz", "resolved": "https://registry.npmjs.org/vite/-/vite-2.7.13.tgz",
"integrity": "sha512-2HA9xGyi+EhY2MXo0+A2dRsqsAG3eFNEVIo12olkWhOmc8LfiM+eMdrXf+Ruje9gdXgvSqjLI9freec1RUM5EA==", "integrity": "sha512-Mq8et7f3aK0SgSxjDNfOAimZGW9XryfHRa/uV0jseQSilg+KhYDSoNb9h1rknOy6SuMkvNDLKCYAYYUMCE+IgQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"esbuild": "^0.13.2", "esbuild": "^0.13.12",
"postcss": "^8.3.8", "postcss": "^8.4.5",
"resolve": "^1.20.0", "resolve": "^1.20.0",
"rollup": "^2.57.0" "rollup": "^2.59.0"
}, },
"bin": { "bin": {
"vite": "bin/vite.js" "vite": "bin/vite.js"
...@@ -6459,9 +6459,9 @@ ...@@ -6459,9 +6459,9 @@
} }
}, },
"node_modules/vite-plugin-vue2": { "node_modules/vite-plugin-vue2": {
"version": "1.9.0", "version": "1.9.2",
"resolved": "https://registry.npmjs.org/vite-plugin-vue2/-/vite-plugin-vue2-1.9.0.tgz", "resolved": "https://registry.npmjs.org/vite-plugin-vue2/-/vite-plugin-vue2-1.9.2.tgz",
"integrity": "sha512-4vmcoiOmOTGjRnA0hk8tHYqk96ZxRpe4AmeCqJJ8jQuNo+SDF1zXPyhxAUIK1tuK354No77WVHHIimVvZQuvIA==", "integrity": "sha512-y6a7tlqXe2OtwD0N7mNvlrZaQu2aeqGXzwk+MjEacUsOd70t/K1Qno1eNqH3+7evC/Klbou9VdYc/Pu0Sp7PfA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@babel/core": "^7.15.8", "@babel/core": "^7.15.8",
...@@ -7860,11 +7860,11 @@ ...@@ -7860,11 +7860,11 @@
"integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
}, },
"axios": { "axios": {
"version": "0.24.0", "version": "0.25.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz", "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
"integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==", "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
"requires": { "requires": {
"follow-redirects": "^1.14.4" "follow-redirects": "^1.14.7"
} }
}, },
"babel-code-frame": { "babel-code-frame": {
...@@ -9675,9 +9675,9 @@ ...@@ -9675,9 +9675,9 @@
"dev": true "dev": true
}, },
"follow-redirects": { "follow-redirects": {
"version": "1.14.5", "version": "1.14.7",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
"integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==" "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="
}, },
"forever-agent": { "forever-agent": {
"version": "0.6.1", "version": "0.6.1",
...@@ -10642,9 +10642,9 @@ ...@@ -10642,9 +10642,9 @@
} }
}, },
"nanoid": { "nanoid": {
"version": "3.1.30", "version": "3.2.0",
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz",
"integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==", "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==",
"dev": true "dev": true
}, },
"natural-compare": { "natural-compare": {
...@@ -10923,9 +10923,9 @@ ...@@ -10923,9 +10923,9 @@
"dev": true "dev": true
}, },
"postcss": { "postcss": {
"version": "8.4.4", "version": "8.4.5",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.4.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz",
"integrity": "sha512-joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q==", "integrity": "sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==",
"dev": true, "dev": true,
"requires": { "requires": {
"nanoid": "^3.1.30", "nanoid": "^3.1.30",
...@@ -11063,9 +11063,9 @@ ...@@ -11063,9 +11063,9 @@
} }
}, },
"query-string": { "query-string": {
"version": "7.0.1", "version": "7.1.0",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-7.0.1.tgz", "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.0.tgz",
"integrity": "sha512-uIw3iRvHnk9to1blJCG3BTc+Ro56CBowJXKmNNAm3RulvPBzWLRqKSiiDk+IplJhsydwtuNMHi8UGQFcCLVfkA==", "integrity": "sha512-wnJ8covk+S9isYR5JIXPt93kFUmI2fQ4R/8130fuq+qwLiGVTurg7Klodgfw4NSz/oe7xnyi09y3lSrogUeM3g==",
"requires": { "requires": {
"decode-uri-component": "^0.2.0", "decode-uri-component": "^0.2.0",
"filter-obj": "^1.1.0", "filter-obj": "^1.1.0",
...@@ -11403,9 +11403,9 @@ ...@@ -11403,9 +11403,9 @@
"devOptional": true "devOptional": true
}, },
"source-map-js": { "source-map-js": {
"version": "1.0.1", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
"integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==", "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
"dev": true "dev": true
}, },
"sourcemap-codec": { "sourcemap-codec": {
...@@ -11851,22 +11851,22 @@ ...@@ -11851,22 +11851,22 @@
} }
}, },
"vite": { "vite": {
"version": "2.6.14", "version": "2.7.13",
"resolved": "https://registry.npmjs.org/vite/-/vite-2.6.14.tgz", "resolved": "https://registry.npmjs.org/vite/-/vite-2.7.13.tgz",
"integrity": "sha512-2HA9xGyi+EhY2MXo0+A2dRsqsAG3eFNEVIo12olkWhOmc8LfiM+eMdrXf+Ruje9gdXgvSqjLI9freec1RUM5EA==", "integrity": "sha512-Mq8et7f3aK0SgSxjDNfOAimZGW9XryfHRa/uV0jseQSilg+KhYDSoNb9h1rknOy6SuMkvNDLKCYAYYUMCE+IgQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"esbuild": "^0.13.2", "esbuild": "^0.13.12",
"fsevents": "~2.3.2", "fsevents": "~2.3.2",
"postcss": "^8.3.8", "postcss": "^8.4.5",
"resolve": "^1.20.0", "resolve": "^1.20.0",
"rollup": "^2.57.0" "rollup": "^2.59.0"
} }
}, },
"vite-plugin-vue2": { "vite-plugin-vue2": {
"version": "1.9.0", "version": "1.9.2",
"resolved": "https://registry.npmjs.org/vite-plugin-vue2/-/vite-plugin-vue2-1.9.0.tgz", "resolved": "https://registry.npmjs.org/vite-plugin-vue2/-/vite-plugin-vue2-1.9.2.tgz",
"integrity": "sha512-4vmcoiOmOTGjRnA0hk8tHYqk96ZxRpe4AmeCqJJ8jQuNo+SDF1zXPyhxAUIK1tuK354No77WVHHIimVvZQuvIA==", "integrity": "sha512-y6a7tlqXe2OtwD0N7mNvlrZaQu2aeqGXzwk+MjEacUsOd70t/K1Qno1eNqH3+7evC/Klbou9VdYc/Pu0Sp7PfA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/core": "^7.15.8", "@babel/core": "^7.15.8",
......
package.json
浏览文件 @ 31bcf603
...@@ -10,13 +10,13 @@ ...@@ -10,13 +10,13 @@
"lint": "eslint --ext .js,.vue --ignore-path .gitignore --fix src" "lint": "eslint --ext .js,.vue --ignore-path .gitignore --fix src"
}, },
"dependencies": { "dependencies": {
"axios": "^0.24.0", "axios": "^0.25.0",
"blueimp-md5": "^2.19.0", "blueimp-md5": "^2.19.0",
"echarts": "^5.2.2", "echarts": "^5.2.2",
"element-ui": "^2.15.6", "element-ui": "^2.15.6",
"js-base64": "^3.7.2", "js-base64": "^3.7.2",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"query-string": "^7.0.1", "query-string": "^7.1.0",
"vue": "^2.6.14", "vue": "^2.6.14",
"vue-html2pdf": "^1.8.0", "vue-html2pdf": "^1.8.0",
"vue-router": "^3.5.3", "vue-router": "^3.5.3",
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
"eslint-plugin-promise": "^5.1.1", "eslint-plugin-promise": "^5.1.1",
"eslint-plugin-vue": "^7.20.0", "eslint-plugin-vue": "^7.20.0",
"sass": "1.43.5", "sass": "1.43.5",
"vite": "^2.6.14", "vite": "^2.7.13",
"vite-plugin-vue2": "^1.9.0", "vite-plugin-vue2": "^1.9.2",
"vue-template-compiler": "^2.6.14" "vue-template-compiler": "^2.6.14"
} }
} }
src/components/layout/aside.vue
浏览文件 @ 31bcf603
...@@ -28,12 +28,7 @@ ...@@ -28,12 +28,7 @@
</template> </template>
</el-menu-item> </el-menu-item>
</el-submenu> </el-submenu>
<el-menu-item <el-menu-item :index="item.path" :key="item.title" @click="handleClick(item.path, item)" v-else>
:index="item.path"
:key="item.title"
@click="handleClick(item.path, item)"
v-else
>
<i class="iconfont" :class="item.icon"></i> <i class="iconfont" :class="item.icon"></i>
<span slot="title">{{ item.title }}</span> <span slot="title">{{ item.title }}</span>
</el-menu-item> </el-menu-item>
...@@ -65,6 +60,7 @@ export default { ...@@ -65,6 +60,7 @@ export default {
tag: 'menu_course', tag: 'menu_course',
title: '我的课程', title: '我的课程',
icon: 'icon-bianzu6-hong', icon: 'icon-bianzu6-hong',
path: '/course',
children: [{ tag: 'menu_course_learn', title: '课程学习', path: '/course/learn' }] children: [{ tag: 'menu_course_learn', title: '课程学习', path: '/course/learn' }]
}, },
{ {
...@@ -137,7 +133,7 @@ export default { ...@@ -137,7 +133,7 @@ export default {
// 退出登录 // 退出登录
logout() { logout() {
this.$store.dispatch('logout').then(() => { 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) { handleClick(path, item) {
......
src/components/layout/header.vue
浏览文件 @ 31bcf603
...@@ -31,7 +31,7 @@ export default { ...@@ -31,7 +31,7 @@ export default {
}, },
computed: { computed: {
user() { user() {
return this.$store.state.user return this.$store.state.user || {}
}, },
avatar() { avatar() {
return this.user.avatar || defaultAvatar return this.user.avatar || defaultAvatar
...@@ -44,7 +44,7 @@ export default { ...@@ -44,7 +44,7 @@ export default {
// 退出登录 // 退出登录
logout() { logout() {
this.$store.dispatch('logout').then(() => { 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
浏览文件 @ 31bcf603
...@@ -45,9 +45,7 @@ httpRequest.interceptors.response.use( ...@@ -45,9 +45,7 @@ httpRequest.interceptors.response.use(
// 未登录 // 未登录
if (status === 403) { if (status === 403) {
window.location.href = `${import.meta.env.VITE_LOGIN_URL}?rd=${encodeURIComponent(window.location.href)}` window.location.href = `${import.meta.env.VITE_LOGIN_URL}?rd=${encodeURIComponent(window.location.href)}`
} else if (status === 400 && code === 401) { } else if (status === 402 || status === 401 || (status === 400 && code === 401)) {
// router.push('/role')
} else if (status === 402) {
router.push('/index') router.push('/index')
} else { } else {
Message.error(message || error.response.data) Message.error(message || error.response.data)
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论