From 6030cc70a5d997f7ed0bfc009e0136e33ae9292b Mon Sep 17 00:00:00 2001
From: Fdily <2949549024@qq.com>
Date: Sat, 16 May 2026 18:28:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 odcs2.com/src/components/illustrate.vue       | 10 +++------
 .../src/views/rollHome/common/rolldetial.vue  | 22 +++++++++++--------
 odcs2.com/src/views/rollHome/index.vue        |  4 ++--
 .../dto/roll/GetRollOpenPrizeParam.java       |  2 +-
 .../domain/dto/roll/GetRollPrizePool.java     |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/odcs2.com/src/components/illustrate.vue b/odcs2.com/src/components/illustrate.vue
index 15ec27b..5a00416 100644
--- a/odcs2.com/src/components/illustrate.vue
+++ b/odcs2.com/src/components/illustrate.vue
@@ -90,13 +90,9 @@ export default {
         每场游戏的结果受到（创建时间，玩家ID，玩家位置和开始时间等）多方面因素影响，为完全随机产生的结果。任意盲盒奖励均可以验证公平性。
       </p>`;
       } else if (res == "roll") {
-        this.text = `<p>
-        1、选择加入roll房间，根据房间规则可以加入房间。
-      </p>
-      <p>
-        2、达到加入条件后，即可加入房间。
-      </p>
-      <p>3、加入房间，到达房间开奖日期后即可随机分配房间内的饰品。</p>`;
+        this.text = `<p>1、找客服获取属于自己的活动密码，进入对应的活动。</p>
+      <p>2、参加成功后到开奖时间会自动开奖，开奖后可以在库存中查看自己中奖的物品。</p>
+      <p>3、开奖后直接找客服领取对应的奖品。</p>`;
       }
       this.$forceUpdate();
       console.log(this.obj);
diff --git a/odcs2.com/src/views/rollHome/common/rolldetial.vue b/odcs2.com/src/views/rollHome/common/rolldetial.vue
index ceefae9..7dc5b34 100644
--- a/odcs2.com/src/views/rollHome/common/rolldetial.vue
+++ b/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();
         }
       });
     },
diff --git a/odcs2.com/src/views/rollHome/index.vue b/odcs2.com/src/views/rollHome/index.vue
index e3b9d5a..cdc7492 100644
--- a/odcs2.com/src/views/rollHome/index.vue
+++ b/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>
     
diff --git a/skins-model/src/main/java/com/ruoyi/domain/dto/roll/GetRollOpenPrizeParam.java b/skins-model/src/main/java/com/ruoyi/domain/dto/roll/GetRollOpenPrizeParam.java
index ec0612d..a087756 100644
--- a/skins-model/src/main/java/com/ruoyi/domain/dto/roll/GetRollOpenPrizeParam.java
+++ b/skins-model/src/main/java/com/ruoyi/domain/dto/roll/GetRollOpenPrizeParam.java
@@ -20,7 +20,7 @@ public class GetRollOpenPrizeParam {
     private Integer page;
 
     @Min(value = 1,message = "最小1")
-    @Max(value = 20,message = "最大20")
+    @Max(value = 500,message = "最大500")
     private Integer size;
 
     private Integer limit;
diff --git a/skins-model/src/main/java/com/ruoyi/domain/dto/roll/GetRollPrizePool.java b/skins-model/src/main/java/com/ruoyi/domain/dto/roll/GetRollPrizePool.java
index 2d9f116..2e7737f 100644
--- a/skins-model/src/main/java/com/ruoyi/domain/dto/roll/GetRollPrizePool.java
+++ b/skins-model/src/main/java/com/ruoyi/domain/dto/roll/GetRollPrizePool.java
@@ -22,7 +22,7 @@ public class GetRollPrizePool {
     private Integer page;
 
     @Min(value = 1,message = "最小1")
-    @Max(value = 20,message = "最大20")
+    @Max(value = 500,message = "最大500")
     private Integer size;
 
     private Integer limit;