fix

src/page-instrument/App.tsx

@@ -6,7 +6,7 @@ import { setUserInfo, storeData } from "../store";
 import { getRandomKey, getToken, setBehaviorId, setToken } from "../utils";
 import { getQuery } from "../utils/queryString";
 import Notfind from "../view/notfind";
-import { employeeQueryUserInfo, studentQueryUserInfo, teacherQueryUserInfo } from "./api";
+import { studentQueryUserInfo } from "./api";
 
 export default defineComponent({
 	name: "App",
@@ -14,11 +14,11 @@ export default defineComponent({
 		const query: any = getQuery();
 		/** 获取用户信息 */
 		const getUserInfo = async () => {
-			if (storeData.platformType === "WEB") {
-				return await employeeQueryUserInfo();
-			} else if (storeData.platformType === "TEACHER") {
-				return await teacherQueryUserInfo();
-			}
+			// if (storeData.platformType === "WEB") {
+			// 	return await employeeQueryUserInfo();
+			// } else if (storeData.platformType === "TEACHER") {
+			// 	return await teacherQueryUserInfo();
+			// }
 			return await studentQueryUserInfo();
 		};
 		const setUser = async () => {

src/page-instrument/api.ts

@@ -1,27 +1,23 @@
 import request from "../utils/request";
 
-/** 获取学生信息 */
+/** 获取用户信息 */
 export const studentQueryUserInfo = async () => {
-	return await request.get(`/student/queryUserInfo`);
-};
-/** 获取老师信息 */
-export const teacherQueryUserInfo = () => {
-	return request.get(`/teacher/queryUserInfo`);
-};
-/** 后台用户信息 */
-export const employeeQueryUserInfo = () => {
-	return request.get(`/employee/queryUserInfo`);
+	return await request.get(`/user/getUserInfo`);
 };
 
-/** 获取曲谱信息 */
+/** 获取曲谱详情 */
 export const sysMusicScoreAccompanimentQueryPage = (sysMusicScoreId: string) => {
-	return request.get("/music/sheet/detail/" + sysMusicScoreId);
+	return request.get("/musicSheet/detail/" + sysMusicScoreId);
 };
 
 /** 记录训练时长 */
 export const sysMusicRecordAdd = (data: any) => {
 	return request.post("/sysMusicRecord/add", { data });
 };
+/** 记录作业时间 */
+export const api_lessonTrainingSubmitTraining = (data: any) => {
+	return request.post("/lessonTraining/submitTraining", { data });
+};
 
 /** 提交意见反馈 */
 export const sysSuggestionAdd = (data: any) => {

src/page-instrument/custom-plugins/recording-time/index.tsx

@@ -1,7 +1,8 @@
 import { defineComponent, reactive, watch } from "vue";
 import state from "/src/state";
-import { sysMusicRecordAdd } from "../../api";
+import { api_lessonTrainingSubmitTraining, sysMusicRecordAdd } from "../../api";
 import { browser, getBehaviorId, getCampId } from "/src/utils";
+import { getQuery } from "/src/utils/queryString";
 
 const recordData = reactive({
 	starTime: 0,
@@ -9,25 +10,37 @@ const recordData = reactive({
 const handleRecord = () => {
 	// 不是练习模式不记录
 	if (state.modeType !== "practise") return;
+	const query = getQuery();
 	let total = Date.now() - recordData.starTime;
 	recordData.starTime = Date.now();
 	if (total < 0) total = 0;
-	const body = {
-		musicSheetId: state.examSongId,
-		sysMusicScoreId: state.examSongId,
-		feature: "CLOUD_STUDY_TRAIN",
-		playTime: total / 1000,
-		deviceType: browser().android ? "ANDROID" : "IOS",
-		behaviorId: getBehaviorId()
-	};
-	sysMusicRecordAdd(body);
+
+	// sysMusicRecordAdd(body);
+	// 课后训练
+	if (query.lessonTrainingId) {
+		api_lessonTrainingSubmitTraining({
+			id: query.lessonTrainingId,
+			trainingTimes: total,
+		});
+	} else {
+		const body = {
+			musicSheetId: state.examSongId,
+			sysMusicScoreId: state.examSongId,
+			feature: "PRACTICE",
+			practiceSource: "PRACTICE",
+			playTime: total,
+			deviceType: browser().android ? "ANDROID" : "IOS",
+			behaviorId: getBehaviorId(),
+		};
+		// musicPracticeRecordSave(body);
+	}
 };
 
 export const handleNoEndExit = () => {
-    if (state.playState === 'play') {
-        handleRecord()
-    }
-}
+	if (state.playState === "play") {
+		handleRecord();
+	}
+};
 
 /**
  * 记录练习时长, 仅记录练习模式的时长

src/page-instrument/main.ts

@@ -22,8 +22,8 @@ import "./theme.css";
 	(window as any).webkit?.messageHandlers?.ORCHESTRA;
 	setStoreData({
 		isApp: instance ? true : false,
-		platformApi: u.includes("COLEXIUSTUDENT") ? "/api-student" : "/api-teacher",
-		platformType: u.includes("COLEXIUSTUDENT") ? "STUDENT" : "TEACHER",
+		platformApi: u.includes("COLEXIUSTUDENT") ? "/edu-app" : "/edu-app",
+		platformType: u.includes("COLEXIUSTUDENT") ? "" : "",
 		proxy: import.meta.env.DEV ? "/instrument" : ""
 	});
 })();

src/page-instrument/view-detail/index.tsx

@@ -84,12 +84,12 @@ export default defineComponent({
 			const musicData = res.data.background[index] || {};
 			const musicInfo = {
 				...res.data,
-				music: musicData.audioFileUrl,
-				musicSheetId: musicData.musicSheetId,
-				track: musicData.track,
-				metronomeUrl: musicData.metronomeUrl,
+				music: musicData.audioFileUrl || res.data.audioFileUrl,
+				accompany: musicData.metronomeUrl || res.data.metronomeUrl,
+				musicSheetId: musicData.musicSheetId || res.data.id,
+				track: musicData.track || res.data.track,
 			};
-			// console.log("🚀 ~ musicInfo:", musicInfo);
+			console.log("🚀 ~ musicInfo:", musicInfo);
 			setState(musicInfo, index);
 			setCustom();
 			detailData.isLoading = false;
@@ -118,7 +118,7 @@ export default defineComponent({
 			state.needTick = true; // data.isOpenMetronome;
 			state.isShowFingering = data.showFingering ? true : false;
 			state.music = data.music;
-			state.accompany = data.audioFileUrl;
+			state.accompany = data.accompany;
 			state.midiUrl = data.midiUrl;
 			state.parentCategoriesId = data.musicTag;
 			state.playMode = data.audioType === "MP3" ? "MP3" : "MIDI";

src/store.ts

@@ -17,8 +17,8 @@ type IUser = {
 	id?: string | number
 };
 type IStatus = "init" | "login" | "logout" | "error";
-type IPlatformType = "STUDENT" | "TEACHER" | "WEB";
-type IPlatformApi = "/api-student" | "/api-teacher" | "/api-web" | "/api-backend";
+type IPlatformType = "STUDENT" | "TEACHER" | "WEB" | "";
+type IPlatformApi = "/api-student" | "/api-teacher" | "/api-web" | "/api-backend" | "/edu-app";
 type IProxy = "" | "/gym" | "/colexiu" | "/orchestra" | "/instrument";
 
 export interface IStoreData {

vite.config.ts

@@ -74,7 +74,7 @@ export default defineConfig({
 			},
 			"^/instrument/.*": {
 				// target: "https://dev.kt.colexiu.com",
-				target: "https://kt.colexiu.com",
+				target: "https://test.lexiaoya.cn",
 				changeOrigin: true,
 				rewrite: (path) => path.replace(/^\/instrument/, ""),
 			},