Merge branch '2023-8-29_上线' into online

src/page-instrument/App.tsx

@@ -25,15 +25,16 @@ export default defineComponent({
 					if (browserInfo.isApp) {
 						postMessage({ api: "login" });
 					} else {
-						window.location.href = `${
-							/(192|localhost)/.test(location.origin) ? "https://test.lexiaoya.cn" : location.origin
-						}/classroom`;
+						if (/(192|localhost)/.test(location.origin)) {
+							return;
+						}
+						window.location.href = `${location.origin}/classroom`;
 					}
 					return;
 				}
 				const student = res?.data || {};
 				setUserInfo(student);
-				storeData.platformType = student.clientType === 'STUDENT' ? 'STUDENT' : ''
+				storeData.platformType = student.clientType === "STUDENT" ? "STUDENT" : "";
 			} catch (error) {
 				storeData.status = "error";
 				api_cloudLoading();

src/page-instrument/view-figner/index.module.less

@@ -413,7 +413,7 @@
     display: flex;
     justify-content: space-evenly;
     align-items: center;
-    padding: 0 10px 6px 10px;
+    padding: 0 10px 14px 10px;
 }
 
 .loading {

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

@@ -175,7 +175,7 @@ export default defineComponent({
 		};
 		onBeforeMount(() => {
 			getNotes();
-			if (data.subject === 'pan-flute'){
+			if (['pan-flute', 'ocarina'].includes(data.subject)){
 				data.viewIndex = 1;
 			}
 			getFingeringData();

src/view/fingering/fingering-config.ts

@@ -45,6 +45,7 @@ export type IVocals =
 	| "pan-flute3"
 	| "pan-flute4"
 	| "ocarina"
+	| "ocarina1"
 	| "melodica";
 
 /** 映射声部ID */
@@ -375,6 +376,16 @@ export const getFingeringConfig = async (type: IVocals | undefined): Promise<ITy
 					marginTop: "auto",
 				},
 			};
+		case "ocarina1":
+			const ocarina1 = await import(`./fingering-img/ocarina1/index.json`);
+			return {
+				json: ocarina1.default,
+				relationship: relationships.ocarina,
+				width: "180px",
+				styles: {
+					marginTop: "auto",
+				},
+			};
 		case "melodica":
 			const melodica = await import(`./fingering-img/melodica/index.json`);
 			return {

vite.config.ts

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