فهرست منبع

Squashed commit of the following:

commit 2f1be7770fe45100efad00755504e531f21a7849
Merge: 43d520d47 f0faf9f53
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 19:32:14 2022 +0800

    Merge branch 'online' into Leaderboard-8.30

commit 43d520d477baadc668a66be826f260513461c755
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 19:18:53 2022 +0800

    fix

commit 60bb8107bfb98b08f200c67803a00f6e6e5e1dcc
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 19:17:41 2022 +0800

    fix

commit 044fcc970343ef0d92e626c353929a5fbe1c94ff
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 18:45:28 2022 +0800

    滚动条隐藏

commit a75c1faa265346a96b65a983cc7923da32dab68c
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 18:07:25 2022 +0800

    fix

commit aa0eb6c1b5bf8a4d0ffe0d8517d980ef1fbe8c8e
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 18:04:22 2022 +0800

    fix

commit 1425db77c90f97a95e182b1c8ef5dc03d2252841
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 18:01:01 2022 +0800

    fix

commit 24b483ceb728a8d27e0e17c2ebd898cd6bdcc078
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 17:59:59 2022 +0800

    fix

commit 80a9d2faeaf5a28208237e28142b1dd5f080ba33
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 17:46:53 2022 +0800

    fix

commit 852d8e9e74cd9319baccd5fd95c2678c2f942458
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 17:11:01 2022 +0800

    fix

commit 1b9684257ef59bbbf23c32282e563a828aa9b1cc
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 16:22:50 2022 +0800

    fix

commit 9ab41a9c39118a58209fdb0abf11279cebe580f5
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 16:16:50 2022 +0800

    老师查看排行榜

commit 11735b298069ee3b1434eb3601a64a90d6fc28df
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 16:10:37 2022 +0800

    fix

commit 69bd4750b11a6d50b1bb8bfd019c138d59439067
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 15:13:12 2022 +0800

    fix

commit 05976682f160cecc55844165c2d8c30d4d86e2a3
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 15:02:23 2022 +0800

    fix

commit 982064edb0bda05eb4cafb382884bc8333264f9f
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 14:49:39 2022 +0800

    fix

commit 0838e402b42cd4f766d223c1ba1fd6e73d16b66c
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 14:42:26 2022 +0800

    fix

commit 3dcc857d01b30a4228e09fa63210402274b03c24
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 14:37:28 2022 +0800

    fix

commit effc31179a896cb41a72853d73872feb1eadcfd5
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 14:13:10 2022 +0800

    fix

commit cbde7cf684605cfb4f71b1284fa2edb9edd7d9bd
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 14:03:43 2022 +0800

    老师端活动评测

commit 4c3ec3ac35cf785a20be281a611347296a6b5167
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 13:49:36 2022 +0800

    fix

commit ecc6eb581a1bbf663f5065775d7412761b729710
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 13:39:14 2022 +0800

    fix

commit c7a9c836b8603d59688f375fe7407f37b712a433
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 10:00:35 2022 +0800

    fix

commit 9473b11f25f5c20d227c58234b1e603ec1fada77
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 09:53:17 2022 +0800

    fix

commit 917e1e86ccae43495b7275c9e4d1fe698593a9a0
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 09:47:34 2022 +0800

    去掉挑战

commit 75cdd5d4da7cbb3a43a2b7d1a6b531ff1f3f1b62
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 09:41:13 2022 +0800

    fix2

commit 6e30eecb965d988feab395c9de738a3f9444131f
Author: skyblued <806020149@qq.com>
Date:   Wed Aug 31 09:30:32 2022 +0800

    fix

commit 33b8e2e3c568b08c58485dfb3b99c5264aff4332
Author: skyblued <806020149@qq.com>
Date:   Tue Aug 30 22:48:39 2022 +0800

    fix

commit 191cca1526fe88e67c106c4d523c60c05e4676d3
Author: skyblued <806020149@qq.com>
Date:   Tue Aug 30 22:40:27 2022 +0800

    fix

commit 18bf4f5a08a99eb10fcb40f8e73f4b8b2c9f4678
Author: skyblued <806020149@qq.com>
Date:   Tue Aug 30 22:27:33 2022 +0800

    评测排行榜
skyblued 3 سال پیش
والد
کامیت
5a95853b79
2فایلهای تغییر یافته به همراه20 افزوده شده و 10 حذف شده
  1. 8 5
      src/student/leaderboard/index.module.less
  2. 12 5
      src/student/leaderboard/index.tsx

+ 8 - 5
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;
     }

+ 12 - 5
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>