From ed5c70140706fbb84bcc4048723e108b91a6c69f Mon Sep 17 00:00:00 2001 From: zhangjiahao <1627043995@qq.com> Date: Thu, 24 Jul 2025 11:04:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8A=A9=E5=8A=9B=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E5=8A=A8=E7=94=BB2s=E6=94=B9=E4=B8=BA1s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/zhongchou/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/zhongchou/index.vue b/src/views/zhongchou/index.vue index aab0beb..73fdf6c 100644 --- a/src/views/zhongchou/index.vue +++ b/src/views/zhongchou/index.vue @@ -378,10 +378,10 @@ const handleBoostClick = async (area) => { // 显示助力成功提示 showBoostSuccess.value = true - //助力成功动画2s + //助力成功动画1s setTimeout(() => { showBoostSuccess.value = false - }, 2000) + }, 1000) // 重新获取活动数据以更新按钮状态和进度 await fetchActivity() From 48ba2c372158d7c99fbaafa48a092e6284061182 Mon Sep 17 00:00:00 2001 From: zhangjiahao <1627043995@qq.com> Date: Thu, 24 Jul 2025 15:53:36 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=BC=B9=E5=87=BA=E6=B4=BB=E5=8A=A8=E8=A7=84?= =?UTF-8?q?=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/zhongchou/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/zhongchou/index.vue b/src/views/zhongchou/index.vue index 73fdf6c..498880d 100644 --- a/src/views/zhongchou/index.vue +++ b/src/views/zhongchou/index.vue @@ -332,6 +332,7 @@ const getQueryVariable = (variable) => { } // 组件挂载时初始化 onMounted(() => { + showRulesModal.value = true nextTick(() => { // 页面加载时自动获取活动数据 fetchActivity() From 64dd5110e5dada453ca85613cbdefe78450bbd37 Mon Sep 17 00:00:00 2001 From: zhangjiahao <1627043995@qq.com> Date: Fri, 25 Jul 2025 10:35:01 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E4=BC=A0=E5=85=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E5=B8=82=E5=9C=BA=E5=92=8C=E8=BF=9B=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/zhongchou/index.vue | 88 +++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 45 deletions(-) diff --git a/src/views/zhongchou/index.vue b/src/views/zhongchou/index.vue index 498880d..7831258 100644 --- a/src/views/zhongchou/index.vue +++ b/src/views/zhongchou/index.vue @@ -41,7 +41,7 @@
-

距美股实时数据

+

距{{ marketName }}实时数据

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

@@ -170,45 +170,43 @@ async function fetchActivity() { } // 处理市场数据 - if (data && data.length > 0) { - // 遍历数据数组 - data.forEach(item => { - if (item.market === "美股" && item.marketId === 8) { - // 存储美股市场ID - usMarketId.value = item.marketId - - // 根据marketStatus设置助力状态 - if (item.marketStatus === '已助力') { - usBoostStatus.value = true - } else { - usBoostStatus.value = false - } - - // 根据marketCount计算进度和剩余时间 - if (item.marketCount !== undefined) { - const totalPeople = 1500 // 总人数1500人 - const currentCount = item.marketCount || 0 // 当前助力人数 - - // 计算进度百分比 (0-100) - const progressPercent = Math.min((currentCount / totalPeople) * 100, 100) - - // 根据进度计算剩余时间 (15分钟对应100%进度) - const usedTime = (progressPercent / 100) * 15 - const remainingTime = Math.max(0, 15 - usedTime) - - usRemainingTime.value = Math.round(remainingTime) - console.log(`美股助力人数: ${currentCount}/${totalPeople}, 进度: ${progressPercent.toFixed(1)}%, 剩余时间: ${remainingTime.toFixed(1)}分钟`) - - // 更新进度条高度 - nextTick(() => { - updateProgressDisplay() - }) - } - } - - // 如果需要处理港股数据，可以添加类似的逻辑 - // if (item.market === "港股" && item.marketId === 5) { ... } - }) + if (data && data.length > 1) { // 确保至少有两个元素 + // 使用数组中的第二个元素（索引为1） + const item = data[0] // 使用第二个数据 + + // 存储市场ID + usMarketId.value = item.marketId + + // 存储市场名称 + marketName.value = item.market + + // 根据marketStatus设置助力状态 + if (item.marketStatus === '已助力') { + usBoostStatus.value = true + } else { + usBoostStatus.value = false + } + + // 根据marketCount计算进度和剩余时间 + if (item.marketCount !== undefined) { + const totalPeople = 1500 // 总人数1500人 + const currentCount = item.marketCount || 0 // 当前助力人数 + + // 计算进度百分比 (0-100) + const progressPercent = Math.min((currentCount / totalPeople) * 100, 100) + + // 根据进度计算剩余时间 (15分钟对应100%进度) + const usedTime = (progressPercent / 100) * 15 + const remainingTime = Math.max(0, 15 - usedTime) + + usRemainingTime.value = Math.round(remainingTime) + console.log(`${marketName.value}助力人数: ${currentCount}/${totalPeople}, 进度: ${progressPercent.toFixed(1)}%, 剩余时间: ${remainingTime.toFixed(1)}分钟`) + + // 更新进度条高度 + nextTick(() => { + updateProgressDisplay() + }) + } } } else { console.error('获取活动失败:', response.message) @@ -261,6 +259,7 @@ const showRulesModal = ref(false) // 添加助力成功提示状态 const showBoostSuccess = ref(false) // 剩余时间数据 - 从接口获取marketTwoCount计算 +const marketName = ref('美股') // 默认值为美股，将由API返回的数据更新 const usRemainingTime = ref(15) // 美股剩余分钟，初始值15分钟 // const hkRemainingTime = ref(6) // 港股剩余分钟 const usTotalTime = ref(15) // 美股总时间15分钟 @@ -375,7 +374,7 @@ const handleBoostClick = async (area) => { }); if (response.code === 200) { - console.log('美股助力成功：', response.message) + console.log(`${marketName.value}助力成功：`, response.message) // 显示助力成功提示 showBoostSuccess.value = true @@ -386,15 +385,14 @@ const handleBoostClick = async (area) => { // 重新获取活动数据以更新按钮状态和进度 await fetchActivity() - console.log('美股已助力状态：', usBoostStatus.value, '剩余时间：', usRemainingTime.value) + console.log(`${marketName.value}已助力状态：`, usBoostStatus.value, '剩余时间：', usRemainingTime.value) } else { - console.error('美股助力失败：', response.message) + console.error(`${marketName.value}助力失败：`, response.message) } } catch (error) { - console.error('美股助力请求失败：', error) + console.error(`${marketName.value}助力请求失败：`, error) } } - } const showRulesFunc = () => { From 303931b382166922c0cc3a2ece8062b43e8ce532 Mon Sep 17 00:00:00 2001 From: zhangjiahao <1627043995@qq.com> Date: Fri, 25 Jul 2025 10:45:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E8=A7=84=E5=88=99=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/zhongchou/index.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/zhongchou/index.vue b/src/views/zhongchou/index.vue index 7831258..7f87171 100644 --- a/src/views/zhongchou/index.vue +++ b/src/views/zhongchou/index.vue @@ -1274,15 +1274,18 @@ const hideRules = () => { .rules-list { width: 100%; - line-height: 1.6; + line-height: 1.6; /* 增加行高 */ margin-top: 10%; - margin-left: 10%; + margin-left: 10%; /* 减少左边距 */ + padding-right: 5%; /* 添加右边距 */ } .rules-list p { margin: 10px 0; font-size: 16px; color: #fff; + font-family: 'Microsoft YaHei', 'PingFang SC', sans-serif; /* 使用更清晰的中文字体 */ + text-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); line-height: 1.7; } 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 5/5] =?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;