Merge branch 'iteration-20231012'

src/tenant/ranking-list/index.tsx

@@ -156,183 +156,177 @@ export default defineComponent({
         </div>
 
         {/* {state.beforListShow && ( */}
-          <div class={styles.rankContainer}>
-            <div class={styles.rankLevel}>
-              <div class={[styles.levelItem, styles.level2]}>
-                {state.secondInfo.userId ? (
-                  <>
-                    <div class={styles.levelUserImg}>
-                      <Image
-                        class={styles.img}
-                        src={state.secondInfo.avatar || studentLogo}
-                      />
-                    </div>
-                    <h2 class={'van-ellipsis'}>
-                      {state.secondInfo.studentName}
-                    </h2>
-                    <p class={[styles.levelTime, 'van-ellipsis']}>
-                      {state.secondInfo.subjectName}-
-                      {state.secondInfo.trainTime}
-                      分钟
-                    </p>
-                  </>
-                ) : (
-                  <>
-                    <div class={styles.levelUserImg}>
-                      <Image class={styles.img} src={emptyLogo} />
-                    </div>
-                    <h2 class={'van-ellipsis'}>虚位以待</h2>
-                    <p class={[styles.levelTime, 'van-ellipsis']}>&nbsp;</p>
-                  </>
-                )}
+        <div class={styles.rankContainer}>
+          <div class={styles.rankLevel}>
+            <div class={[styles.levelItem, styles.level2]}>
+              {state.secondInfo.userId ? (
+                <>
+                  <div class={styles.levelUserImg}>
+                    <Image
+                      class={styles.img}
+                      src={state.secondInfo.avatar || studentLogo}
+                    />
+                  </div>
+                  <h2 class={'van-ellipsis'}>{state.secondInfo.studentName}</h2>
+                  <p class={[styles.levelTime, 'van-ellipsis']}>
+                    {state.secondInfo.subjectName}-{state.secondInfo.trainTime}
+                    分钟
+                  </p>
+                </>
+              ) : (
+                <>
+                  <div class={styles.levelUserImg}>
+                    <Image class={styles.img} src={emptyLogo} />
+                  </div>
+                  <h2 class={'van-ellipsis'}>虚位以待</h2>
+                  <p class={[styles.levelTime, 'van-ellipsis']}>&nbsp;</p>
+                </>
+              )}
+            </div>
+            <div class={[styles.levelItem, styles.level1]}>
+              {state.firstInfo.userId ? (
+                <>
+                  <div class={styles.levelUserImg}>
+                    <Image
+                      class={styles.img}
+                      src={state.firstInfo.avatar || studentLogo}
+                    />
+                  </div>
+                  <h2 class={'van-ellipsis'}>{state.firstInfo.studentName}</h2>
+                  <p class={[styles.levelTime, 'van-ellipsis']}>
+                    {state.firstInfo.subjectName}-{state.firstInfo.trainTime}
+                    分钟
+                  </p>
+                </>
+              ) : (
+                <>
+                  <div class={styles.levelUserImg}>
+                    <Image class={styles.img} src={emptyLogo} />
+                  </div>
+                  <h2 class={'van-ellipsis'}>虚位以待</h2>
+                  <p class={[styles.levelTime, 'van-ellipsis']}>&nbsp;</p>
+                </>
+              )}
+            </div>
+            <div class={[styles.levelItem, styles.level3]}>
+              {state.threeInfo.userId ? (
+                <>
+                  <div class={styles.levelUserImg}>
+                    <Image
+                      class={styles.img}
+                      src={state.threeInfo.avatar || studentLogo}
+                    />
+                  </div>
+                  <h2 class={'van-ellipsis'}>{state.threeInfo.studentName}</h2>
+                  <p class={[styles.levelTime, 'van-ellipsis']}>
+                    {state.threeInfo.subjectName}-{state.threeInfo.trainTime}
+                    分钟
+                  </p>
+                </>
+              ) : (
+                <>
+                  <div class={styles.levelUserImg}>
+                    <Image class={styles.img} src={emptyLogo} />
+                  </div>
+                  <h2 class={'van-ellipsis'}>虚位以待</h2>
+                  <p class={[styles.levelTime, 'van-ellipsis']}>&nbsp;</p>
+                </>
+              )}
+            </div>
+          </div>
+
+          <div class={styles.rankList}>
+            <div class={styles.rankTitle}>
+              <div class={styles.titleName}>
+                <img src={isDayRank.value ? dayTitle : timeTitle} />
               </div>
-              <div class={[styles.levelItem, styles.level1]}>
-                {state.firstInfo.userId ? (
-                  <>
-                    <div class={styles.levelUserImg}>
+              <span
+                class={styles.timeRange}
+                onClick={() => (state.showPopoverTime = true)}
+              >
+                {dayjs(forms.startTime).format('YYYY-MM-DD')}至
+                {dayjs(forms.endTime).format('YYYY-MM-DD')}
+                <i class={styles.iconArrow}></i>
+              </span>
+            </div>
+
+            {state.list.map((item: any) => (
+              // i == 4 && styles.active
+              <Cell
+                class={[
+                  styles.rankItem,
+                  state.myInfo.userId === item.userId ? styles.active : ''
+                ]}
+                border={false}
+                center
+              >
+                {{
+                  icon: () => (
+                    <>
+                      <span class={styles.num}>{item.rankNum}</span>
                       <Image
-                        class={styles.img}
-                        src={state.firstInfo.avatar || studentLogo}
+                        class={styles.userImg}
+                        src={item.avatar || studentLogo}
                       />
+                    </>
+                  ),
+                  title: () => (
+                    <div class={styles.userInfo}>
+                      <p class={styles.userName}>{item.studentName}</p>
+                      <p class={styles.subjectName}>{item.subjectName}</p>
                     </div>
-                    <h2 class={'van-ellipsis'}>{state.firstInfo.studentName}</h2>
-                    <p class={[styles.levelTime, 'van-ellipsis']}>
-                      {state.firstInfo.subjectName}-{state.firstInfo.trainTime}分钟
-                    </p>
-                  </>
-                ) : (
-                  <>
-                    <div class={styles.levelUserImg}>
-                      <Image class={styles.img} src={emptyLogo} />
+                  ),
+                  value: () => (
+                    <div class={styles.times}>
+                      <span>{item.trainTime}</span>分钟
                     </div>
-                    <h2 class={'van-ellipsis'}>虚位以待</h2>
-                    <p class={[styles.levelTime, 'van-ellipsis']}>&nbsp;</p>
-                  </>
-                )}
-              </div>
-              <div class={[styles.levelItem, styles.level3]}>
-                {state.threeInfo.userId ? (
-                  <>
-                    <div class={styles.levelUserImg}>
+                  )
+                }}
+              </Cell>
+            ))}
+
+            {!state.loading && !state.listShow && (
+              <ColResult tips="暂无数据" btnStatus={false} />
+            )}
+          </div>
+          {state.myInfo?.userId ? (
+            <TheSticky position="bottom">
+              <Cell class={styles.selfInfo} border={false} center>
+                {{
+                  icon: () => (
+                    <>
+                      <span class={styles.num}>
+                        {state.myInfo.rankNum == -1
+                          ? '-'
+                          : state.myInfo.rankNum}
+                      </span>
                       <Image
-                        class={styles.img}
-                        src={state.threeInfo.avatar || studentLogo}
+                        src={state.myInfo.avatar || studentLogo}
+                        class={styles.userImg}
                       />
+                    </>
+                  ),
+                  title: () => (
+                    <div class={styles.userInfo}>
+                      <p class={styles.userName}>{state.myInfo.studentName}</p>
+                      <p class={styles.subjectName}>
+                        {state.myInfo.subjectName}
+                      </p>
                     </div>
-                    <h2 class={'van-ellipsis'}>
-                      {state.threeInfo.studentName}
-                    </h2>
-                    <p class={[styles.levelTime, 'van-ellipsis']}>
-                      {state.threeInfo.subjectName}-{state.threeInfo.trainTime}
-                      分钟
-                    </p>
-                  </>
-                ) : (
-                  <>
-                    <div class={styles.levelUserImg}>
-                      <Image class={styles.img} src={emptyLogo} />
+                  ),
+                  value: () => (
+                    <div class={styles.times}>
+                      <span>{state.myInfo.trainTime}</span>分钟
                     </div>
-                    <h2 class={'van-ellipsis'}>虚位以待</h2>
-                    <p class={[styles.levelTime, 'van-ellipsis']}>&nbsp;</p>
-                  </>
-                )}
-              </div>
-            </div>
-
-            <div class={styles.rankList}>
-              <div class={styles.rankTitle}>
-                <div class={styles.titleName}>
-                  <img src={isDayRank.value ? dayTitle : timeTitle} />
-                </div>
-                <span
-                  class={styles.timeRange}
-                  onClick={() => (state.showPopoverTime = true)}
-                >
-                  {dayjs(forms.startTime).format('YYYY-MM-DD')}至
-                  {dayjs(forms.endTime).format('YYYY-MM-DD')}
-                  <i class={styles.iconArrow}></i>
-                </span>
-              </div>
-
-              {state.list.map((item: any) => (
-                // i == 4 && styles.active
-                <Cell
-                  class={[
-                    styles.rankItem,
-                    state.myInfo.userId === item.userId ? styles.active : ''
-                  ]}
-                  border={false}
-                  center
-                >
-                  {{
-                    icon: () => (
-                      <>
-                        <span class={styles.num}>{item.rankNum}</span>
-                        <Image
-                          class={styles.userImg}
-                          src={item.avatar || studentLogo}
-                        />
-                      </>
-                    ),
-                    title: () => (
-                      <div class={styles.userInfo}>
-                        <p class={styles.userName}>{item.studentName}</p>
-                        <p class={styles.subjectName}>{item.subjectName}</p>
-                      </div>
-                    ),
-                    value: () => (
-                      <div class={styles.times}>
-                        <span>{item.trainTime}</span>分钟
-                      </div>
-                    )
-                  }}
-                </Cell>
-              ))}
-
-              {!state.loading && !state.listShow && (
-                <ColResult tips="暂无数据" btnStatus={false} />
-              )}
-            </div>
-            {state.myInfo?.userId ? (
-              <TheSticky position="bottom">
-                <Cell class={styles.selfInfo} border={false} center>
-                  {{
-                    icon: () => (
-                      <>
-                        <span class={styles.num}>
-                          {state.myInfo.rankNum == -1
-                            ? '-'
-                            : state.myInfo.rankNum}
-                        </span>
-                        <Image
-                          src={state.myInfo.avatar || studentLogo}
-                          class={styles.userImg}
-                        />
-                      </>
-                    ),
-                    title: () => (
-                      <div class={styles.userInfo}>
-                        <p class={styles.userName}>
-                          {state.myInfo.studentName}
-                        </p>
-                        <p class={styles.subjectName}>
-                          {state.myInfo.subjectName}
-                        </p>
-                      </div>
-                    ),
-                    value: () => (
-                      <div class={styles.times}>
-                        <span>{state.myInfo.trainTime}</span>分钟
-                      </div>
-                    )
-                  }}
-                </Cell>
-              </TheSticky>
-            ) : (
-              ''
-            )}
-          </div>
-        // )}
+                  )
+                }}
+              </Cell>
+            </TheSticky>
+          ) : (
+            ''
+          )}
+        </div>
+        {/* )} */}
 
         {/* {!state.loading && !state.beforListShow && (
           <div class={styles.emptyResult}>