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

src/page-instrument/component/vip/index.module.less

@@ -25,3 +25,9 @@
     top: 10px;
   }
 }
+.vipPopup{
+  pointer-events: initial !important;
+  & *{
+    pointer-events: initial !important;
+  }
+}

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

@@ -8,7 +8,7 @@ import { storeData } from "/src/store"
 import { postMessage } from "/src/utils/native-message"
 import { usePageVisibility } from "@vant/use"
 import { studentQueryUserInfo } from "/src/page-instrument/api"
-import { api_back } from "/src/helpers/communication";
+import { api_back } from "/src/helpers/communication"
 
 export const vipData = reactive({
    show: false
@@ -85,7 +85,17 @@ export default defineComponent({
       })
       return () => (
          <>
-            <Popup zIndex={999999999999999999} show={vipData.show} get-container="body" closeable onClickCloseIcon={handleClose} round>
+            <Popup
+               class={styles.vipPopup}
+               zIndex={2222222222}
+               show={vipData.show}
+               /* 引导页层级和引导页禁止了pointerEvents */
+               overlay-style={{ zIndex: 1111111111, pointerEvents: "initial" }}
+               teleport="body"
+               closeable
+               onClickCloseIcon={handleClose}
+               round
+            >
                <div class={styles.vip}>
                   <img src={TipsIcon} />
                   <p>{getContent.value}</p>

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

@@ -435,9 +435,7 @@ export default defineComponent({
     watch(
       () => state.playState,
       () => {
-        // if (state.platform != IPlatform.PC) {
-        //   headerColumnHide.value = state.playState === "play" ? true : false;
-        // }
+        _timeColumnHide && clearTimeout(_timeColumnHide)
         headerColumnHide.value = state.playState === "play" ? true : false;
         sendParentMessage(state.playState);
       }
@@ -446,6 +444,7 @@ export default defineComponent({
     watch(
       () => followData.practiceStart,
       () => {
+        _timeColumnHide && clearTimeout(_timeColumnHide)
         headerColumnHide.value = followData.practiceStart;
       }
     );
@@ -453,6 +452,7 @@ export default defineComponent({
     watch(
       () => evaluatingData.startBegin,
       () => {
+        _timeColumnHide && clearTimeout(_timeColumnHide)
         headerColumnHide.value = evaluatingData.startBegin;
       }
     );    
@@ -515,6 +515,7 @@ export default defineComponent({
       detailData.fingerPreView = false;
       detailData.fingerPreViewGuide = false;
     };
+    let _timeColumnHide: NodeJS.Timeout
     return () => (
       <div
         class={[styles.detail, styles[state.modeType], state.setting.eyeProtection && "eyeProtection", state.platform === IPlatform.PC && state.zoom > 0.8 && styles.PC, state.isPreView && styles.preViewDetail, state.isCbsView && styles.cbsViewDetail]}
@@ -546,12 +547,16 @@ export default defineComponent({
           class={[styles.container, !state.setting.displayCursor && "hideCursor", browsInfo.xiaomi && styles.xiaomi, state.platform === IPlatform.PC && styles.pcContainer]}
           onClick={(e: Event) => {
             e.stopPropagation();
-            // if (state.playState === "play" && state.platform != IPlatform.PC) {
-            //   headerColumnHide.value = !headerColumnHide.value;
-            // }
             // 点击谱面跟练也需要切换显示按钮栏
             if (state.playState === "play" || followData.start || evaluatingData.startBegin) {
+              _timeColumnHide && clearTimeout(_timeColumnHide)
               headerColumnHide.value = !headerColumnHide.value;
+              if(!headerColumnHide.value){
+                _timeColumnHide = setTimeout(() => {
+                  _timeColumnHide && clearTimeout(_timeColumnHide)
+                  headerColumnHide.value = true
+                }, 3000);
+              }
             }
           }}
         >