diff --git a/odcs2.com/src/assets.zip b/odcs2.com/src/assets.zip deleted file mode 100644 index a4983b8..0000000 Binary files a/odcs2.com/src/assets.zip and /dev/null differ diff --git a/odcs2.com/src/assets/bonus/hb1.png b/odcs2.com/src/assets/bonus/hb1.png new file mode 100644 index 0000000..78011b0 Binary files /dev/null and b/odcs2.com/src/assets/bonus/hb1.png differ diff --git a/odcs2.com/src/assets/bonus/hb2.png b/odcs2.com/src/assets/bonus/hb2.png new file mode 100644 index 0000000..e64e94b Binary files /dev/null and b/odcs2.com/src/assets/bonus/hb2.png differ diff --git a/odcs2.com/src/assets/bonus/hb3.png b/odcs2.com/src/assets/bonus/hb3.png new file mode 100644 index 0000000..79b531e Binary files /dev/null and b/odcs2.com/src/assets/bonus/hb3.png differ diff --git a/odcs2.com/src/assets/bonus/hb4.png b/odcs2.com/src/assets/bonus/hb4.png new file mode 100644 index 0000000..cf3990e Binary files /dev/null and b/odcs2.com/src/assets/bonus/hb4.png differ diff --git a/odcs2.com/src/assets/bonus/jb1.png b/odcs2.com/src/assets/bonus/jb1.png new file mode 100644 index 0000000..5c05801 Binary files /dev/null and b/odcs2.com/src/assets/bonus/jb1.png differ diff --git a/odcs2.com/src/assets/bonus/jb2.png b/odcs2.com/src/assets/bonus/jb2.png new file mode 100644 index 0000000..8020a43 Binary files /dev/null and b/odcs2.com/src/assets/bonus/jb2.png differ diff --git a/odcs2.com/src/assets/bonus/jb3.png b/odcs2.com/src/assets/bonus/jb3.png new file mode 100644 index 0000000..5e7db45 Binary files /dev/null and b/odcs2.com/src/assets/bonus/jb3.png differ diff --git a/odcs2.com/src/assets/bonus/jb4.png b/odcs2.com/src/assets/bonus/jb4.png new file mode 100644 index 0000000..27c05f3 Binary files /dev/null and b/odcs2.com/src/assets/bonus/jb4.png differ diff --git a/odcs2.com/src/assets/bottom-bg.png b/odcs2.com/src/assets/bottom-bg.png index f2727b4..68010bd 100644 Binary files a/odcs2.com/src/assets/bottom-bg.png and b/odcs2.com/src/assets/bottom-bg.png differ diff --git a/odcs2.com/src/assets/bottom/Thumbs.db b/odcs2.com/src/assets/bottom/Thumbs.db new file mode 100644 index 0000000..db7a96c Binary files /dev/null and b/odcs2.com/src/assets/bottom/Thumbs.db differ diff --git a/odcs2.com/src/assets/bottom/active-bg.png b/odcs2.com/src/assets/bottom/active-bg.png index c985de7..1b0849d 100644 Binary files a/odcs2.com/src/assets/bottom/active-bg.png and b/odcs2.com/src/assets/bottom/active-bg.png differ diff --git a/odcs2.com/src/assets/bottom/beibao.png b/odcs2.com/src/assets/bottom/beibao.png index 7571623..b8a7360 100644 Binary files a/odcs2.com/src/assets/bottom/beibao.png and b/odcs2.com/src/assets/bottom/beibao.png differ diff --git a/odcs2.com/src/assets/bottom/shouye.png b/odcs2.com/src/assets/bottom/shouye.png index 68e5583..eeb924e 100644 Binary files a/odcs2.com/src/assets/bottom/shouye.png and b/odcs2.com/src/assets/bottom/shouye.png differ diff --git a/odcs2.com/src/assets/home.png b/odcs2.com/src/assets/home.png index 9a667eb..79da331 100644 Binary files a/odcs2.com/src/assets/home.png and b/odcs2.com/src/assets/home.png differ diff --git a/odcs2.com/src/assets/pinxiangBottom_top.png b/odcs2.com/src/assets/pinxiangBottom_top.png index 6317355..ebf8114 100644 Binary files a/odcs2.com/src/assets/pinxiangBottom_top.png and b/odcs2.com/src/assets/pinxiangBottom_top.png differ diff --git a/odcs2.com/src/assets/roll-official-bg-DRp1UF5D.png b/odcs2.com/src/assets/roll-official-bg-DRp1UF5D.png index 129dad9..e1b55fe 100644 Binary files a/odcs2.com/src/assets/roll-official-bg-DRp1UF5D.png and b/odcs2.com/src/assets/roll-official-bg-DRp1UF5D.png differ diff --git a/odcs2.com/src/assets/roll_serch.png b/odcs2.com/src/assets/roll_serch.png index e53c784..c923e68 100644 Binary files a/odcs2.com/src/assets/roll_serch.png and b/odcs2.com/src/assets/roll_serch.png differ diff --git a/odcs2.com/src/assets/roll_status.png b/odcs2.com/src/assets/roll_status.png index c2b3fba..a8742c1 100644 Binary files a/odcs2.com/src/assets/roll_status.png and b/odcs2.com/src/assets/roll_status.png differ diff --git a/odcs2.com/src/assets/room_btn_yjs.png b/odcs2.com/src/assets/room_btn_yjs.png index 6266bbb..963e792 100644 Binary files a/odcs2.com/src/assets/room_btn_yjs.png and b/odcs2.com/src/assets/room_btn_yjs.png differ diff --git a/odcs2.com/src/assets/status_btn_active.png b/odcs2.com/src/assets/status_btn_active.png index 9bcde9a..cd208ee 100644 Binary files a/odcs2.com/src/assets/status_btn_active.png and b/odcs2.com/src/assets/status_btn_active.png differ diff --git a/odcs2.com/src/views/Home/common/knapsack.vue b/odcs2.com/src/views/Home/common/knapsack.vue index 6409737..30a811c 100644 --- a/odcs2.com/src/views/Home/common/knapsack.vue +++ b/odcs2.com/src/views/Home/common/knapsack.vue @@ -158,7 +158,7 @@ :key="index" >
- +
{{ item.shortName || item.name }}
@@ -265,6 +265,17 @@ export default { isOver: "加载中", totalOrnamentNumber: 0, totalOrnamentPrice: 0, + // 价格 → 本地奖品图片映射 + priceImgMap: { + 1.88: require("@/assets/bonus/jb1.png"), // 金币1 + 3.88: require("@/assets/bonus/jb2.png"), // 金币2 + 6.88: require("@/assets/bonus/jb3.png"), // 金币3 + 8.88: require("@/assets/bonus/jb4.png"), // 金币4 + 18.88: require("@/assets/bonus/hb1.png"), // 红包1 + 38.88: require("@/assets/bonus/hb2.png"), // 红包2 + 68.88: require("@/assets/bonus/hb3.png"), // 红包3 + 88.88: require("@/assets/bonus/hb4.png"), // 红包4 + }, }; }, computed: { @@ -285,6 +296,18 @@ export default { }, methods: { + // 根据价格获取本地奖品图，无映射时降级使用服务器imageUrl + getPrizeImg(item) { + const price = parseFloat(item.ornamentsPrice); + if (this.priceImgMap[price]) return this.priceImgMap[price]; + if (item.imageUrl) { + const baseUrl = 'http://95.40.65.4:8081'; + const url = item.imageUrl.trim(); + if (/^(http|https):\/\//i.test(url)) return url; + return baseUrl + url; + } + return ''; + }, playAudio() { this.$store.commit("playAudio"); }, diff --git a/odcs2.com/src/views/rollHome/common/rolldetial.vue b/odcs2.com/src/views/rollHome/common/rolldetial.vue index 60c23bd..ab3d811 100644 --- a/odcs2.com/src/views/rollHome/common/rolldetial.vue +++ b/odcs2.com/src/views/rollHome/common/rolldetial.vue @@ -271,7 +271,7 @@ :style="{ 'background-image': `url(${item.ornamentLevelImg})` }" >
- +
{{ item.ornamentName }}
@@ -301,7 +301,7 @@
- +
{{ item.ornamentName }}
@@ -407,6 +407,17 @@ export default { obj: {}, playerList: [], defaultAvatar: require("@/assets/images/default-header.png"), + // 价格 → 本地奖品图片映射 + priceImgMap: { + 1.88: require("@/assets/bonus/jb1.png"), // 金币1 + 3.88: require("@/assets/bonus/jb2.png"), // 金币2 + 6.88: require("@/assets/bonus/jb3.png"), // 金币3 + 8.88: require("@/assets/bonus/jb4.png"), // 金币4 + 18.88: require("@/assets/bonus/hb1.png"), // 红包1 + 38.88: require("@/assets/bonus/hb2.png"), // 红包2 + 68.88: require("@/assets/bonus/hb3.png"), // 红包3 + 88.88: require("@/assets/bonus/hb4.png"), // 红包4 + }, awardResult: [], awardResultIsover: "加载中", playerListIsover: "加载中", @@ -595,6 +606,18 @@ export default { if (/^(http|https):\/\//i.test(trimmed)) return trimmed; return baseUrl + trimmed; }, + // 根据价格获取本地奖品图，无映射时降级使用服务器imgUrl + getPrizeImg(item) { + const price = parseFloat(item.price); + if (this.priceImgMap[price]) return this.priceImgMap[price]; + if (item.imgUrl) { + const baseUrl = 'http://95.40.65.4:8081'; + const url = item.imgUrl.trim(); + if (/^(http|https):\/\//i.test(url)) return url; + return baseUrl + url; + } + return ''; + }, }, }; diff --git a/odcs2.com/src/views/rollHome/index.vue b/odcs2.com/src/views/rollHome/index.vue index 0b2bf1a..00dd45b 100644 --- a/odcs2.com/src/views/rollHome/index.vue +++ b/odcs2.com/src/views/rollHome/index.vue @@ -118,7 +118,7 @@ 'background-size': '60px 60px', }" > - + @@ -257,6 +257,17 @@ export default { rolllist: [], isloading: true, daqweq: "roll", + // 价格 → 本地奖品图片映射 + priceImgMap: { + 1.88: require("@/assets/bonus/jb1.png"), // 金币1 + 3.88: require("@/assets/bonus/jb2.png"), // 金币2 + 6.88: require("@/assets/bonus/jb3.png"), // 金币3 + 8.88: require("@/assets/bonus/jb4.png"), // 金币4 + 18.88: require("@/assets/bonus/hb1.png"), // 红包1 + 38.88: require("@/assets/bonus/hb2.png"), // 红包2 + 68.88: require("@/assets/bonus/hb3.png"), // 红包3 + 88.88: require("@/assets/bonus/hb4.png"), // 红包4 + }, }; }, mounted() { @@ -346,6 +357,18 @@ export default { } }); }, + // 根据价格获取本地奖品图，无映射时降级使用服务器imgUrl + getPrizeImg(weapon) { + const price = parseFloat(weapon.price); + if (this.priceImgMap[price]) return this.priceImgMap[price]; + if (weapon.imgUrl) { + const baseUrl = 'http://95.40.65.4:8081'; + const url = weapon.imgUrl.trim(); + if (/^(http|https):\/\//i.test(url)) return url; + return baseUrl + url; + } + return ''; + }, }, }; diff --git a/skins-service/service-playingmethod/src/main/resources/com/ruoyi/playingmethod/mapper/ApiRollMapper.xml b/skins-service/service-playingmethod/src/main/resources/com/ruoyi/playingmethod/mapper/ApiRollMapper.xml index 3e460d8..1cee76c 100644 --- a/skins-service/service-playingmethod/src/main/resources/com/ruoyi/playingmethod/mapper/ApiRollMapper.xml +++ b/skins-service/service-playingmethod/src/main/resources/com/ruoyi/playingmethod/mapper/ApiRollMapper.xml @@ -8,7 +8,10 @@ SELECT tr.id, tr.roll_type, - trj.total_price as total_ornaments_price, + (SELECT COALESCE(SUM(tto.use_price * trjo.ornaments_num), 0) + FROM tt_roll_jackpot_ornaments trjo + LEFT JOIN tt_ornament tto ON trjo.ornaments_id = tto.id + WHERE trjo.jackpot_id = tr.jackpot_id) as total_ornaments_price, CASE WHEN tr.roll_type = '0' THEN '官方房' WHEN tr.roll_type = '1' THEN '主播房' @@ -25,7 +28,6 @@ tr.min_recharge FROM tt_roll tr LEFT JOIN tt_user tu ON tr.user_id = tu.user_id - LEFT JOIN tt_roll_jackpot trj ON tr.jackpot_id = trj.jackpot_id AND tr.roll_name LIKE CONCAT("%",#{rollName},"%") AND tr.roll_status = #{rollStatus}