Merge remote-tracking branch 'origin/hqyDev' into feature-tianyong

src/helpers/oss-file-upload.ts

@@ -14,7 +14,7 @@ export async function fileUpload(fileName:string,file:Blob) {
 
 const getUploadSign = async (fileName:string) => {
    const fileUrl = "yjl/" + fileName
-   return request.post("/open/getUploadSign", {
+   return request.post("/getUploadSign", {
       data: {
          postData: {
             key: fileUrl

src/page-instrument/api.ts

@@ -87,7 +87,7 @@ export const api_musicPracticeRecordVideoUpload = (data: any) => {
 
 /** 提交意见反馈 */
 export const sysSuggestionAdd = (data: any) => {
-  return request.post("/sysSuggestion/save", { data, requestType: "json" });
+  return request.post("/suggestion/add", { data });
 };
 
 /** 获取评测报告 */
@@ -133,7 +133,7 @@ export const getSubjectList = (data: any) => {
  * 获取意见类型
  */
 export const getSuggestionList = (params: any) => {
-  return request.post("/sysSuggestionType/page", {
+  return request.post("/sysSuggestionType/queryAll", {
     data: params,
     requestType: "json",
   });

src/page-instrument/component/the-music-list/index.module.less

@@ -177,6 +177,7 @@
             display: flex;
             align-items: center;
             margin-top: 8px;
+            height: 14px;
             .usedNum{
                 display: flex;
                 align-items: center;
@@ -198,7 +199,6 @@
                 }
             }
             .author {
-                margin-left: 6px;
                 font-weight: 400;
                 font-size: 13px;
                 color: rgba(0,0,0,0.5);
@@ -212,12 +212,14 @@
     }
 }
 .empty{
-    margin-top: 10px;
     display: flex;
     flex-direction: column;
     align-items: center;
+    justify-content: center;
+    height: 100%;
     >img{
-        width: 182px;
+        margin-top: -10px;
+        width: 198px;
     }
     >span{
         font-size: 14px;

src/page-instrument/component/the-music-list/list.tsx

@@ -24,6 +24,7 @@ export default defineComponent({
       name: "",
       page: 1,
       rows: 20,
+      musicalInstrumentId: state.instrumentId,
       musicSheetCategoriesId: state.bizMusicCategoryId,
       recentFlag: props.recentFlag ? true : null,
       excludeMusicId: props.recentFlag ? null : state.examSongId,
@@ -125,7 +126,7 @@ export default defineComponent({
                 <div class={styles.content}>
                   <p class={styles.name}>{item.musicSheetName}</p>
                   <div class={styles.detail}>
-                    {item.usedNum && <div class={styles.usedNum}><img src={huoimg}/><div>{formatNumber(item.usedNum)}</div></div>}
+                    {/* {item.usedNum && <div class={styles.usedNum}><img src={huoimg}/><div>{formatNumber(item.usedNum)}</div></div>} */}
                     {item.composer && <p class={styles.author}>{item.composer}</p>}
                   </div>
                 </div>

src/page-instrument/custom-plugins/helper-model/recommendation/index.tsx

@@ -20,11 +20,11 @@ export default defineComponent({
 		// 获取建议类别
 		const getTypeList = async () => {
 			try {
-				const res = await getSuggestionList({ rows: 9999, page: 1, useClient: "SMART_PRACTICE" });
-				const data = res.data.rows || [];
+				const res = await getSuggestionList({ rows: 9999, page: 1 });
+				const data = res.data || [];
 				suggestionTypeList.value = data.map((item:any) => {
 					return {
-						text: item.name,
+						text: item.type,
 						value: item.id
 					}
 				})
@@ -50,10 +50,10 @@ export default defineComponent({
 				},[])
 				await sysSuggestionAdd({
 					content: recommenData.message,
-					type: "SMART_PRACTICE",
-					suggestionTypeId: recommenData.suggestId,
+					type: 'APP',
+					suggestionType: recommenData.suggestId,
 					mobileNo: storeData.user?.phone,
-					attachmentUrls: attachmentUrlsArr.join(",")
+					url: attachmentUrlsArr.join(",")
 				});
 				showToast({
 					message: "意见反馈已提交",

src/page-instrument/header-top/index.module.less

@@ -287,7 +287,7 @@
 
 .disabled {
     pointer-events: none;
-    opacity: .8;
+    opacity: .4;
 }
 
 .playBtn {

src/page-instrument/header-top/index.tsx

@@ -697,12 +697,12 @@ export default defineComponent({
           )}
 
           {/* 模式提醒 */}
-          {state.modeType === "practise" && (
+          {/* {state.modeType === "practise" && (
             <div class={[styles.modeWarn, "practiseModeWarn", state.platform === IPlatform.PC && state.musicScoreBtnDirection === "left" ? styles.modeWarnRight : ""]}>
               <img src={state.playType === "play" ? headImg("perform1.png") : headImg("sing1.png")} />
               <div>{state.playType === "play" ? "演奏场景" : "演唱场景"}</div>
             </div>
-          )}
+          )} */}
           {/* 功能按钮 */}
           <div
             class={[styles.headRight]}

src/page-instrument/view-detail/emptyMusic/index.module.less

@@ -14,8 +14,8 @@
         flex-direction: column;
         align-items: center;
         .img{
-            width: 202px;
-            height: 179px;
+            width: 198px;
+            height: 124px;
         }
         .tit{
             margin-top: 6px;
@@ -29,10 +29,10 @@
             width: 100px;
             height: 36px;
             border-radius: 18px;
-            border: 1px solid #1CACF1;
+            border: 1px solid #2DC7AA;
             font-weight: 400;
             font-size: 16px;
-            color: #1CACF1;
+            color: #2DC7AA;
             line-height: 36px;
             text-align: center;
             cursor: pointer;

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

@@ -327,10 +327,13 @@
 }
 
 @keyframes rotate {
-    from {
+    0% {
         transform: rotate(0deg);
     }
-    to {
+    90% {
+        transform: rotate(360deg);
+    }
+    100% {
         transform: rotate(360deg);
     }
 }
@@ -366,7 +369,7 @@
         flex-wrap: wrap;
         align-content: space-between;
         margin-bottom: 24px;
-        animation: rotate 1.5s linear infinite;
+        animation: rotate 1.5s ease-in-out infinite;
         .loadingCssItem{
             width: 11px;
             height: 11px;

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

@@ -603,7 +603,7 @@ export default defineComponent({
         {state.musicRendered && !state.isPreView && (
           <>
             {/* 统计训练时长 */}
-            {storeData.isApp && <RecordingTime />}
+            <RecordingTime />
             {/* 今日练习统计 */}
             {state.systemType === "student" && <ExerciseStatistics />}
             {/* 作业 */}

src/state.ts

@@ -1524,6 +1524,13 @@ function initMusicSource(data: any, tracks: string[], partIndex: number, workRec
     }
     state.partListNames = tracks
   }
+  /*  目前 管乐迷没有演唱模式 所以先排除掉演唱模式的数据 */
+  if(fanSongObj?.audioFileUrl || banSongObj?.audioFileUrl || fanSongObj?.solmizationFileUrl || fanSongObj?.femaleSolmizationFileUrl){
+    fanSongObj?.audioFileUrl && (fanSongObj.audioFileUrl = null)
+    banSongObj?.audioFileUrl && (banSongObj.audioFileUrl = null)
+    fanSongObj?.solmizationFileUrl && (fanSongObj.solmizationFileUrl = null)
+    fanSongObj?.femaleSolmizationFileUrl && (fanSongObj.femaleSolmizationFileUrl = null)
+  }
   // 当没有任何曲目的时候报错
   if (!musicObj?.audioFileUrl && !accompanyObj?.audioFileUrl && !fanSongObj?.audioFileUrl && !banSongObj?.audioFileUrl && !fanSongObj?.solmizationFileUrl && !fanSongObj?.femaleSolmizationFileUrl) {
     state.noMusicSource = true // 没有音源文件

src/view/abnormal-pop/index.module.less

@@ -140,7 +140,7 @@
     flex-wrap: wrap;
     align-content: space-between;
     margin-bottom: 24px;
-    animation: rotate 1.5s linear infinite;
+    animation: rotate 1.5s ease-in-out infinite;
     .loadingCssItem{
         width: 11px;
         height: 11px;
@@ -154,10 +154,13 @@
 }
 
 @keyframes rotate {
-    from {
+    0% {
         transform: rotate(0deg);
     }
-    to {
+    90% {
+        transform: rotate(360deg);
+    }
+    100% {
         transform: rotate(360deg);
     }
 }