Merge remote-tracking branch 'yx/master'

# Conflicts:
#	src/api/CONST.js
#	src/views/projectdetails/projectDetails.vue
This commit is contained in:
joshen
2025-08-22 18:49:44 +08:00
2 changed files with 4 additions and 22 deletions

View File

@@ -45,9 +45,9 @@ export const TASK_TYPES = {
path: { path: {
// 增加异步防止ios阻止弹窗弹出 // 增加异步防止ios阻止弹窗弹出
1: ({ courseId }) => setTimeout(() => { window.open(window.location.protocol + import.meta.env.VITE_BOE_ONLINE_CLASS_URL + courseId) }), //在线 1: ({ courseId }) => setTimeout(() => { window.open(window.location.protocol + import.meta.env.VITE_BOE_ONLINE_CLASS_URL + courseId, '_top') }), //在线
2: ({ targetId }) => setTimeout(() => { window.open(`${location.protocol}//${location.host}${import.meta.env.VITE_BASE_API}/stu/project/redirectDetail?courseId=${targetId}`, '_top') }), 2: ({ targetId }) => setTimeout(() => { window.open(`${location.protocol}//${location.host}${import.meta.env.VITE_BASE_API}/stu/project/redirectDetail?courseId=${targetId}`, '_top') }),
3: ({ courseId }) => setTimeout(() => { window.open(window.location.protocol + import.meta.env.VITE_BOE_CASS_DETAIL_URL + courseId) }), //案例 3: ({ courseId }) => setTimeout(() => { window.open(window.location.protocol + import.meta.env.VITE_BOE_CASS_DETAIL_URL + courseId, '_top') }), //案例
4: "/homeworkpage", 4: "/homeworkpage",
5: ({ examType }) => examType === 2 ? '/externalexam' : (window.location.protocol + import.meta.env.VITE_BOE_EXAM_DETAIL_URL), //考试 5: ({ examType }) => examType === 2 ? '/externalexam' : (window.location.protocol + import.meta.env.VITE_BOE_EXAM_DETAIL_URL), //考试
6: "/liveboradcast", 6: "/liveboradcast",

View File

@@ -822,26 +822,8 @@ function toFinish(d, sName, chapterOrStageId, studyModel) {
// } // }
} }
function isIOS() { function toOffcoursePlanPage(id){
return [ window.open(`${location.protocol}//${location.host}${import.meta.env.VITE_BASE_API}/stu/project/redirectDetail?courseId=${id}`, '_top')
'iPad Simulator',
'iPhone Simulator',
'iPod Simulator',
'iPad',
'iPhone',
'iPod'
].includes(navigator.platform) ||
// iPad on iOS 13 detection
(navigator.userAgent.includes("Mac") && "ontouchend" in document);
}
function toOffcoursePlanPage(id) {
window.open(
`${location.protocol}//${location.host}${
import.meta.env.VITE_BASE_API
}/stu/project/redirectDetail?courseId=${id}`,
"_top"
);
} }
function whiteTypes(type) { function whiteTypes(type) {