Merge branch 'feature-tianyong-newVersion' into ktyq-test-new

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

@@ -113,6 +113,7 @@
                     font-weight: 400;
                     font-size: 13px;
                     color: #131415;
+                    caret-color: #1cacf1;
                     &::placeholder{
                         color: #AAAAAA;
                     }
@@ -171,7 +172,7 @@
                         .van-cell{
                             margin-top: 6px;
                             padding: 0;
-                            font-weight: 500;
+                            font-weight: 400;
                             font-size: 14px;
                             color: #323233;
                             line-height: 32px;
@@ -186,6 +187,7 @@
                                 background: #EEF8FF;
                                 border-radius: 4px;
                                 color: #1CACF1;
+                                font-weight: 500;
                             }
                             .van-cell__value{
                                 display: none;
@@ -269,11 +271,12 @@
             .usedNum{
                 display: flex;
                 align-items: center;
-                padding: 3px 5px;
-                height: 17px;
+                padding: 0 5px;
+                height: 14px;
                 background: #FFF8F7;
                 border-radius: 4px;
-                border: 1px solid #FFC5C5;
+                border: 0.6px solid #FFC5C5;
+                font-size: 10px;
                 >img{
                     width: 8px;
                     height: 11px;
@@ -281,7 +284,6 @@
                 >div{
                     margin-left: 3px;
                     font-weight: 400;
-                    font-size: 12px;
                     color: #FF6A6A
                 }
             }
@@ -294,12 +296,12 @@
             .playType,.singType{
                 margin-left: 5px;
                 width: 26px;
-                height: 17px;
+                height: 14px;
                 background: #FFFFFF;
                 border-radius: 3px;
                 text-align: center;
-                line-height: 17px;
-                border: 1px solid #15B2FD;
+                line-height: 14px;
+                border: 0.6px solid #15B2FD;
                 font-weight: 400;
                 font-size: 10px;
                 color: #15B2FD;

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

@@ -100,6 +100,11 @@ export default defineComponent({
           _t: Date.now(),
         });
     };
+    function formatNumber(num:number) {
+      return num >= 10000 
+          ? (num / 10000).toFixed(1).replace(/\.0$/, '') + "万" 
+          : num.toString();
+    }
     return () => (
       <div class={styles.wrap}>
         <div class={[styles.searchBox,data.isFocus && styles.isFocus]}>
@@ -129,7 +134,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>{item.usedNum}</div></div>}
+                    {item.usedNum && <div class={styles.usedNum}><img src={huoimg}/><div>{formatNumber(item.usedNum)}</div></div>}
                     {
                       item.audioPlayTypes && item.audioPlayTypes.split(",").sort().map((type:"PLAY"|"SING")=>{
                         return <div class={type==="PLAY"?styles.playType:styles.singType}>{type==="PLAY"?"演奏":"演唱"}</div>

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

@@ -14,8 +14,18 @@
     }
     &.evaluating{
         .head{
+            width: 394px;
+            height: 62px;
+            margin-bottom: -3px;
             background: url("/src/page-instrument/header-top/image/headImg2.png") no-repeat;
             background-size: 100% 100%; 
+            .headTit{
+                bottom: 11px;
+            }
+            .closeImg{
+                top: 2px;
+                right: -26px;
+            }
         }
         .content{
             background: #B0CDFF;

src/page-instrument/follow-model/index.tsx

@@ -41,7 +41,7 @@ export default defineComponent({
         {
           followData.isBeginMask && <div class={styles.beginMask}></div>
         }        
-        <div class={[styles.operatingBtn, state.playBtnDirection === "left" ? styles.operatingLeft : ""]}>
+        <div class={[styles.operatingBtn, state.platform === IPlatform.PC && state.musicScoreBtnDirection === "left" ? styles.operatingLeft : ""]}>
           {!followData.start && (
             <img
               class={[styles.iconBtn, "follow-1"]}

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

@@ -635,7 +635,7 @@ export default defineComponent({
     return () => (
       <>
         <div
-          class={[styles.headerTop]}
+          class={[styles.headerTop, state.platform === IPlatform.PC && state.musicScoreBtnDirection === "left" ? styles.headerTopRight : ""]}
           onClick={(e: Event) => {
             e.stopPropagation();
             if (state.platform === IPlatform.PC) {
@@ -703,7 +703,7 @@ export default defineComponent({
           {/* 模式提醒 */}
           {
             state.modeType === "practise" &&
-              <div class={[styles.modeWarn, "practiseModeWarn"]}>
+            <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>
@@ -904,7 +904,7 @@ export default defineComponent({
             "driver-1",
             styles.playBtn,
             playBtn.value.disabled && styles.disabled,
-            // state.platform === IPlatform.PC && state.musicScoreBtnDirection === "left" ? styles.playLeftButton : state.platform === IPlatform.PC && state.musicScoreBtnDirection === "right" ? styles.playRightButton : "",
+            state.platform === IPlatform.PC && state.musicScoreBtnDirection === "left" ? styles.playLeftButton : state.platform === IPlatform.PC && state.musicScoreBtnDirection === "right" ? styles.playRightButton : "",
           ]}
           onClick={() => togglePlay(state.playState === "play" ? "paused" : "play")}
         >
@@ -919,7 +919,7 @@ export default defineComponent({
         <div
           id="tips-step-9"
           style={{ display: resetBtn.value.display ? "" : "none" }}
-          class={[styles.resetBtn, resetBtn.value.disabled && styles.disabled]}
+          class={[styles.resetBtn, resetBtn.value.disabled && styles.disabled, state.platform === IPlatform.PC && state.musicScoreBtnDirection === "left" ? styles.pauseLeftButton : state.platform === IPlatform.PC && state.musicScoreBtnDirection === "right" ? styles.pauseRightButton : ""]}
           onClick={() => handleResetPlay()}
         >
           <img class={styles.iconBtn} src={headImg("icon_reset.png")} />

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

@@ -17,8 +17,18 @@
     }
     &.evaluating{
         .head{
+            width: 394px;
+            height: 62px;
+            margin-bottom: -3px;
             background: url("../image/headImg2.png") no-repeat;
             background-size: 100% 100%; 
+            .headTit{
+                bottom: 11px;
+            }
+            .closeImg{
+                top: 2px;
+                right: -26px;
+            }
         }
         .content{
             background: #B0CDFF;

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

@@ -271,8 +271,8 @@ export default defineComponent({
       handleInitTick(osmd?.Sheet?.SheetPlaybackSetting?.Rhythm?.Numerator || 4);
       // }
       // api_cloudLoading();
-      state.playBtnDirection = query.imagePos === "right" ? "right" : "left";
-      state.isAttendClass = query.imagePos === "left" || query.imagePos === "right" ? true : false;
+      state.playBtnDirection = query.imagePos === 'left' ? 'left' : 'right';
+      state.isAttendClass = (query.imagePos === 'left' || query.imagePos === 'right') ? true : false;
       // if (state.fingeringInfo.direction === "vertical" && state.setting.displayFingering) {
       //   state.musicScoreBtnDirection = state.playBtnDirection === 'right' ? 'left' : 'right';
       // } else {
@@ -319,47 +319,35 @@ export default defineComponent({
         } else {
           console.log("指法", state.playBtnDirection, state.platform);
           // 老师端，竖向指法，需要根据功能按钮方向进行设置
-          // if (state.platform === IPlatform.PC) {
-          //   return {
-          //     container: {
-          //       paddingRight: state.playBtnDirection === "right" ? "initial" : state.fingeringInfo.width,
-          //       paddingLeft: state.playBtnDirection === "right" ? state.fingeringInfo.width : "initial",
-          //     },
-          //     fingerBox: {
-          //       position: "absolute",
-          //       width: state.fingeringInfo.width,
-          //       height: state.fingeringInfo.name === "hulusi-flute" ? "86%" : "80%",
-          //       right: state.playBtnDirection === "right" ? "initial" : 0,
-          //       left: state.playBtnDirection === "right" ? 0 : "initial",
-          //       top: state.fingeringInfo.name === "ocarina" ? "60px" : 0,
-          //     },
-          //   };
-          // } else {
-          //   return {
-          //     container: {
-          //       paddingLeft: state.fingeringInfo.width,
-          //     },
-          //     fingerBox: {
-          //       position: "absolute",
-          //       width: state.fingeringInfo.width,
-          //       height: state.fingeringInfo.name === "hulusi-flute" ? "86%" : "80%",
-          //       left: 0,
-          //       top: state.fingeringInfo.name === "ocarina" ? "60px" : 0,
-          //     },
-          //   };
-          // }
-          return {
-            container: {
-              paddingLeft: state.fingeringInfo.width,
-            },
-            fingerBox: {
-              position: "absolute",
-              width: state.fingeringInfo.width,
-              height: state.fingeringInfo.name === "hulusi-flute" ? "86%" : "80%",
-              left: 0,
-              top: state.fingeringInfo.name === "ocarina" ? "60px" : 0,
-            },
-          };
+          if (state.platform === IPlatform.PC) {
+            return {
+              container: {
+                paddingRight: state.playBtnDirection === "right" ? "initial" : state.fingeringInfo.width,
+                paddingLeft: state.playBtnDirection === "right" ? state.fingeringInfo.width : "initial",
+              },
+              fingerBox: {
+                position: "absolute",
+                width: state.fingeringInfo.width,
+                height: state.fingeringInfo.name === "hulusi-flute" ? "86%" : "80%",
+                right: state.playBtnDirection === "right" ? "initial" : 0,
+                left: state.playBtnDirection === "right" ? 0 : "initial",
+                top: state.fingeringInfo.name === "ocarina" ? "60px" : 0,
+              },
+            };
+          } else {
+            return {
+              container: {
+                paddingLeft: state.fingeringInfo.width,
+              },
+              fingerBox: {
+                position: "absolute",
+                width: state.fingeringInfo.width,
+                height: state.fingeringInfo.name === "hulusi-flute" ? "86%" : "80%",
+                left: 0,
+                top: state.fingeringInfo.name === "ocarina" ? "60px" : 0,
+              },
+            };
+          }
         }
       }
       return {

src/page-instrument/view-detail/smoothAnimation/index.ts

@@ -80,7 +80,7 @@ export function initSmoothAnimation() {
    calcClientWidth()
    window.addEventListener("resize", calcClientWidth)
    // 初始化 只有练习模式 才显示
-   state.modeType === "practise" && (smoothAnimationState.isShow.value = true)
+   state.modeType === "practise" && (smoothAnimationState.isShow.value = state.melodyLine)
    // 多分轨合并显示、打击乐、节奏练习的曲子不显示旋律线
    if (state.isCombineRender || state.isPercussion) {
       smoothAnimationState.isShow.value = false

src/view/plugins/toggleMusicSheet/choosePartName/index.module.less

@@ -26,8 +26,18 @@
 }
 &.evaluating{
     .head{
-        background: url("../../../../page-instrument/header-top/image/headImg2.png") no-repeat;
-        background-size: 100% 100%; 
+      width: 394px;
+      height: 62px;
+      margin-bottom: -3px;
+      background: url("/src/page-instrument/header-top/image/headImg2.png") no-repeat;
+      background-size: 100% 100%; 
+      .headTit{
+          bottom: 11px;
+      }
+      .closeImg{
+          top: 2px;
+          right: -26px;
+      }
     }
     .pickerCon{
         background: #B0CDFF;