Merge branch 'hqyDevNewVersion' of http://git.dayaedu.com/liushengqiang/music-score into feature-tianyong-newVersion

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

@@ -8,6 +8,29 @@
     padding: 0 30px;
     background: linear-gradient( 180deg, rgba(0,0,0,0) 0%, rgba(0,0,0,0.6) 100%);
 }
+.modeWarn{
+    position: fixed;
+    left: 30px;
+    bottom: 20px;
+    border-radius: 16px;
+    background-color: rgba(12,51,107,0.61);
+    padding: 6px 11px;
+    align-items: center;
+    display: flex;
+    opacity: 0;
+    transition: all .3s ease-in;
+    & > div{
+        margin-left: 4px;
+        font-weight: 500;
+        font-size: 14px;
+        line-height: 20px;
+        color: rgba(255,255,255,0.7);
+    }    
+    & > img{
+        width: 18px;
+        height: 18px;
+    }
+}
 .headTopLeftBox{
     position: fixed;
     top: 20px;

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

@@ -640,6 +640,14 @@ export default defineComponent({
                 <div class={styles.title}>{state.modeType==="practise" ? '练习模式' : state.modeType==="follow" ? "跟练模式" : state.modeType==="evaluating" ? "评测模式" : ""}</div>
               </div>
           }
+          {/* 模式提醒 */}
+          {
+            state.modeType === "practise" &&
+              <div class={[styles.modeWarn, "practiseModeWarn"]}>
+                <img src={state.playType === "play" ? headImg("perform1.png") : headImg("sing1.png")} />
+                <div>{state.playType === "play" ? "演奏场景" : "演唱场景"}</div>
+              </div>
+          }
           {/* 功能按钮 */}
           <div
             class={[styles.headRight]}
@@ -780,7 +788,7 @@ export default defineComponent({
                 }}
               >
                 <img class={styles.iconBtn} src={headImg(`shenggui.png`)} />
-                <span>声轨</span>
+                <span>声部</span>
               </div>
             )}
             <div id={state.platform === IPlatform.PC ? "teacherTop-6" : "studnetT-6"} style={{ display: settingBtn.value.display ? "" : "none" }} class={[styles.btn, settingBtn.value.disabled && styles.disabled]} onClick={() => (headTopData.settingMode = true)}>

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

@@ -40,6 +40,11 @@
 
         &.headHide {
             margin-bottom: calc(0Px - var(--header-height));
+            :global{
+                .practiseModeWarn{
+                    opacity: 1;
+                }
+            }
         }
     }
 

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

@@ -1,4 +1,30 @@
 .container {
+  &.follow{
+    .head{
+        background: url("../../../../page-instrument/header-top/image/headImg1.png") no-repeat;
+        background-size: 100% 100%; 
+    }
+    .pickerCon{
+        background: #ACDDEA;
+        box-shadow: 0px 4px 0px 0px #5EA2B9;
+        .pickerBox{
+            background: #E3F3F5;
+        }
+    }
+}
+&.evaluating{
+    .head{
+        background: url("../../../../page-instrument/header-top/image/headImg2.png") no-repeat;
+        background-size: 100% 100%; 
+    }
+    .pickerCon{
+        background: #B0CDFF;
+        box-shadow: 0px 4px 0px 0px #759CE4;
+        .pickerBox{
+            background: #EAF1FB;
+        }
+    }
+}
   .head {
       background: url("../../../../page-instrument/header-top/image/headImg.png") no-repeat;
       background-size: 100% 100%;
@@ -7,11 +33,11 @@
       position: relative;
       .headTit{
           position: absolute;
-          bottom: 9px;
+          bottom: 8px;
           left: 50%;
           transform: translateX(-50%);
-          width: 38px;
-          height: 18px;
+          width: 76px;
+          height: 20px;
       }        
       .closeImg{
           position: absolute;

src/view/plugins/toggleMusicSheet/choosePartName/index.tsx

@@ -39,7 +39,7 @@ export default defineComponent({
 			// console.log(myPicker.value,99999,selValues.value,props.partIndex)
 		});
     return () => (
-      <div class={[styles.container, state.platform === IPlatform.PC && styles.pcContainer]}>
+      <div class={[styles.container, state.platform === IPlatform.PC && styles.pcContainer, styles[state.modeType]]}>
         <div class={styles.head}>
           <img class={styles.headTit} src={changeName} />
           <img class={styles.closeImg} src={headImg("closeImg.png")} onClick={() => emit("close")} />