skyblued 2 éve
szülő
commit
24b483ceb7
1 módosított fájl, 28 hozzáadás és 14 törlés
  1. 28 14
      src/student/leaderboard/index.tsx

+ 28 - 14
src/student/leaderboard/index.tsx

@@ -35,7 +35,7 @@ export default defineComponent({
       tabIndex: 0,
       musicList: [] as IMusicItem[],
       isSignup: false, // 是否报名
-      isChallenge: false, // 是否挑战过
+      isChallenge: false // 是否挑战过
     })
     const getMusicList = async () => {
       try {
@@ -47,7 +47,10 @@ export default defineComponent({
             n.rankingList = []
             return n
           })
-          state.isChallenge = data.activityMusicVoList.filter(n => n.join).length ? true :false
+          state.isChallenge = data.activityMusicVoList.filter(n => n.join)
+            .length
+            ? true
+            : false
         }
         img.value = data.subjectUrl
         state.isSignup = data.join ? true : false
@@ -119,11 +122,9 @@ export default defineComponent({
               src={img.value}
               onLoad={img => {
                 nextTick(() => {
-                  const {height: height1} = useRect(imgRef)
-                  const {height: height2} = useRect(userRef)
-                  // console.log(height1, height2)
+                  const { height } = useRect(imgRef)
                   imgShow.value = true
-                  imgHeight.value = height1 + height2 || 100
+                  imgHeight.value = height || 100
                 })
               }}
               onError={err => {
@@ -147,9 +148,9 @@ export default defineComponent({
                     <div
                       class={[
                         styles.tabContent,
-                        state.isSignup && !user.value.join
-                          ? null
-                          : null//styles.hasUser
+                        !state.isSignup || !state.isChallenge || user.value.join
+                          ? styles.hasUser
+                          : null
                       ]}
                       style={{ height: `calc(100vh - ${imgHeight.value}px)` }}
                     >
@@ -177,7 +178,9 @@ export default defineComponent({
                                 />
                                 <div class={styles.user}>
                                   <div class={styles.userContent}>
-                                    <span class={styles.name}>{n.username}</span>
+                                    <span class={styles.name}>
+                                      {n.username}
+                                    </span>
                                     <span class={styles.tag}>
                                       {n.userSubject}
                                     </span>
@@ -187,7 +190,9 @@ export default defineComponent({
                               </div>
                               <div class={styles.right}>
                                 <div class={styles.fraction}>{n.score}分</div>
-                                <div class={styles.time}>第 {n.times} 次评测</div>
+                                <div class={styles.time}>
+                                  第 {n.times} 次评测
+                                </div>
                               </div>
                             </div>
                           )
@@ -207,7 +212,10 @@ export default defineComponent({
             </Tabs>
           )}
           {!state.isSignup ? (
-            <div ref={userRef} class={[styles.activeUser, 'van-safe-area-bottom']}>
+            <div
+              ref={userRef}
+              class={[styles.activeUser, 'van-safe-area-bottom']}
+            >
               <Cell
                 center
                 title={user.value.username}
@@ -225,7 +233,10 @@ export default defineComponent({
               />
             </div>
           ) : !state.isChallenge ? (
-            <div ref={userRef} class={[styles.activeUser, 'van-safe-area-bottom']}>
+            <div
+              ref={userRef}
+              class={[styles.activeUser, 'van-safe-area-bottom']}
+            >
               <Cell
                 center
                 title={user.value.username}
@@ -243,7 +254,10 @@ export default defineComponent({
               />
             </div>
           ) : user.value.join ? (
-            <div ref={userRef} class={[styles.activeUser, 'van-safe-area-bottom']}>
+            <div
+              ref={userRef}
+              class={[styles.activeUser, 'van-safe-area-bottom']}
+            >
               <Cell
                 center
                 title={user.value.username}