mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-13 04:46:46 +08:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -44,7 +44,7 @@ export default defineComponent({
|
|||||||
const store = useStore();
|
const store = useStore();
|
||||||
const isLogin = ref(false);
|
const isLogin = ref(false);
|
||||||
// console.log("router", router.getRoutes(), route);
|
// console.log("router", router.getRoutes(), route);
|
||||||
console.log("版本0.9.13------------");
|
console.log("版本0.9.14------------");
|
||||||
const routes = computed(() => {
|
const routes = computed(() => {
|
||||||
return router.getRoutes().filter((e) => e.meta?.isLink);
|
return router.getRoutes().filter((e) => e.meta?.isLink);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
* @Author: lixg lixg@dongwu-inc.com
|
* @Author: lixg lixg@dongwu-inc.com
|
||||||
* @Date: 2022-11-21 14:32:52
|
* @Date: 2022-11-21 14:32:52
|
||||||
* @LastEditors: lixg lixg@dongwu-inc.com
|
* @LastEditors: lixg lixg@dongwu-inc.com
|
||||||
* @LastEditTime: 2022-12-14 09:04:31
|
* @LastEditTime: 2022-12-14 17:51:50
|
||||||
* @FilePath: /fe-manage/src/api/config.js
|
* @FilePath: /fe-manage/src/api/config.js
|
||||||
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||||
*/
|
*/
|
||||||
@@ -56,7 +56,7 @@ http.interceptors.response.use(
|
|||||||
return response;
|
return response;
|
||||||
} else {
|
} else {
|
||||||
if (code === 1000) {
|
if (code === 1000) {
|
||||||
// window.open("https://u-pre.boe.com/web/", '_self');
|
window.open("https://u-pre.boe.com/web/", '_self');
|
||||||
// window.open("http://111.231.196.214:12013/manage/login", '_self');
|
// window.open("http://111.231.196.214:12013/manage/login", '_self');
|
||||||
}
|
}
|
||||||
console.log("api %o", msg);
|
console.log("api %o", msg);
|
||||||
|
|||||||
@@ -277,6 +277,9 @@ const organizationalTree = []
|
|||||||
|
|
||||||
//嵌套页面
|
//嵌套页面
|
||||||
const iframeUrl = "https://u-pre.boe.com/pc/iframe"
|
const iframeUrl = "https://u-pre.boe.com/pc/iframe"
|
||||||
|
//学员端路由
|
||||||
|
const studentUrl = 'https://u.boe.com/pc/uc/study/courses'
|
||||||
|
|
||||||
//二维码
|
//二维码
|
||||||
const codeUrl = "https://u-pre.boe.com"
|
const codeUrl = "https://u-pre.boe.com"
|
||||||
export {
|
export {
|
||||||
@@ -292,5 +295,6 @@ export {
|
|||||||
commonData,
|
commonData,
|
||||||
organizationalTree,
|
organizationalTree,
|
||||||
iframeUrl,
|
iframeUrl,
|
||||||
|
studentUrl,
|
||||||
codeUrl,
|
codeUrl,
|
||||||
}
|
}
|
||||||
@@ -61,7 +61,7 @@
|
|||||||
import { reactive, toRefs } from "vue";
|
import { reactive, toRefs } from "vue";
|
||||||
import DownLoad from "../components/drawers/DownLoad";
|
import DownLoad from "../components/drawers/DownLoad";
|
||||||
import * as api from "../api/index1";
|
import * as api from "../api/index1";
|
||||||
|
import { studentUrl } from "../api/method";
|
||||||
export default {
|
export default {
|
||||||
name: "NavTop",
|
name: "NavTop",
|
||||||
components: {
|
components: {
|
||||||
@@ -81,7 +81,7 @@ export default {
|
|||||||
{
|
{
|
||||||
id: 2,
|
id: 2,
|
||||||
name: "学员",
|
name: "学员",
|
||||||
go: "https://u.boe.com/pc/uc/study/courses",
|
go: studentUrl,
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user