Merge branch 'Leaderboard-8.30' into dev

src/student/leaderboard/index.module.less

@@ -8,9 +8,9 @@
       height: 42px;
     }
     .van-tabs__nav {
-      background-color: rgba(0, 0, 0, 0.68);
-      backdrop-filter: blur(10px);
-      -webkit-backdrop-filter: blur(10px);
+      background: rgba(0, 0, 0, 0.68) !important;
+      backdrop-filter: blur(18px);
+      -webkit-backdrop-filter: blur(18px);
     }
     .van-tabs__line {
       background-color: transparent !important;
@@ -26,11 +26,14 @@
     }
   }
 }
+
 .tabContent {
   position: relative;
   padding: 12px;
   box-sizing: border-box;
   overflow-y: auto;
+  width: calc(100vw + 10px);
+  padding-right: 22px;
 }
 .tabContent.hasUser {
   padding-bottom: 80px;
@@ -80,7 +83,7 @@
   }
   .user {
     margin-left: 6px;
-    .userContent{
+    .userContent {
       display: flex;
       align-items: center;
       margin-bottom: 4px;
@@ -98,7 +101,7 @@
       margin-right: 4px;
       padding: 1px 2px;
     }
-    .times{
+    .times {
       font-size: 12px;
       color: #999;
     }

src/student/leaderboard/index.tsx

@@ -35,7 +35,8 @@ export default defineComponent({
       tabIndex: 0,
       musicList: [] as IMusicItem[],
       isSignup: false, // 是否报名
-      isChallenge: false // 是否挑战过
+      isChallenge: false, // 是否挑战过
+      score: 0
     })
     const getMusicList = async () => {
       try {
@@ -72,6 +73,9 @@ export default defineComponent({
         if (Array.isArray(data.rankingList)) {
           state.musicList[state.tabIndex].rankingList = data.rankingList
         }
+        if (data.userActivityRankingVo){
+          state.score = data.userActivityRankingVo.score
+        }
       } catch (error) {}
     }
     const img = ref()
@@ -102,7 +106,7 @@ export default defineComponent({
       step = step > -1 ? step + 1 : 0
       return {
         join: rank.join,
-        score: rank.score,
+        score: item?.score || 0,
         isTop: item ? true : false,
         heardUrl: userdata.heardUrl,
         username: userdata.username,
@@ -286,9 +290,12 @@ export default defineComponent({
                       return <div>您的评测暂未上榜，快去挑战吧！</div>
                     }
                   },
-                  value: () => (
-                    <span class={styles.num}>{user.value.score}分</span>
-                  )
+                  value: () => {
+                    if (!user.value.score && !state.score){
+                      return
+                    }
+                    return <span class={styles.num}>{user.value.score || state.score}分</span>
+                  }
                 }}
               />
             </div>