Merge branch 'iteraion-20240914-pdf'

src/tenant/music/music-detail/new-index.module.less

@@ -533,16 +533,32 @@
   }
 }
 
+
+.staffChange {
+  --van-popup-close-icon-color: #999495;
+  --van-popup-close-icon-size: 19px;
+  :global {
+    .van-popup__close-icon {
+      // color: #999495;
+      right: 20px !important;
+    }
+  }
+}
+
+
 .staffContainer {
   background: linear-gradient(180deg, #ffeaee 0%, #ffffff 100%) no-repeat;
   background-size: 100% 59px;
   // text-align: center;
   padding: 15px 15px 24px;
 
+  
+
   .staffTitle {
-    padding-bottom: 25px;
-    font-size: 16px;
-    color: #1a1a1a;
+    padding-bottom: 20px;
+    font-size: 18px;
+    color: #131415;
+    font-weight: 600;
     line-height: 22px;
     text-align: center;
   }
@@ -553,8 +569,8 @@
   }
 
   .name {
-    padding-left: 17px;
-    font-size: 14px;
+    padding-left: 14px;
+    font-size: 15px;
     color: #333333;
   }
 
@@ -674,10 +690,6 @@
   }
 }
 
-.staffChange {
-  --van-popup-close-icon-color: #4c4949;
-  --van-popup-close-icon-size: 18px;
-}
 
 .staffIframe {
   // margin-top: -60px;

src/tenant/music/music-detail/new-index.tsx

@@ -881,7 +881,7 @@ export default defineComponent({
             切换声轨
           </span>
 
-          {musicDetail.value?.musicSheetType === 'CONCERT' ||
+          {musicDetail.value?.musicSheetType === 'CONCERT' || musicPdfUrl.value ||
           !defaultImgs.value[staff.radio] ? (
             <>
               {musicPdfUrl.value ? (
@@ -1122,7 +1122,7 @@ export default defineComponent({
           round
         >
           <div class={styles.staffContainer}>
-            <div class={styles.staffTitle}>选择转换曲谱</div>
+            <div class={styles.staffTitle}>转换曲谱</div>
             <RadioGroup v-model={staff.radio}>
               <CellGroup border={false}>
                 <Cell

src/views/music/music-detail/index.tsx

@@ -921,7 +921,7 @@ export default defineComponent({
             </div>
 
             <div class={styles.musicContent}>
-              {musicDetail.value?.musicSheetType === 'CONCERT' ||
+              {musicDetail.value?.musicSheetType === 'CONCERT' || musicPdfUrl.value ||
               !defaultImgs.value[staff.radio] ? (
                 <>
                   {musicPdfUrl.value ? (