瀏覽代碼

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

TIANYONG 8 月之前
父節點
當前提交
117943e1dd

+ 1 - 1
src/page-instrument/component/vip/index.tsx

@@ -85,7 +85,7 @@ export default defineComponent({
       })
       })
       return () => (
       return () => (
          <>
          <>
-            <Popup zIndex={9999999} show={vipData.show} get-container="body" closeable onClickCloseIcon={handleClose} round>
+            <Popup zIndex={999999999999999999} show={vipData.show} get-container="body" closeable onClickCloseIcon={handleClose} round>
                <div class={styles.vip}>
                <div class={styles.vip}>
                   <img src={TipsIcon} />
                   <img src={TipsIcon} />
                   <p>{getContent.value}</p>
                   <p>{getContent.value}</p>

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

@@ -668,8 +668,8 @@ export default defineComponent({
           }}
           }}
         >
         >
           {/* 返回和标题 */}
           {/* 返回和标题 */}
-          {!(followData.start || evaluatingData.startBegin) &&  (
-            <div id="noticeBarRollDom" class={[styles.headTopLeftBox, state.playState == "play" && styles.headTopLeftHide]}>
+          {
+            <div id="noticeBarRollDom" class={[styles.headTopLeftBox, (state.playState == "play" || followData.practiceStart || evaluatingData.startBegin) && styles.headTopLeftHide]}>
               {
               {
                 !query.isMove && !query.isHideBack && <img src={iconBack} class={["headTopBackBtn", styles.img, !headTopData.showBack && styles.hidenBack]} onClick={handleBack} />
                 !query.isMove && !query.isHideBack && <img src={iconBack} class={["headTopBackBtn", styles.img, !headTopData.showBack && styles.hidenBack]} onClick={handleBack} />
               }
               }
@@ -702,7 +702,7 @@ export default defineComponent({
                 )
                 )
               )}
               )}
             </div>
             </div>
-          )}
+          }
 
 
           {/* 模式提醒 */}
           {/* 模式提醒 */}
           {/* {state.modeType === "practise" && (
           {/* {state.modeType === "practise" && (

+ 1 - 1
src/view/plugins/toggleMusicSheet/choosePartName/index.module.less

@@ -43,7 +43,7 @@
         padding: 10px 0;
         padding: 10px 0;
         &.stickyTit{
         &.stickyTit{
           position: sticky;
           position: sticky;
-          top: 0;
+          top: -1px;
           background-color: #fff;
           background-color: #fff;
         }
         }
         .tit{
         .tit{