Browse Source

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

TIANYONG 8 months ago
parent
commit
aff123a1d4

+ 7 - 1
src/page-instrument/header-top/index.module.less

@@ -107,9 +107,15 @@
         width: 210px;
         margin-left: 10px;
         position: relative;
+        &.isIpad{
+            width: 138px;
+            .symbolNote{
+                max-width: calc(146px + 16px);
+            }
+        }
 
         .symbolNote {
-            max-width: calc(216px + 16px);
+            max-width: calc(212px + 16px);
             position: absolute;
             top: 0;
             left: 0;

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

@@ -649,7 +649,7 @@ export default defineComponent({
       store.set("musicscoresetting", state.setting);
     });
 
-
+    const isPad =  navigator?.userAgent?.includes("UAWEIVRD-W09") || browInfo?.iPad || browInfo.isTablet;
     return () => (
       <>
         <div
@@ -682,7 +682,7 @@ export default defineComponent({
                         }
                       : {}
                   }
-                  class={[styles.title, state.isCbsView && styles.blackTitle, "headeTopTitleBtn"]}
+                  class={[styles.title, state.isCbsView && styles.blackTitle, "headeTopTitleBtn", isPad && styles.isIpad]}
                   onClick={() => {
                     isMusicList.value && !state.isHomeWork && !query.isHideMusicList && (musicListShow.value = true);
                   }}

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

@@ -374,7 +374,7 @@
             width: 11px;
             height: 11px;
             border-radius: 50%;
-            background: #11FFD4;
+            background: #06E7BE;
             opacity: 0.5;
             &:nth-child(2){
                 opacity:1;

BIN
src/page-instrument/view-evaluat-report/component/share-top/image/ty.png


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

@@ -571,9 +571,9 @@
     position: absolute;
     top: 50%;
     left: 50%;
-    transform: translate(-50%, calc(-50% + 40px));
-    width: 184px;
-    height: 68px;
+    transform: translate(-50%, calc(-50% + 42px));
+    width: 199px;
+    height: 106px;
 }
 .playLarge {
     position: absolute;

BIN
src/view/abnormal-pop/icon_btn.png


+ 3 - 3
src/view/abnormal-pop/index.module.less

@@ -64,7 +64,7 @@
         }
     }
     .btn {
-        width: 104px;
+        width: 96px;
         height: 32px;
         &:active{
             opacity: 0.8;
@@ -124,7 +124,7 @@
         border: 1px solid rgba(255, 255, 255, 0.7);
         border-radius: 16px;
         text-align: center;
-        width: 104px;
+        width: 96px;
         height: 32px;
         box-sizing: border-box;
         &:active{
@@ -146,7 +146,7 @@
         width: 11px;
         height: 11px;
         border-radius: 50%;
-        background: #11FFD4;
+        background: #06E7BE;
         opacity: 0.5;
         &:nth-child(2){
             opacity:1;