From 5d17c8acc2a89aadd821d7ce234031142504be67 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 13 Dec 2022 19:22:35 +0800 Subject: [PATCH] init --- src/api/api.js | 3 ++- src/api/request.js | 4 ++-- src/views/roadmap/LearnPath.vue | 4 ++-- src/views/roadmap/PathDetails.vue | 5 +++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/api/api.js b/src/api/api.js index 9c5c4a1..3210c64 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -6,7 +6,8 @@ * @FilePath: /fe-stu/src/api/api.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ -export const BASE = '/manageApi' +export const BASE = import.meta.env.DEV ? '' : '/manageApi' +export const BASE_URL = import.meta.env.DEV ? '' : 'https://u-pre.boe.com/fe-student' export const LOGIN = '/admin/CheckUser/userLogin post' // export const FILE_UPLOAD = 'http://111.231.196.214:30001/file/upload' export const FILE_UPLOAD = '/file/upload' diff --git a/src/api/request.js b/src/api/request.js index 20c86ba..f6ab42e 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -83,13 +83,13 @@ export async function request(_url, params) { } const body = method !== 'get' ? params || {} : {} return axios({ - url: BASE + url, + url, method, headers: { 'X-Token': localStorage.getItem('token'), ...method !== 'get' ? {'Content-Type': 'application/json'} : {} }, - baseURL: '', + baseURL: BASE, ...method !== 'get' ? {data: JSON.stringify(body)} : {} }).then(resp => resp.data).then(response => { if (response.code !== 200 && response.code !== 0) { diff --git a/src/views/roadmap/LearnPath.vue b/src/views/roadmap/LearnPath.vue index ea5c8dd..446a5f9 100644 --- a/src/views/roadmap/LearnPath.vue +++ b/src/views/roadmap/LearnPath.vue @@ -189,8 +189,8 @@ function toUnTask() {} .learnpath { width: 100%; - min-height: 734px; - border-radius: 8px; + min-height: 800px; + //border-radius: 8px; background-color: rgba(255, 255, 255, 1); display: flex; diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index d066503..5dcfd2f 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -317,7 +317,7 @@ import medal2 from '@/assets/image/medal/medal2.png' import medal3 from '@/assets/image/medal/medal3.png' import img from '@/assets/image/uploadimg.png' import {boeRequest, useRequest} from "@/api/request"; -import {ROUTER_PROCESS} from "@/api/api"; +import {BASE_URL, ROUTER_PROCESS} from "@/api/api"; import {useRoute, useRouter} from "vue-router"; import {ElMessage} from 'element-plus' import {useUserInfo} from "@/api/utils"; @@ -572,7 +572,8 @@ function toFinish(d) { ElMessage.error('暂时未开放') return } - router.push({path: types.value.path[d.type], query: {id: d.routerTaskId, type: 1, courseId: d.courseId}}) + window.parent.location.href = `${BASE_URL + types.value.path[d.type]}?id=${d.routerTaskId}&type=1&courseId=${d.courseId}` + // router.push({path: types.value.path[d.type], query: {id: d.routerTaskId, type: 1, courseId: d.courseId}}) }