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,玩家位置和开始时间等)多方面因素影响,为完全随机产生的结果。任意盲盒奖励均可以验证公平性。
`;
} else if (res == "roll") {
- this.text = `
- 1、选择加入roll房间,根据房间规则可以加入房间。
-
-
- 2、达到加入条件后,即可加入房间。
-
- 3、加入房间,到达房间开奖日期后即可随机分配房间内的饰品。
`;
+ this.text = `1、找客服获取属于自己的活动密码,进入对应的活动。
+ 2、参加成功后到开奖时间会自动开奖,开奖后可以在库存中查看自己中奖的物品。
+ 3、开奖后直接找客服领取对应的奖品。
`;
}
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 @@
-
- {{ showAllAwards ? '收起' : '查看全部' }}
- {{ showAllAwards ? '▲' : '▼' }}
-
- 暂无获奖记录
+ 暂无获奖记录
@@ -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 @@
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;