Update index.module.less

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

@@ -87,216 +87,215 @@
         transition: padding-bottom .2s;
         overflow: hidden;
 
-        <<<<<<< HEAD :global {
-            ======= :global {
-                >>>>>>>feature-wxl-newVersion #musicAndSelection {
-                    // 其他位置 这个高度留白是36，这里加了一点，让旋律线靠下一点
-                    padding-top: 40px;
-                }
+        :global {
+            #musicAndSelection {
+                // 其他位置 这个高度留白是36，这里加了一点，让旋律线靠下一点
+                padding-top: 40px;
             }
         }
+    }
+
+    .pcContainer {
+        // height: calc(100vh - var(--header-height) - var(--pc-header-height));
+    }
+
+    .fingeringCon {
+        transition: scale 0.2s;
+    }
+}
+
 
-        .pcContainer {
-            // height: calc(100vh - var(--header-height) - var(--pc-header-height));
+:global {
+    #cursorImg-0 {
+        width: 2PX !important;
+        min-height: 58PX;
+        height: 58PX;
+        content: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
+        margin-top: -13PX;
+        border-radius: 4Px;
+        background-color: rgba(25, 140, 254, 0.7);
+        // opacity: var(--corsor-opacity);
+        //transform: translateX(10PX);
+        z-index: 1 !important;
+        opacity: 0; // 新版小酷AI不显示光标指针
+    }
+
+    .staff {
+        #cursorImg-0 {
+            width: 14Px;
+            transform: translateX(11Px);
         }
+    }
 
-        .fingeringCon {
-            transition: scale 0.2s;
+    .jianpuTone {
+        #cursorImg-0 {
+            width: 18Px;
+            transform: translateX(6.3Px) !important;
         }
     }
 
+    .eyeProtection {
+        #cursorImg-0 {
+            background-color: rgb(255, 159, 88);
+        }
+    }
+
+    #osmdCanvasPage1 {
+        //padding-bottom: 60px;
+    }
+}
+
+.xiaomi {
+    :global {
+        #cursorImg-0 {
+            height: 58PX !important;
+            min-height: auto !important;
+        }
+    }
+}
 
+.PC {
     :global {
         #cursorImg-0 {
-            width: 2PX !important;
-            min-height: 58PX;
-            height: 58PX;
-            content: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
-            margin-top: -13PX;
-            border-radius: 4Px;
-            background-color: rgba(25, 140, 254, 0.7);
-            // opacity: var(--corsor-opacity);
-            //transform: translateX(10PX);
-            z-index: 1 !important;
-            opacity: 0; // 新版小酷AI不显示光标指针
+            margin-top: -18PX;
+            min-height: 94Px;
+            border-radius: 10Px;
         }
 
         .staff {
             #cursorImg-0 {
-                width: 14Px;
-                transform: translateX(11Px);
+                width: 35Px;
+                transform: translateX(21Px) !important;
             }
         }
 
         .jianpuTone {
             #cursorImg-0 {
-                width: 18Px;
-                transform: translateX(6.3Px) !important;
+                width: 29Px;
+                transform: translateX(13Px) !important;
             }
         }
 
-        .eyeProtection {
-            #cursorImg-0 {
-                background-color: rgb(255, 159, 88);
-            }
+        .headTopBackBtn {
+            display: none;
         }
 
-        #osmdCanvasPage1 {
-            //padding-bottom: 60px;
-        }
-    }
+        .pcTitle {
+            position: absolute;
+            left: 20%;
+            top: 50%;
+            transform: translate(-50%, -50%);
 
-    .xiaomi {
-        :global {
-            #cursorImg-0 {
-                height: 58PX !important;
-                min-height: auto !important;
+            .van-notice-bar__wrap {
+                justify-content: center;
             }
         }
     }
 
-    .PC {
-        :global {
-            #cursorImg-0 {
-                margin-top: -18PX;
-                min-height: 94Px;
-                border-radius: 10Px;
-            }
-
-            .staff {
-                #cursorImg-0 {
-                    width: 35Px;
-                    transform: translateX(21Px) !important;
-                }
-            }
-
-            .jianpuTone {
-                #cursorImg-0 {
-                    width: 29Px;
-                    transform: translateX(13Px) !important;
-                }
-            }
-
-            .headTopBackBtn {
-                display: none;
-            }
+    .headHeight.headHide {
+        // margin-top: 0 !important;
+    }
+}
 
-            .pcTitle {
-                position: absolute;
-                left: 20%;
-                top: 50%;
-                transform: translate(-50%, -50%);
 
-                .van-notice-bar__wrap {
-                    justify-content: center;
-                }
-            }
-        }
+.preViewDetail {
+    background: #fff !important;
 
-        .headHeight.headHide {
-            // margin-top: 0 !important;
-        }
+    >.pageBg {
+        display: none;
     }
 
-
-    .preViewDetail {
+    .headHeight {
         background: #fff !important;
+    }
 
-        >.pageBg {
-            display: none;
-        }
-
-        .headHeight {
-            background: #fff !important;
-        }
+    .container {
+        height: 100%;
+        padding-bottom: 0 !important;
+        padding-right: 0 !important;
+    }
 
-        .container {
-            height: 100%;
+    :global {
+        #osmdCanvasPage1 {
             padding-bottom: 0 !important;
-            padding-right: 0 !important;
         }
 
-        :global {
-            #osmdCanvasPage1 {
-                padding-bottom: 0 !important;
-            }
+        #cursorImg-0 {
+            opacity: 0 !important;
+        }
 
-            #cursorImg-0 {
-                opacity: 0 !important;
+        .noteActive {
+            path {
+                fill: #000000;
+                stroke: #000000;
             }
 
-            .noteActive {
-                path {
-                    fill: #000000;
-                    stroke: #000000;
-                }
-
-                rect {
-                    stroke: #000000;
-                }
+            rect {
+                stroke: #000000;
             }
         }
     }
+}
 
-    .preJson {
-        width: 1px;
-        height: 1px;
-        visibility: hidden;
-        background: transparent;
-        opacity: 0;
-    }
+.preJson {
+    width: 1px;
+    height: 1px;
+    visibility: hidden;
+    background: transparent;
+    opacity: 0;
+}
 
-    @keyframes headerDown {
-        100% {
-            transform: translateY(0%);
-        }
+@keyframes headerDown {
+    100% {
+        transform: translateY(0%);
     }
+}
 
-    .loadingPop {
-        position: fixed;
-        left: 0;
-        top: 0;
-        right: 0;
-        bottom: 0;
-        width: 100vw;
-        height: 100vh;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        z-index: 10000;
-        background: rgba(0, 0, 0, .6);
-
-        &.isPreView {
-            background: transparent;
-
-            .loadingTip {
-                color: #999;
-            }
-        }
-
-        .lottie {
-            width: 120px;
-        }
+.loadingPop {
+    position: fixed;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    width: 100vw;
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    z-index: 10000;
+    background: rgba(0, 0, 0, .6);
+
+    &.isPreView {
+        background: transparent;
 
         .loadingTip {
-            font-size: 14px;
-            color: #fff;
+            color: #999;
         }
     }
 
-    .bg2Left {
-        width: 52px;
-        height: 125px;
-        position: absolute;
-        left: 0;
-        top: 0;
+    .lottie {
+        width: 120px;
     }
 
-    .bg2Right {
-        width: 52px;
-        height: 125px;
-        position: absolute;
-        right: 0;
-        top: 0;
-    }
+    .loadingTip {
+        font-size: 14px;
+        color: #fff;
+    }
+}
+
+.bg2Left {
+    width: 52px;
+    height: 125px;
+    position: absolute;
+    left: 0;
+    top: 0;
+}
+
+.bg2Right {
+    width: 52px;
+    height: 125px;
+    position: absolute;
+    right: 0;
+    top: 0;
+}