Przeglądaj źródła

Merge branch 'new-feature-tianyong' into kt-dev

TIANYONG 1 rok temu
rodzic
commit
51cc5f9404

+ 3 - 2
src/page-instrument/custom-plugins/work-ealuating/index.tsx

@@ -60,15 +60,16 @@ export default defineComponent({
 				const res = await api_lessonTrainingSubmitTraining({
 					id: evaluatingWorkData.evaluatingRecord,
 					trainingTimes: data?.score || 0,
+					recordId: evaluatingData.resultData.recordId
 				});
 			} catch (error) {
 				console.log(error);
 			}
 		};
 		watch(
-			() => evaluatingData.resulstMode,
+			() => evaluatingData.resultData.recordId,
 			() => {
-				if (evaluatingData.resulstMode && evaluatingData.isComplete) {
+				if (evaluatingData.resulstMode && evaluatingData.resultData.recordId) {
 					addEvaluatingWorkRecored(evaluatingData.resultData);
 				}
 			}

+ 1 - 1
src/state.ts

@@ -805,7 +805,7 @@ const setState = (data: any, index: number) => {
   state.parentCategoriesId = data.musicTag;
   state.musicSheetCategoriesId = data.musicCategoryId;
   state.playMode = data.playMode === "MP3" ? "MP3" : "MIDI";
-  state.originSpeed = state.speed = data.playSpeed;
+  state.originSpeed = state.speed = data.playSpeed || 100;
   const track = data.code || data.track;
   state.track = track ? track.replace(/ /g, "").toLocaleLowerCase() : "";
   state.enableNotation = data.isConvertibleScore === null ? true : data.isConvertibleScore;

+ 1 - 1
src/utils/index.ts

@@ -126,7 +126,7 @@ export const matchProductApiUrl = () => {
 		},
 		'instrument': {
 			'dev': 'https://dev.kt.colexiu.com',
-			'test': 'https://test.lexiaoya.cn',
+			'test': 'https://test.kt.colexiu.com',
 			'online': 'https://kt.colexiu.com'
 		}
 	}

+ 2 - 1
vite.config.ts

@@ -67,7 +67,8 @@ export default defineConfig({
 				// target: "https://kt.colexiu.com",
 				// target: "https://test.lexiaoya.cn",
 				// target: "https://dev.kt.colexiu.com",
-				target: "https://dev.resource.colexiu.com", // 内容平台开发环境
+				// target: "https://dev.resource.colexiu.com", // 内容平台开发环境
+				target: "https://test.kt.colexiu.com",
 				changeOrigin: true,
 				rewrite: (path) => path.replace(/^\/instrument/, ""),
 			},