From 1ca8b48ef721e58cc0abf43871b7aea2ab9c18d9 Mon Sep 17 00:00:00 2001 From: yaoqin <497681109@qq.com> Date: Fri, 19 Sep 2025 17:40:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=20=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=96=87=E6=A1=A3=E6=B7=BB=E5=8A=A0=20=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E5=AF=BC=E8=88=AAbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mining-pool/src/components/header.vue | 93 ++- mining-pool/src/i18n/AccessMiningPool.js | 2 + mining-pool/src/i18n/apiFile.js | 5 +- .../src/views/AccessMiningPool/index.js | 9 +- .../src/views/AccessMiningPool/index.vue | 423 +++++++---- mining-pool/src/views/ServiceTerms/index.vue | 30 + mining-pool/src/views/apiFile/index.js | 7 +- mining-pool/src/views/apiFile/index.vue | 718 ++++++++++-------- mining-pool/src/views/home/index.vue | 9 +- mining-pool/src/views/rate/index.js | 8 +- mining-pool/src/views/rate/index.vue | 630 ++++++++------- mining-pool/test.zip | Bin 6162688 -> 6161956 bytes .../test/css/app-189e7968.5f2e4f20.css | 1 + mining-pool/test/index.html | 2 +- mining-pool/test/js/app-113c6c50.0baa904d.js | 1 + mining-pool/test/js/app-42f9d7e6.91b45f91.js | 1 + mining-pool/test/js/app-45954fd3.cc32605b.js | 1 + mining-pool/test/js/app-5c551db8.9f0ca7c2.js | 1 + 18 files changed, 1226 insertions(+), 715 deletions(-) create mode 100644 mining-pool/test/css/app-189e7968.5f2e4f20.css create mode 100644 mining-pool/test/js/app-113c6c50.0baa904d.js create mode 100644 mining-pool/test/js/app-42f9d7e6.91b45f91.js create mode 100644 mining-pool/test/js/app-45954fd3.cc32605b.js create mode 100644 mining-pool/test/js/app-5c551db8.9f0ca7c2.js diff --git a/mining-pool/src/components/header.vue b/mining-pool/src/components/header.vue index 0230fd5..13a0e89 100644 --- a/mining-pool/src/components/header.vue +++ b/mining-pool/src/components/header.vue @@ -904,10 +904,13 @@ export default { } .header { display: flex; - justify-content: space-between; + justify-content: space-between; /* 保持logo在左,导航在右 */ align-items: center; height: 100%; - width: 95%; + width: 100%; + + margin: 0 auto; /* 居中显示 */ + padding: 0 2.5%; /* 使用padding替代固定宽度 */ /* outline: 1px solid red; */ // outline: 1PX solid red; // padding: 0px 5%; @@ -915,30 +918,35 @@ export default { // background: #21A0FF; } .logo { - width: 18%; + flex: 0 0 auto; /* 不伸缩,保持固定大小 */ height: 100%; display: flex; - justify-content: right; + justify-content: flex-end; /* 右对齐 */ align-items: center; font-size: 0.9rem; + width: 300px; /* 固定宽度,给导航留出更多空间 */ img { width: 100px; + height: auto; /* 保持比例 */ } } .topMenu { - width: 80%; + flex: 1; /* 占据剩余空间 */ height: 100%; display: flex; - justify-content: end; + justify-content: flex-end; /* 右对齐 */ align-items: center; + min-width: 0; /* 允许收缩 */ // background: goldenrod; + .afterLoggingIn { - min-width: 50%; display: flex; - justify-content: right; + justify-content: flex-end; /* 右对齐 */ align-items: center; + flex-wrap: nowrap; /* 防止换行 */ + width: auto; /* 自适应宽度 */ // background: #6E3EDB; .langBox { @@ -983,10 +991,15 @@ export default { } } .notLoggedIn { - width: 40%; + display: flex; + justify-content: flex-end; /* 右对齐 */ + align-items: center; + gap: 12px; /* 增加间距 */ li { - margin-left: 1%; + flex: 0 0 auto; /* 不伸缩,保持内容大小 */ + white-space: nowrap; /* 防止文字换行 */ + padding: 0 6px; /* 减少内边距 */ } .langBox { display: flex; @@ -1006,28 +1019,28 @@ export default { } } .menuBox { - min-width: 42% !important; - height: 100%; display: flex; - justify-content: end; + justify-content: flex-end; /* 右对齐 */ align-items: center; - margin: 0%; + margin: 0; + gap: 12px; /* 增加间距 */ + flex-wrap: nowrap; /* 防止换行 */ // background: #fff; li { list-style: none; - // width: calc(100% / 5); height: 45%; display: flex; justify-content: center; align-items: center; cursor: pointer; - margin-left: 3%; font-size: 0.9rem; - // transition: all 0.3s linear; position: relative; text-align: center; - min-width: 61px; + flex: 0 0 auto; /* 不伸缩,保持内容大小 */ + white-space: nowrap; /* 防止文字换行 */ + padding: 0 6px; /* 减少内边距 */ + min-width: auto; /* 移除最小宽度限制 */ } li:hover { @@ -1087,4 +1100,48 @@ export default { .el-menu.el-menu--horizontal { border-bottom: 0px !important; } + +/* 响应式设计 - 小屏幕适配 */ +@media (max-width: 768px) { + .header { + padding: 0 1%; /* 减少内边距 */ + } + + .logo { + min-width: 80px; /* 减少logo最小宽度 */ + + img { + width: 80px; /* 减小logo尺寸 */ + } + } + + .menuBox { + gap: 4px; /* 减少间距 */ + + li { + font-size: 0.8rem; /* 减小字体 */ + padding: 0 4px; /* 减少内边距 */ + } + } + + .topMenu .afterLoggingIn .langBox { + width: 50px; /* 减小语言选择框宽度 */ + } +} + +/* 超小屏幕 - 隐藏部分菜单项 */ +@media (max-width: 480px) { + .menuBox li:not(.home):not(.langBox) { + display: none; /* 只显示首页和语言选择 */ + } + + .menuBox { + gap: 2px; + + li { + font-size: 0.75rem; + padding: 0 2px; + } + } +} \ No newline at end of file diff --git a/mining-pool/src/i18n/AccessMiningPool.js b/mining-pool/src/i18n/AccessMiningPool.js index 9484fd0..10811fa 100644 --- a/mining-pool/src/i18n/AccessMiningPool.js +++ b/mining-pool/src/i18n/AccessMiningPool.js @@ -107,6 +107,7 @@ export const AccessMiningPool_zh = { estimatedTime:"预估时间", describe:"说明", timeLimited:"限时", + backMenu:"返回挖矿教程目录", } } @@ -220,5 +221,6 @@ export const AccessMiningPool_en = { timeLimited:"Time limited", alphCourse:"Alephium(alph) Mining Tutorial", xmrCourse:"Xmr(monero) Mining Tutorial", + backMenu:"Return to Table of Contents", } } \ No newline at end of file diff --git a/mining-pool/src/i18n/apiFile.js b/mining-pool/src/i18n/apiFile.js index 8fc39fe..edbbfa1 100644 --- a/mining-pool/src/i18n/apiFile.js +++ b/mining-pool/src/i18n/apiFile.js @@ -76,6 +76,8 @@ export const api_zh = { aCertainMiner: "挖矿账户下对应的某矿工号", miningMachineHistory24h: "指定矿机历史24h平均算力", realTimeMiningMachine24h30m: "指定矿机最近24h算力(30m平均算力)", + backMenu:"返回目录", + catalogue:"目录:", } } @@ -112,6 +114,7 @@ export const api_en = { "overviewOfMiningPool": "Overview of Mining Pool", "jurisdiction": "Required permissions", "parameter": "Request parameters", "currency": "currency", "response": "Response parameters", "serviceCharge": "Mining pool handling fee", "minimumPaymentAmount": "Minimum payment amount", "latelyPower24h": "Last seven days' computing power (24-hour average)", "Power24h": "Latest computing power of mining pool (24-hour average)", "height": "The current height of the mining pool", "currentMiners": "The current number of miners in the mining pool", "eachState": "Number of miners in each state", "realTimePower": "Real time computing power of mining pool", "averagePower30m": "Current average computing power of 30m", "averagePower24h": "Current 24-hour average computing power", "Company": "Company", "historyPower": "Overview of Mining Pool Historical Computing Power", "start": "start time", "start2": "Format yyyy MM dd differs from end by up to three months", "end": "End time", "end2": "Format yyyy MM dd differs from star by up to three months", "historyPower30m": "30m average computing power historical record", "historyPower24h": "24-hour average computing power history record", "miningAccount": "Mining account information", "minerData": "Number of miners data", "stateData": "Miner status data", "minerId": "Miner ID", "minerStatus": "Miner status", "minerStatus0": "0 represents online", "minerStatus1": "1 represents offline", "minerStatus2": "2 represents abnormal state", "overviewOfMiners": "Overview of miners under mining accounts", "accountApiKey": "The mining account name under the API-KEY bound account", "allMiners": "All miners under the mining account", "realTimeAccount": "Real time computing power of mining accounts", "account24h": "24-hour average computing power of mining account history", "account24h30m": "Mining account's computing power in the past 24 hours (average computing power of 30m)", "average24h30m": "The average computing power of 30m in the past 24 hours", "miningMachineInformation": "Mining machine information", "realTimeMiningMachine": "Specify the real-time computing power of the mining machine", "aCertainMiner": "The corresponding miner account under the mining account", "miningMachineHistory24h": "Specify the average computing power of the mining machine in the past 24 hours", "realTimeMiningMachine24h30m": "Designated mining machine's computing power in the past 24 hours (average computing power of 30m)", apiAuthentication5:"API page", apiAuthentication6:"Obtain (When requesting tokens, you can check the permissions according to your needs, and the optional permissions are public mining pool data query interface call permission, mining account data query interface call permission, and mining machine data query interface call permission).", - + backMenu:"Return to Table of Contents", + catalogue:"Catalogue:", } } \ No newline at end of file diff --git a/mining-pool/src/views/AccessMiningPool/index.js b/mining-pool/src/views/AccessMiningPool/index.js index 2adc67e..d1f9c79 100644 --- a/mining-pool/src/views/AccessMiningPool/index.js +++ b/mining-pool/src/views/AccessMiningPool/index.js @@ -270,7 +270,8 @@ export default { lang:this.$i18n.locale, }, info:"", - activeId:"" + activeId:"", + contentShow:false } }, @@ -350,10 +351,15 @@ export default { this.info = res.data.content || "" this.activeId = res.data.id + this.contentShow = true } this.setLoading('tutorialLoading', false); }, + backMenu(){ + this.contentShow = false + }, + // isActiveRoute(item) { @@ -413,6 +419,7 @@ export default { this.activeCoin = item.coin localStorage.setItem('activeCoin', JSON.stringify(this.activeCoin)) this.fetchProblemDetails(this.DetailsParams) + // if (!item.path) return; // 添加路径检查 // this.activeCoin = item.value // this.pageTitle = item.name diff --git a/mining-pool/src/views/AccessMiningPool/index.vue b/mining-pool/src/views/AccessMiningPool/index.vue index cce374c..8b0e5ae 100644 --- a/mining-pool/src/views/AccessMiningPool/index.vue +++ b/mining-pool/src/views/AccessMiningPool/index.vue @@ -2,8 +2,7 @@
{{ $t("course.backMenu") || "返回挖矿教程目录" }}
+{{ $t("home.noContent") || "暂无内容" }}
+{{ $t('home.noContent') || '暂无内容' }}
-{{ $t("home.noContent") || "暂无内容" }}
+https://m2pool.com/oapi/v1/pool/watch?coin={coin}
{{ $t(`apiFile.explain1`) }}
https://m2pool.com/oapi/v1/pool/
hashrate_history?coin={coin}&start={yyyy-MM-dd}&end={yyyy-MM-dd
}
@@ -71,10 +73,10 @@
{{ $t(`apiFile.explain6`) }}
{{ $t(`apiFile.miningPoolInformation1`) }}
HashRate
@@ -100,7 +102,7 @@MinersList
{{ $t(`apiFile.minersNum`) }}
@@ -131,7 +133,7 @@{{ $t(`apiFile.overviewOfMiningPool`) }}
Get /oapi/v1/pool/watch
@@ -200,7 +202,7 @@{{ $t(`apiFile.currentMiners`) }}
Get /oapi/v1/pool/miners_list
@@ -239,7 +241,7 @@{{ $t(`apiFile.realTimePower`) }}
Get /oapi/v1/pool/hashrate
@@ -290,7 +292,7 @@{{ $t(`apiFile.historyPower`) }}
Get /oapi/v1/pool/hashrate_history
@@ -355,10 +357,10 @@{{ $t(`apiFile.miningPoolInformation1`) }}
HashRate
@@ -384,7 +386,7 @@MinersList
{{ $t(`apiFile.minerData`) }}
@@ -415,7 +417,7 @@MinerInfo
{{ $t(`apiFile.stateData`) }}
@@ -444,7 +446,7 @@{{ $t(`apiFile.overviewOfMiners`) }}
Post /oapi/v1/account/watch
@@ -490,7 +492,7 @@{{ $t(`apiFile.allMiners`) }}
Post /oapi/v1/account/miners_list
@@ -535,7 +537,7 @@{{ $t(`apiFile.realTimeAccount`) }}
Post /oapi/v1/account/hashrate_real
@@ -592,7 +594,7 @@{{ $t(`apiFile.account24h`) }}
Post /oapi/v1/account/hashrate_history
@@ -655,7 +657,7 @@{{ $t(`apiFile.account24h30m`) }}
Post /oapi/v1/account/hashrate_last24h
@@ -708,10 +710,10 @@{{ $t(`apiFile.miningPoolInformation1`) }}
HashRate
@@ -737,7 +739,7 @@{{ $t(`apiFile.realTimeMiningMachine`) }}
Post /oapi/v1/miner/hashrate_real
@@ -799,7 +801,7 @@{{ $t(`apiFile.miningMachineHistory24h`) }}
Post /oapi/v1/miner/hashrate_history
@@ -869,7 +871,7 @@{{ $t(`apiFile.realTimeMiningMachine24h30m`) }}
Post /oapi/v1/miner/hashrate_last24h
@@ -930,31 +932,59 @@ + --> +{{ $t("apiFile.backMenu") || "返回目录" }}
+{{ $t("home.noContent") || "暂无内容" }}
+{{ $t('home.noContent') || '暂无内容' }}
-{{ $t("home.noContent") || "暂无内容" }}
+qq4|S}(KNCqv~^Z=+yu+u_ZG{8GY*&O*k8Wj
zNWDItA*`AtNzgB{yx1=vpbGn>zP34E0KtOytLGcZTm1GTM1AZD7+YI8OALnrYTszp
zH(wkV*}MXZc03zcQNs=j2*AvrYHB`G?>TYzj~6~?=Y$Sz?q?>G%!wU3QJN*sz0WB&
z#`Eh@U1*^EsO|NqUcvCqc*q165nt%@=8QNq`hZ@`*>Nh=<0k@I2^{z@34&@erzO8v
zc8ATc{(TBKp+UQvFIcEkFdxma0N|X>?d?&Fc!oh|ym8RSt7P?ESZJ)ZIE6*1)IWWy
z2t{JLOE&HG(4yWUhWh00z~4>t65pC-X>tdL{dgA*Wa+2Vt_ cA*fS6J0Sjk0xB2VThutm@#9D($K|*z!uURUVpA_*QvHf~j1#Qi0xe
z*PH_1U-3?ETz3_MzjLNuCaBHF$mMV---!wR!QiVex%4jn!u~yq>m~3g|`>FP9OA
zxQ(tlEjJy5Y^I