浏览代码

feat: 学生端、老师端、后台接口修改

TIANYONG 7 月之前
父节点
当前提交
1b13863b44

+ 5 - 13
src/page-instrument/api.ts

@@ -19,25 +19,17 @@ export const studentQueryUserInfo = async () => {
         vipType: data.userVip?.vipType || '',
       }
       return res
-    } else if (requestHostname === "/api-web") {
+    } else if (requestHostname === "/api-admin") {
       state.systemType = "web"
-      let res
-      if (state.isSchool) {
-        res = await request.get("/schoolStaff/queryUserInfo", {
-          requestType: "form",
-        });
-      } else {
-        res = await request.get(`/employee/queryUserInfo`);
-      }
-      const data = res.data
+      let res: any = {};
       res.data = {
         instrumentId: "",
         specialInstrumentIds: [],
-        phone:data.phone,
+        phone: '',
         clientType:"web",
-        id:data.id,
+        id: '',
         gender:"",
-        vipType: data.userVip?.vipType || '',
+        vipType: '',
       }
       return res
     } else {

文件差异内容过多而无法显示
+ 0 - 0
src/page-instrument/header-top/image/glMode.json


文件差异内容过多而无法显示
+ 0 - 0
src/page-instrument/header-top/image/lxMode.json


文件差异内容过多而无法显示
+ 0 - 0
src/page-instrument/header-top/image/pcMode.json


+ 24 - 24
src/page-instrument/header-top/modeView.tsx

@@ -3,12 +3,12 @@ import styles from "./index.module.less";
 import backImg from "./image/icon-back.png";
 import titmeImg from "./image/modeTitle.png";
 import nameImg from "./image/zt.png";
-// import lxMode from "./image/lxMode.json";
-// import glMode from "./image/glMode.json";
-// import pcMode from "./image/pcMode.json";
-import lxImg from "./image/lxImg.png";
-import glImg from "./image/glImg.png";
-import pcImg from "./image/pcImg.png";
+import lxMode from "./image/lxMode.json";
+import glMode from "./image/glMode.json";
+import pcMode from "./image/pcMode.json";
+// import lxImg from "./image/lxImg.png";
+// import glImg from "./image/glImg.png";
+// import pcImg from "./image/pcImg.png";
 import { headTopData } from "./index";
 import { getQuery } from "/src/utils/queryString";
 import { storeData } from "/src/store";
@@ -78,36 +78,36 @@ export default defineComponent({
         />
         <img src={titmeImg} class={styles.modeTitle} />
         <div class={[styles.modeBox, ((!state.isPercussion && !state.enableEvaluation) || (state.isPercussion && state.enableEvaluation) || (state.isPercussion && !state.enableEvaluation)) && styles.twoModeBox]}>
-          {/* <Vue3Lottie ref={modeImgDom1} class={styles.modeImg} animationData={lxMode} autoPlay={false} loop={true} onClick={() => {
+          <Vue3Lottie ref={modeImgDom1} class={styles.modeImg} animationData={lxMode} autoPlay={false} loop={true} onClick={() => {
             if(state.isSingleLine){
               smoothAnimationState.isShow.value = state.melodyLine;
             }
             headTopData.handleChangeModeType("practise")
-            }}></Vue3Lottie> */}
-          <img class={styles.modeImg} src={lxImg} 
+            }}></Vue3Lottie>
+          {/* <img class={styles.modeImg} src={lxImg} 
             onClick={() => {
               if(state.isSingleLine){
                 smoothAnimationState.isShow.value = state.melodyLine;
               }
               headTopData.handleChangeModeType("practise")
-            }} />
+            }} /> */}
           {!state.isPercussion && 
-              // <Vue3Lottie ref={modeImgDom2} class={styles.modeImg} animationData={glMode} autoPlay={false} loop={true} onClick={() => headTopData.handleChangeModeType("follow")}></Vue3Lottie>
-              <img class={styles.modeImg} src={glImg} 
-                onClick={() => headTopData.handleChangeModeType("follow")} />
+              <Vue3Lottie ref={modeImgDom2} class={styles.modeImg} animationData={glMode} autoPlay={false} loop={true} onClick={() => headTopData.handleChangeModeType("follow")}></Vue3Lottie>
+              // <img class={styles.modeImg} src={glImg} 
+              //   onClick={() => headTopData.handleChangeModeType("follow")} />
           }
           {state.enableEvaluation && 
-            // <Vue3Lottie ref={modeImgDom3} class={styles.modeImg} animationData={pcMode} autoPlay={false} loop={true} onClick={() => {
-            //    // 点击评测模式进入评测模块的需要检测耳机状态,通过返回按钮进入评测模块的,不检测耳机状态
-            //   evaluatingData.needCheckErjiStatus = true;
-            //   headTopData.handleChangeModeType("evaluating")
-            // }}></Vue3Lottie>
-            <img class={styles.modeImg} src={pcImg} 
-              onClick={() => {
-                  // 点击评测模式进入评测模块的需要检测耳机状态,通过返回按钮进入评测模块的,不检测耳机状态
-                  evaluatingData.needCheckErjiStatus = true;
-                  headTopData.handleChangeModeType("evaluating")
-                }} />
+            <Vue3Lottie ref={modeImgDom3} class={styles.modeImg} animationData={pcMode} autoPlay={false} loop={true} onClick={() => {
+               // 点击评测模式进入评测模块的需要检测耳机状态,通过返回按钮进入评测模块的,不检测耳机状态
+              evaluatingData.needCheckErjiStatus = true;
+              headTopData.handleChangeModeType("evaluating")
+            }}></Vue3Lottie>
+            // <img class={styles.modeImg} src={pcImg} 
+            //   onClick={() => {
+            //       // 点击评测模式进入评测模块的需要检测耳机状态,通过返回按钮进入评测模块的,不检测耳机状态
+            //       evaluatingData.needCheckErjiStatus = true;
+            //       headTopData.handleChangeModeType("evaluating")
+            //     }} />
           }
         </div>
         {/** 延迟检测中途,socket出错,网络提示弹窗 */}

+ 3 - 1
src/page-instrument/simple-detail/index.tsx

@@ -99,10 +99,12 @@ export default defineComponent({
 
 		onMounted(async () => {
 			const id = query.id || '';
+			// 作品id
+			const userMusicId = query.userMusicId || '';
 			detailData.backgroundRendMode = query.backgroundRendMode;
 			state.isSimplePage = true;
 			state.partIndex = query["part-index"] ? Number(query["part-index"]) : 0;
-			await getMusicDetail(id, 'open');
+			await getMusicDetail(id, 'open', userMusicId);
 			detailData.isLoading = false;
 			state.isSingleLine = true;
 			window.addEventListener("message", communicateCb);

+ 2 - 2
src/state.ts

@@ -1443,8 +1443,8 @@ export const evaluatCreateMusicPlayer = () => {
 
 
 /** 获取内容平台的接口详情并初始化state信息 */
-export const getMusicDetail = async (id: string, type?: string) => {
-  const res = await getMusicSheetDetail(id, type);
+export const getMusicDetail = async (id: string, type?: string, musicId?: string) => {
+  const res = await getMusicSheetDetail(id, type, musicId);
   if (res?.code === 200) {
     await getMusicInfo(res)
   }

+ 2 - 2
src/utils/baseApi.ts

@@ -8,8 +8,8 @@ import request from "./request";
 // };
 
 /** 获取内容平台的曲谱详情 */
-export const getMusicSheetDetail = (sysMusicScoreId: string, type?: string) => {
-  const url = type === 'open' ? `/open/musicSheet/cbsDetail/${sysMusicScoreId}` : `/musicSheet/cbsDetail/${sysMusicScoreId}`;
+export const getMusicSheetDetail = (sysMusicScoreId: string, type?: string, musicId?: string) => {
+  const url = type === 'open' ? `/open/musicSheet/cbsDetail/${sysMusicScoreId}?userMusicId=${musicId}` : `/musicSheet/cbsDetail/${sysMusicScoreId}`;
   return request.get(url, { noToken: type === 'open' ? true : false });
 };
 

+ 6 - 8
src/utils/index.ts

@@ -134,18 +134,16 @@ export const getStorageSpeed = (id: any) => {
 	return speeds[id] || 0
 }
 
-/** 管乐迷区分业务接口  */
+/** 酷乐秀区分业务接口  */
 export const getRequestHostname = () => {
 	const query: any = getQuery();
-	let blankOld = ['mteadev.dayaedu.com', 'mteatest.dayaedu.com', 'mteaonline.dayaedu.com']
-	let blank = ["dev.gym.lexiaoya.cn/accompany-teacher/", "test.gym.lexiaoya.cn/accompany-teacher/", "gym.lexiaoya.cn/accompany-teacher/"];
-	let webBlankOld = ["mandev.dayaedu.com", "mantest.dayaedu.com", "manonline.dayaedu.com", "test.dayaedu.com", "online.dayaedu.com"];
-	let webBlank = ["dev.gym.lexiaoya.cn/accompany-web/", "test.gym.lexiaoya.cn/accompany-web/", "gym.lexiaoya.cn/accompany-web/"];
+	let blank = ["dev.colexiu.com/teacher/", "test.colexiu.com/teacher/", "online.colexiu.com/teacher/"];
+	let webBlank = ["dev.colexiu.com/accompany/", "test.colexiu.com/accompany/", "online.colexiu.com/accompany/"];
 	const host = location.hostname + location.pathname
-	if (blank.includes(host) || blankOld.includes(location.hostname) || query.systemType === "teacher" || storeData.isTeacher) {
+	if (blank.includes(host) || query.systemType === "teacher" || storeData.isTeacher) {
 		return "/api-teacher";
-	} else if (webBlank.includes(host) || webBlankOld.includes(location.hostname) || query.systemType === "web") {
-		return "/api-web";
+	} else if (webBlank.includes(host) || query.systemType === "web") {
+		return "/api-admin";
 	}
 	return "/api-student";
 };

部分文件因为文件数量过多而无法显示