Merge branch 'ponline'

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

@@ -83,17 +83,13 @@ export default defineComponent({
       const compareTenantIds = [-1]
       const users = state.user.data || {}
       const tenantId = users?.tenantId
-      return compareTenantIds.includes(tenantId) || users.phone === '18888888888'
+      return compareTenantIds.includes(tenantId)
     })
 
      /** 当前用户会员状态 动态判断vip svip */
     const userMemberStatus = computed(() => {
       const userInfo = state.user.data || {}
-      if(userInfo.userVip?.vipType === 'NOT_VIP' || !userInfo.userVip?.vipType) {
-        return false
-      } else {
-        return true;
-      }
+      return userInfo.userVip?.vipType === 'NOT_VIP' || !userInfo.userVip?.vipType || users.phone === '18888888888'
     })
 
     const partColumns = ref<any>([])
@@ -884,17 +880,20 @@ export default defineComponent({
           </div>
           <div class={[styles.alumCollect]}>
             {/* 是会员 */}
-            {!hideTenantDownload.value && userMemberStatus.value && <div
+            {!hideTenantDownload.value && <div
               class={[
                 styles.alumCollectItem,
                 staffData.imgs.length <= 0 && !staffData.musicPdfUrl
                   ? styles.alumCollectItemActive
                   : ''
+                !userMemberStatus.value ? styles.alumCollectItemActive : ''
               ]}
               onClick={() => {
                 if (browser().isApp) {
                   if (staffData.imgs.length <= 0 && !staffData.musicPdfUrl)
                     return
+
+                  if(!userMemberStatus.value) return
                   if (staffData.musicPdfUrl) {
                     const songName =
                       staffData.details?.name +

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

@@ -1067,13 +1067,16 @@ export default defineComponent({
                   </div>
                 ) : null}
 
-                {!downloadHidden.value && userMemberStatus.value && <div
+                 <div
                   class={[styles.functionItem, (loading.value ||
-                    (!staffData.musicPdfUrl && staffData.imgs.length <= 0)) ? styles.disabled : '']}
+                    (!staffData.musicPdfUrl && staffData.imgs.length <= 0)) ? styles.disabled : '',
+                  !downloadHidden.value && userMemberStatus.value ? '' : styles.disabled]}
                   onClick={() => {
                     // console.log(loading.value, staffData.musicPdfUrl, staffData.imgs, '---------------')
                     if((loading.value ||
                       (!staffData.musicPdfUrl && staffData.imgs.length <= 0))) return
+
+                    if(!(!downloadHidden.value && userMemberStatus.value)) return
                     if (staffData.musicPdfUrl) {
                       const songName =
                         staffData.details?.name +
@@ -1098,7 +1101,7 @@ export default defineComponent({
                 >
                   <img src={iconDownload} />
                   <span>下载</span>
-                </div>}
+                </div>
               </div>
             </div>