From 1515d4a0605a6c0cf74d84be51ba67e638f13d1e Mon Sep 17 00:00:00 2001 From: Ethereal <3432649580@qq.com> Date: Fri, 25 Jul 2025 11:40:21 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=B0=83=E8=8A=82=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/choujiang/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/choujiang/index.vue b/src/views/choujiang/index.vue index bad391e..8cd12f3 100644 --- a/src/views/choujiang/index.vue +++ b/src/views/choujiang/index.vue @@ -413,8 +413,8 @@ function handleNextPrize() { left: 0; overflow: hidden; /* 添加背景图片 */ - background: url("../../assets/bg@2x.png"); - background-size: 1920px 980px; + background: url("../../assets/bg@2x.png") ; + background-size: 100% 100%; } /* 透明弹窗样式 */ From 1f351c514ef77b4ec8161740558c2b5c17065a7d Mon Sep 17 00:00:00 2001 From: Ethereal <3432649580@qq.com> Date: Fri, 25 Jul 2025 14:01:04 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8A=BD=E5=A5=96?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E8=B0=83=E6=95=B4=E8=8E=B7=E5=A5=96?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A5=96=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/choujiang/index.vue | 6 +++--- src/views/choujiang/lottery/Lottery3D.vue | 2 +- src/views/choujiang/lottery/PrizePanel.vue | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/choujiang/index.vue b/src/views/choujiang/index.vue index 8cd12f3..f0d53d7 100644 --- a/src/views/choujiang/index.vue +++ b/src/views/choujiang/index.vue @@ -333,9 +333,10 @@ async function handleLotteryClick() { break; case "rotating": + setTimeout(() => { isDisabled.value = false; - }, 2000); + }, 2700); // toggleMusic(); @@ -344,13 +345,12 @@ async function handleLotteryClick() { await lottery3DRef.value?.rotateBallStop?.(); toggleMusic(); playMusic1(); - + lotteryState.value = "result"; await lotteryEngine.executeLottery(); await nextTick(); showLotteryQipao(); console.log("lotteryState 变更前:", lotteryState.value, "-> idle"); - lotteryState.value = "result"; console.log("lotteryState 变更后:", lotteryState.value); diff --git a/src/views/choujiang/lottery/Lottery3D.vue b/src/views/choujiang/lottery/Lottery3D.vue index 464d930..bfbe84a 100644 --- a/src/views/choujiang/lottery/Lottery3D.vue +++ b/src/views/choujiang/lottery/Lottery3D.vue @@ -756,7 +756,7 @@ onMounted(async () => { const length = member.length; const showTable = true; const position = { - x: (100 * config.COLUMN_COUNT - 20) / 2, + x: (115 * config.COLUMN_COUNT - 20) / 2, y: (120 * config.ROW_COUNT - 20) / 2, }; createCards(member, length, showTable, position, config); // 3. 传递高亮配置 diff --git a/src/views/choujiang/lottery/PrizePanel.vue b/src/views/choujiang/lottery/PrizePanel.vue index 2cfa917..cac316c 100644 --- a/src/views/choujiang/lottery/PrizePanel.vue +++ b/src/views/choujiang/lottery/PrizePanel.vue @@ -147,7 +147,7 @@ > {{ user.jwcode }} - {{ user.prizeName }} + {{ user.gradeName }} From 933df9b6ff426ff7ecc52120497f627d068a8af8 Mon Sep 17 00:00:00 2001 From: no99 <17663930442@163.com> Date: Fri, 25 Jul 2025 14:10:15 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E7=AC=94=E8=AE=B0=E6=9C=AC=E9=80=82?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/choujiang/hxl-cj/cj.vue | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/src/views/choujiang/hxl-cj/cj.vue b/src/views/choujiang/hxl-cj/cj.vue index aea345e..f1105b3 100644 --- a/src/views/choujiang/hxl-cj/cj.vue +++ b/src/views/choujiang/hxl-cj/cj.vue @@ -507,6 +507,11 @@ const initAll = async () => { }; const initCards = () => { + const screenWidth = window.innerWidth; + const isLaptop = screenWidth < 1600; // 判断 + const baseSpacingX = isLaptop ? 120 : 140; + const baseSpacingY = isLaptop ? 150 : 180; + let member = users.value.slice(), showCards = [], length = member.length; @@ -514,9 +519,14 @@ const initCards = () => { let isBold = false; let index = 0; let totalMember = member.length; + // let position = { + // x: (140 * COLUMN_COUNT - 20) / 2, + // y: (180 * ROW_COUNT - 20) / 2, + // }; + let position = { - x: (140 * COLUMN_COUNT - 20) / 2, - y: (180 * ROW_COUNT - 20) / 2, + x: (baseSpacingX * COLUMN_COUNT - 20) / 2, + y: (baseSpacingY * ROW_COUNT - 20) / 2, }; camera = new THREE.PerspectiveCamera( @@ -542,9 +552,17 @@ const initCards = () => { threeDCards.push(object); // + // 在initCards函数开始处添加 + + const cardSpacingX = isLaptop ? 130 : 155; + const cardSpacingY = isLaptop ? 160 : 195; + var object = new THREE.Object3D(); - object.position.x = j * 155 - position.x; - object.position.y = -(i * 195) + position.y; + // object.position.x = j * 155 - position.x; + // object.position.y = -(i * 195) + position.y; + // 使用动态间距 + object.position.x = j * cardSpacingX - position.x; + object.position.y = -(i * cardSpacingY) + position.y; targets.table.push(object); index++; } @@ -1389,8 +1407,8 @@ a { } .element { - width: 15vh; - height: 19vh; + width: 7.5vw; + height: 18.5vh; /* box-shadow: 0 0 12px rgba(0, 255, 255, 0.5); */ border: 1px solid rgba(127, 255, 255, 0.25); text-align: center; From 618f039c6983d5ca7d5926e3f799aba93270154e Mon Sep 17 00:00:00 2001 From: zhangjiahao <1627043995@qq.com> Date: Fri, 25 Jul 2025 14:22:58 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=A9=E5=8A=9B?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=AE=8C=E6=88=90=E6=98=BE=E7=A4=BA=E5=8A=A9?= =?UTF-8?q?=E5=8A=9B=E5=AE=8C=E6=88=90=E5=8F=8A=E5=88=87=E6=8D=A2=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/zhongchou/index.vue | 85 ++++++++++++++++++++++++++++++++----------- 1 file changed, 64 insertions(+), 21 deletions(-) diff --git a/src/views/zhongchou/index.vue b/src/views/zhongchou/index.vue index 7f87171..0270754 100644 --- a/src/views/zhongchou/index.vue +++ b/src/views/zhongchou/index.vue @@ -41,14 +41,21 @@
-

距{{ marketName }}实时数据

-

还剩{{ numberToChinese(usDisplayTime) }}分钟

+ +
-
底座 @@ -132,7 +139,7 @@ From e5adb2d2175df11195ddb404eab7bb2e7cb0f167 Mon Sep 17 00:00:00 2001 From: zhangjiahao <1627043995@qq.com> Date: Fri, 25 Jul 2025 15:14:00 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/zhongchou/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/zhongchou/index.vue b/src/views/zhongchou/index.vue index 72b0556..0593a2a 100644 --- a/src/views/zhongchou/index.vue +++ b/src/views/zhongchou/index.vue @@ -175,7 +175,7 @@ async function fetchActivity() { } else { activityPeriod.value = '时间待定' } - + // 处理市场数据 if (data && data.length > 1) { // 确保至少有两个元素 // 使用数组中的第二个元素(索引为1) @@ -214,7 +214,7 @@ async function fetchActivity() { usRemainingTime.value = remainingTime } - console.log(`${marketName.value}助力人数: ${currentCount}/${totalPeople}, 进度: ${currentCount >= totalPeople ? '100' : progressPercent.toFixed(1)}%, 剩余时间: ${usRemainingTime.value}分钟, 完成状态: ${isCompleted.value}`) + // console.log(`${marketName.value}助力人数: ${currentCount}/${totalPeople}, 进度: ${currentCount >= totalPeople ? '100' : progressPercent.toFixed(1)}%, 剩余时间: ${usRemainingTime.value}分钟, 完成状态: ${isCompleted.value}`) // 更新进度条高度 nextTick(() => { @@ -225,7 +225,7 @@ async function fetchActivity() { } } else { console.error('获取活动失败:', response.message) - activityPeriod.value = '获取失败' + activityPeriod.value = response.message } } catch (error) { console.error('请求错误:', error) @@ -274,7 +274,7 @@ const showRulesModal = ref(false) // 添加助力成功提示状态 const showBoostSuccess = ref(false) // 剩余时间数据 - 从接口获取marketTwoCount计算 -const marketName = ref('美股') // 默认值为美股,将由API返回的数据更新 +const marketName = ref() // 默认值为美股,将由API返回的数据更新 const usRemainingTime = ref(15) // 美股剩余分钟,初始值15分钟 // const hkRemainingTime = ref(6) // 港股剩余分钟 const usTotalTime = ref(15) // 美股总时间15分钟 From c99f7557b28afa311d0afcd82e4144e4f054d419 Mon Sep 17 00:00:00 2001 From: no99 <17663930442@163.com> Date: Fri, 25 Jul 2025 15:22:55 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=B8=8D=E5=81=9A=E5=85=A8=E5=B1=8F?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/choujiang/hxl-cj/cj.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/choujiang/hxl-cj/cj.vue b/src/views/choujiang/hxl-cj/cj.vue index 5da3163..35e73f0 100644 --- a/src/views/choujiang/hxl-cj/cj.vue +++ b/src/views/choujiang/hxl-cj/cj.vue @@ -541,7 +541,7 @@ const initCards = () => { 1, 10000 ); - camera.position.z = 3500; + camera.position.z = 3000; scene = new THREE.Scene(); @@ -1555,7 +1555,7 @@ button { justify-content: center; flex-wrap: nowrap; /* color: rgba(127, 255, 255, 0.75); */ - width: 30vh; + width: 29vh; height: 9.5vh; box-sizing: border-box; transition: transform 1s ease-in; @@ -2039,7 +2039,7 @@ button { } .shine.prize-item { - /* width: 24vh; */ + /* width: 29.5vh; */ margin: 1.2vh 0; }