Prechádzať zdrojové kódy

Merge branch 'iteration-20250103'

lex-xin 1 mesiac pred
rodič
commit
3e3c91abbe

BIN
dist/assets/kefu2.190464dd.png


+ 4 - 3
src/tenant/music/music-detail/new-index.module.less

@@ -206,7 +206,8 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    width: 50%;
+    // width: 50%;
+    flex: 1;
     height: 36px;
     font-size: 14px;
     color: #fff;
@@ -214,7 +215,7 @@
     border-radius: 99px;
     font-weight: 600;
 
-    &:last-child {
+    & + .alumCollectItem {
       margin-left: 15px;
     }
 
@@ -555,7 +556,7 @@
   // text-align: center;
   padding: 15px 15px 24px;
 
-  
+
 
   .staffTitle {
     padding-bottom: 20px;

+ 15 - 10
src/tenant/music/music-detail/new-index.tsx

@@ -78,6 +78,13 @@ export default defineComponent({
     const heightInfo = ref<any>('0')
     const audioFileUrl = ref('')
 
+    // 特殊机构隐藏下载按钮
+    const hideTenantDownload = computed(() => {
+      const compareTenantIds = [-1]
+      const tenantId = state.user.data?.tenantId
+      return compareTenantIds.includes(tenantId)
+    })
+
     const partColumns = ref<any>([])
     const downloadStatus = ref<boolean>(false)
     const staff = reactive({
@@ -248,18 +255,16 @@ export default defineComponent({
       window.addEventListener('message', showLoading)
 
       // 判断是否有曲目编号 如果没有则记录日志
-      if(!route.query.id) {
+      if (!route.query.id) {
         const historyState = router.options.history.state
-        const contentError = `Error message: history url:${ historyState.back }、 current url${historyState.current};message: id is undefined;fileUrl: ${
-          window.location.href
-        }`;
+        const contentError = `Error message: history url:${historyState.back}、 current url${historyState.current};message: id is undefined;fileUrl: ${window.location.href}`
         useErrorLogHook.uploadSingleErrorLog({
           appKey: 'KLX',
           clientType: state.platformType,
           phone: state.user.data?.phone,
           userAgent: window.navigator.userAgent,
           content: contentError,
-          exceptionTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+          exceptionTime: dayjs().format('YYYY-MM-DD HH:mm:ss')
         })
       }
     })
@@ -584,11 +589,11 @@ export default defineComponent({
 
       if (row.musicSheetType === 'SINGLE') {
         staffData.musicPdfUrl = getCurrentPdf(row, row.scoreType)
-        staffData.isConcert = false;
+        staffData.isConcert = false
         // 生成的图片
         // staffData.imgs = row.musicImg ? row.musicImg.split(',') : [];
       } else {
-        staffData.isConcert = true;
+        staffData.isConcert = true
         // 初始化数据
         // 是否显示总谱
         if (staffData.isComberRender) {
@@ -867,7 +872,7 @@ export default defineComponent({
             </div>
           </div>
           <div class={[styles.alumCollect]}>
-            <div
+            {!hideTenantDownload.value && <div
               class={[
                 styles.alumCollectItem,
                 staffData.imgs.length <= 0 && !staffData.musicPdfUrl
@@ -901,7 +906,7 @@ export default defineComponent({
             >
               <img src={iconDownload} />
               <span>下载曲谱</span>
-            </div>
+            </div>}
 
             <div
               class={styles.alumCollectItem}
@@ -966,7 +971,7 @@ export default defineComponent({
             }}
             onClick={() => {
               staffData.open = true
-              staffData.closed = false;
+              staffData.closed = false
             }}
           >
             切换声轨