Merge branch 'iteraion-20240914-pdf'

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

@@ -926,11 +926,7 @@ export default defineComponent({
                     }}
                     // src={staffData.iframeSrc}
                     onLoad={() => {
-                      if (!defaultImgs.value[staff.radio]) {
-                        onChangeStaff(staff.radio)
-                      } else {
-                        musicIframeLoad()
-                      }
+                      musicIframeLoad()
                     }}
                   ></iframe>
                 </>
@@ -1009,7 +1005,6 @@ export default defineComponent({
                       }
                       const throttleFn = useThrottleFn(() => {
                         player.value && player.value.stop()
-                        console.log(partColumns.value, 'partColumns.value')
                         const item: any = partColumns.value.find(
                           (c: any) => c.value === staffData.partIndex
                         )
@@ -1112,7 +1107,10 @@ export default defineComponent({
           {downloadStatus.value && (
             <Download
               imgList={JSON.parse(JSON.stringify(showImg.value))}
-              musicSheetName={musicDetail.value.musicSheetName}
+              musicSheetName={musicDetail.value?.musicSheetName +
+                (staffData.instrumentName
+                  ? `(${staffData.instrumentName})`
+                  : '')}
             />
           )}
         </Popup>

src/views/music/component/song/index.tsx

@@ -99,9 +99,7 @@ export default defineComponent({
                     />
                   )}
                   <span class={[styles.name]}>
-                    {!n.composer
-                      ? `上传者：${n.addName}`
-                      : `作曲：${n.composer}`}
+                    {`上传者：${n.addName || '游客' + n.userId}`}
                   </span>
                   <div class={styles.tags}>
                     {n.musicSheetType === 'CONCERT' ? (

src/views/music/music-detail/index.module.less

@@ -452,6 +452,18 @@
     overflow: hidden;
     text-overflow: ellipsis;
     color: var(--van-primary);
+    display: flex;
+    align-items: center;
+    span {
+      line-height: 1;
+    }
+
+    .iconAlbum2 {
+      display: inline-block;
+      width: 15px;
+      height: 15px;
+      margin-right: 5px;
+    }
   }
 
   .tag {

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

@@ -41,6 +41,7 @@ import { browser, moneyFormat } from '@/helpers/utils'
 import { orderStatus } from '@/views/order-detail/orderStatus'
 import iconShare from '@/views/music/album/icon_share.svg'
 import iconAlbum from './images/icon_album.png'
+import iconAlbum2 from './images/icon_album2.png'
 import iconDownload from './images/icon_download.png'
 import iconChange from './images/icon-change.png'
 import iconAddCourse from './images/icon-add-course.png'
@@ -611,7 +612,6 @@ export default defineComponent({
           musicPdfUrl.value = staffData.partList[0]?.musicPdfUrl
         }
 
-        console.log(musicPdfUrl.value)
       } catch (error) {
         //
         console.log(error, 'error')
@@ -712,6 +712,7 @@ export default defineComponent({
         return {
           text: item.track + (instrumentName ? `(${instrumentName})` : ''),
           value: index,
+          instrumentName,
           musicPdfUrl: item.musicPdfUrl,
           firstPdfUrl: item.firstPdfUrl,
           jianPdfUrl: item.jianPdfUrl,
@@ -827,7 +828,8 @@ export default defineComponent({
                             })
                           }
                         }}>
-                          {musicDetail.value?.userName}
+                          <img class={styles.iconAlbum2} src={iconAlbum2} />
+                          <span>{musicDetail.value?.userName || '游客' + ( musicDetail.value?.userId  || '')}</span>
                         </span>
                       </p>
                     </div>
@@ -848,7 +850,7 @@ export default defineComponent({
                         }}
                       >
                         <img src={musicDetail.value?.coursewareStatus?iconRemoveCourse: iconAddCourse} />
-                        <span>添加课件</span>
+                        <span>{musicDetail.value?.coursewareStatus ? '移出课件':'添加课件'}</span>
                       </span>
                       <span
                         class={styles.download}
@@ -979,11 +981,7 @@ export default defineComponent({
                         }}
                         src={staffData.iframeSrc}
                         onLoad={() => {
-                          if (!defaultImgs.value[staff.radio]) {
-                            onChangeStaff(staff.radio)
-                          } else {
-                            musicIframeLoad()
-                          }
+                          musicIframeLoad()
                         }}
                       ></iframe>
                     </>
@@ -1193,7 +1191,10 @@ export default defineComponent({
             {downloadStatus.value && (
               <Download
                 imgList={JSON.parse(JSON.stringify(showImg.value))}
-                musicSheetName={musicDetail.value.musicSheetName}
+                musicSheetName={musicDetail.value?.musicSheetName +
+                  (staffData.instrumentName
+                    ? `(${staffData.instrumentName})`
+                    : '')}
               />
             )}
           </Popup>
@@ -1316,6 +1317,7 @@ export default defineComponent({
                 staffData.open = false
                 staffData.partIndex = value.value
                 staffData.partXmlIndex = value.xmlValue
+                staffData.instrumentName = value.instrumentName
                 showImg.value = []
                 nextTick(() => {
                   let tempPdf = value?.musicPdfUrl