Merge branch 'hqy节奏律动' of http://git.dayaedu.com/liushengqiang/music-score into ktyq-test-new

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

@@ -182,7 +182,7 @@ export default defineComponent({
                   <span>暂无内容</span>
                 </div>}
         </List>
-        <Popup  style={positionInfo.styleDrag.value} v-model:show={filterShow.value} class="popup-custom van-scale center-closeBtn musicListClass_drag" transition="van-scale" teleport="body" overlay-style={{ background: "rgba(0, 0, 0, 0.6)" }}>
+        <Popup  style={positionInfo.styleDrag.value} v-model:show={filterShow.value} class="popup-custom van-scale center-closeBtn musicListClass_drag" transition="van-scale" teleport="body" overlay-style={{ background: "rgba(0, 0, 0, 0.7)" }}>
           <FilterList onClose={() => { filterShow.value = false }} onHandleConfirm={(queryObj) => {
             filterShow.value = false
             forms.audioPlayTypes = queryObj.audioPlayTypes

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

@@ -6,12 +6,12 @@
     flex-shrink: 0;
     margin-left: calc(-1 * var(--detailDataPaddingLeft));
     padding: 0 30px;
-    background: linear-gradient( 180deg, rgba(255,255,255,0) 0%, rgba(255,255,255,0.7) 19%, rgba(255,255,255,0.9) 100%);
+    background: linear-gradient( 180deg, rgba(255,255,255,0) 0%, rgba(255,255,255,0.8) 19%, rgba(255,255,255,1) 100%);
     &.follow{
-        background: linear-gradient( 180deg, rgba(255,255,255,0) 0%, rgba(240,250,252,0.7) 19%, rgba(255,255,255,0.9) 100%);
+        background: linear-gradient( 180deg, rgba(255,255,255,0) 0%, rgba(240,250,252,0.8) 19%, rgba(255,255,255,1) 100%);
     }
     &.evaluating{
-        background: linear-gradient( 180deg, rgba(255,255,255,0) 0%, rgba(221,248,254,0.7) 19%, rgba(225,242,251,0.9) 100%);
+        background: linear-gradient( 180deg, rgba(255,255,255,0) 0%, rgba(221,248,254,0.8) 19%, rgba(225,242,251,1) 100%);
     }
     &.headerTopRight {
         justify-content: flex-end;
@@ -198,6 +198,9 @@
 
             >img:nth-child(2) {
                 content: url("./image/backgroundAct.png");
+            }            
+            >img:nth-child(3) {
+                content: url("./image/mingsongAct.png");
             }
         }
 

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

@@ -966,7 +966,7 @@ export default defineComponent({
                   </div>
                 </div>
                 {
-                  <Popup v-model:show={headData.speedShow} class="popup-custom van-scale center-closeBtn speedBoxClass_drag" transition="van-scale" teleport="body" style={speedInfo.styleDrag.value} overlay-style={{ background: "rgba(0, 0, 0, 0.6)" }}>
+                  <Popup v-model:show={headData.speedShow} class="popup-custom van-scale center-closeBtn speedBoxClass_drag" transition="van-scale" teleport="body" style={speedInfo.styleDrag.value} overlay-style={{ background: "rgba(0, 0, 0, 0.7)" }}>
                     <Speed />
                     {state.platform === IPlatform.PC && <Dragbom showGuide={!state.guideInfo?.teacherDrag} onGuideDone={handleGuide} />}
                   </Popup>
@@ -1072,7 +1072,7 @@ export default defineComponent({
           <img class={styles.iconBtn} src={headImg("icon_reset.png")} />
         </div>
 
-        <Popup v-model:show={headTopData.settingMode} class="popup-custom van-scale center-closeBtn settingBoxClass_drag" transition="van-scale" teleport="body" style={positionInfo.styleDrag.value} overlay-style={{ background: "rgba(0, 0, 0, 0.6)" }}>
+        <Popup v-model:show={headTopData.settingMode} class="popup-custom van-scale center-closeBtn settingBoxClass_drag" transition="van-scale" teleport="body" style={positionInfo.styleDrag.value} overlay-style={{ background: "rgba(0, 0, 0, 0.7)" }}>
           <Settting />
           {state.platform === IPlatform.PC && <Dragbom showGuide={!state.guideInfo?.teacherDrag} onGuideDone={handleGuide} />}
         </Popup>
@@ -1118,7 +1118,7 @@ export default defineComponent({
         )}
 
         {/** 评测作业，没有完成时，提示弹窗 */}
-        <Popup v-model:show={headTopData.workHomeNoDone} class="popup-custom van-scale center-closeBtn" transition="van-scale" teleport="body" style={positionInfo.styleDrag.value} overlay-style={{ background: "rgba(0, 0, 0, 0.6)" }}>
+        <Popup v-model:show={headTopData.workHomeNoDone} class="popup-custom van-scale center-closeBtn" transition="van-scale" teleport="body" style={positionInfo.styleDrag.value} overlay-style={{ background: "rgba(0, 0, 0, 0.7)" }}>
           <WorkHomePop onClose={handleResult} />
         </Popup>
       </>

src/page-instrument/view-evaluat-report/component/share-top/index.module.less

@@ -404,9 +404,9 @@
         }
         .audioBga{
             position: absolute;
-            width: 110%;
+            width: 120%;
             top: 44%;
-            transform: translate(-5%, -50%);
+            transform: translate(-10%, -50%);
         }
         .audioVisualizer {
             position: absolute;

src/view/selection/index.module.less

@@ -143,7 +143,7 @@
     height: 20px;
     border-radius: 50%;
     background-color: #0EA7FF;
-    color: #673207;
+    color: #ffffff;
     font-size: 14px;
     font-weight: 600;
 }

src/view/tick/index.tsx

@@ -129,10 +129,10 @@ export const handleStartTick = async () => {
 export default defineComponent({
 	name: "metronome",
 	setup() {
-		const posObj = {
+		const posObj = reactive({
 			top: "0px",
 			left: "0px"
-		}
+		})
 		function initPos() {
 			const musicAndSelectionDom = document.querySelector("#musicAndSelection")
 			const osmdSvgPage1Dom = musicAndSelectionDom?.querySelector("#osmdSvgPage1")
@@ -141,7 +141,7 @@ export default defineComponent({
 			const osmdSvgPage1DomPos = osmdSvgPage1Dom?.getBoundingClientRect()
 			const stafflineDomPos = stafflineDom?.getBoundingClientRect()
 			Object.assign(posObj,{
-				top: (osmdSvgPage1DomPos?.top||0)-(musicAndSelectionDomPos?.top||0)-18+"px",
+				top: (osmdSvgPage1DomPos?.top||0)-(musicAndSelectionDomPos?.top||0)+13+"px",
 				left: (stafflineDomPos?.left||0)-(osmdSvgPage1DomPos?.left||0)+"px"
 			})
 		}