提交

odcs2.com/src/views/rollHome/common/rolldetial.vue

@@ -102,7 +102,7 @@
       <div v-if="awardResult.length > 0" class="award_grid">
         <div
           class="award_item"
-          v-for="(item, index) in showAllAwards ? awardResult : awardResult.slice(0, 3)"
+          v-for="(item, index) in awardResult"
           :key="index"
         >
           <div class="award_price">
@@ -119,11 +119,7 @@
           </div>
         </div>
       </div>
-      <div class="view_all" @click="showAllAwards = !showAllAwards" v-if="awardResult.length > 3">
-        {{ showAllAwards ? '收起' : '查看全部' }}
-        <span class="view_arrow">{{ showAllAwards ? '▲' : '▼' }}</span>
-      </div>
-      <div class="no_player" v-else>暂无获奖记录</div>
+      <div class="no_player" v-if="awardResult.length === 0">暂无获奖记录</div>
     </div>
 
     <!-- 参与名单 -->
@@ -222,7 +218,7 @@ export default {
       rollPrizePool: [],
       rollPrizePoolPage: {
         page: 1,
-        size: 12,
+        size: 500,
         rollId: localStorage.getItem("rollid"),
       },
       playersPage: {
@@ -230,7 +226,7 @@ export default {
         size: 20,
         rollId: localStorage.getItem("rollid"),
       },
-      openPage: { page: 1, size: 12, rollId: localStorage.getItem("rollid") },
+      openPage: { page: 1, size: 500, rollId: localStorage.getItem("rollid") },
     };
   },
   created() {
@@ -262,7 +258,11 @@ export default {
             this.rollPrizePool.push(item);
           }
         });
-        // this.rollPrizePool.push(...res.data.data);
+        if (arr.length >= this.rollPrizePoolPage.size) {
+          // 自动加载下一页，直到所有奖品全部加载完
+          this.rollPrizePoolPage.page++;
+          this.RollPrizePool();
+        }
       });
     },
     RollPlayers() {
@@ -285,6 +285,10 @@ export default {
         this.awardResult.push(...res.data.data);
         if (res.data.data.length < this.openPage.size) {
           this.awardResultIsover = "暂无更多";
+        } else {
+          // 自动加载下一页，直到所有中奖人员全部加载完
+          this.openPage.page++;
+          this.RollOpenPrize();
         }
       });
     },

odcs2.com/src/views/rollHome/index.vue

@@ -13,13 +13,13 @@
     <!-- 第二行：ROLL房标题 + 玩法说明 -->
     <div class="page_title_row">
       <div style="width:60px"></div>
-      <div class="page_title">ROLL房</div>
+      <div class="page_title">活动列表</div>
       <div class="page_rule_btn" @click="handleilltate(); playAudio();">玩法说明</div>
     </div>
     <!-- 第三行：Tab栏 -->
     <div class="roll_status">
       <div @click="handleChange(0); playAudio();" :class="type == 0 ? 'active' : ''" class="status_btn center">进行中</div>
-      <div @click="handleChange(1); playAudio();" :class="type == 1 ? 'active' : ''" class="status_btn center">已结束</div>
+      <div @click="handleChange(1); playAudio();" :class="type == 1 ? 'active' : ''" class="status_btn center">上一期中奖名单</div>
       <div @click="handlemy(2); playAudio();" :class="type == 2 ? 'active' : ''" class="status_btn center">我参与的</div>
     </div>