From 79b0a4e5c55d3b64c9e374bc9904478378c29276 Mon Sep 17 00:00:00 2001 From: yujiacong <1016029365@qq.com> Date: Fri, 17 Oct 2025 18:07:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=9F=E8=80=B3=E5=85=B6=E5=85=AC=E4=BC=9A?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=20-=20=E9=92=BB=E7=9F=B3=E6=94=B6=E7=9B=8A?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=20-=20=E5=A2=9E=E5=8A=A0=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E8=96=AA=E8=B5=84=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guild-ar/css/diamondStatistics.css | 156 ++++++++- .../guild-ar/css/diamondStatistics.scss | 183 +++++++++- .../modules/guild-ar/diamondStatistics.html | 158 ++++++--- .../modules/guild-ar/js/diamondStatistics.js | 135 +++++++- view/molistar/modules/guild-ar/local/ar.js | 14 + view/molistar/modules/guild-ar/local/br.js | 17 +- view/molistar/modules/guild-ar/local/en.js | 15 +- view/molistar/modules/guild-ar/local/es.js | 15 +- view/molistar/modules/guild-ar/local/ru.js | 15 +- view/molistar/modules/guild-ar/local/tr.js | 15 +- view/molistar/modules/guild-ar/local/uz.js | 317 +----------------- view/molistar/modules/guild-ar/local/zh.js | 14 + 12 files changed, 667 insertions(+), 387 deletions(-) diff --git a/view/molistar/modules/guild-ar/css/diamondStatistics.css b/view/molistar/modules/guild-ar/css/diamondStatistics.css index d51bb7fe..da4ac9aa 100644 --- a/view/molistar/modules/guild-ar/css/diamondStatistics.css +++ b/view/molistar/modules/guild-ar/css/diamondStatistics.css @@ -1,3 +1,4 @@ +@charset "UTF-8"; .back { width: 100%; height: 0.5866666667rem; @@ -30,7 +31,7 @@ } .data_time { - margin: 2.4rem 0.4266666667rem 0; + margin: 0.4rem 0.4266666667rem 0; background: #F2F3F7; border-radius: 0.32rem; padding: 0.2666666667rem 0.24rem; @@ -90,10 +91,138 @@ margin-top: 0.1066666667rem; } +.salary_box { + background: #EBFFF6; + border-radius: 0.2133333333rem; + margin: 0.3733333333rem 0.4266666667rem 0; + padding: 0.24rem; +} +.salary_box .title_box { + font-family: PingFang SC, PingFang SC; + font-weight: 600; + font-size: 0.3733333333rem; + color: #313131; + font-style: normal; + text-transform: none; +} +.salary_box .xian { + height: 0.0266666667rem; + background: #E4E4E4; + margin-top: 0.24rem; +} +.salary_box .Current_box { + margin-top: 0.24rem; + /* 进度条样式 */ +} +.salary_box .Current_box span { + font-family: PingFang SC, PingFang SC; + font-weight: 400; + font-size: 0.32rem; + color: #7B7B7D; + line-height: 0.4533333333rem; + font-style: normal; + text-transform: none; +} +.salary_box .Current_box .progress_box { + height: 0.1333333333rem; + background-color: #B2E8D0; + overflow: hidden; + border-radius: 6.6933333333rem; + margin: 0.1066666667rem 0; +} +.salary_box .Current_box .progress_box .progress_bar { + width: 100%; + background: #04D5C6; + transition: width 0.3s ease; + position: relative; + height: 0.1333333333rem; + border-radius: 6.6933333333rem; +} +.salary_box .Valid_box { + margin-top: 0.2933333333rem; + /* 进度条样式 */ +} +.salary_box .Valid_box span { + font-family: PingFang SC, PingFang SC; + font-weight: 400; + font-size: 0.32rem; + color: #7B7B7D; + line-height: 0.4533333333rem; + font-style: normal; + text-transform: none; +} +.salary_box .Valid_box .progress_box { + height: 0.1333333333rem; + background-color: #B2E8D0; + overflow: hidden; + border-radius: 6.6933333333rem; + margin: 0.1066666667rem 0; +} +.salary_box .Valid_box .progress_box .progress_bar { + width: 100%; + background: #04D5C6; + transition: width 0.3s ease; + position: relative; + height: 0.1333333333rem; + border-radius: 6.6933333333rem; +} + +.salary_member_box { + background: #EBFFF6; + border-radius: 0.2133333333rem; + margin: 0.3733333333rem 0.4266666667rem 0; + padding: 0.24rem; + position: relative; + display: none; +} +.salary_member_box .title_box { + font-family: PingFang SC, PingFang SC; + font-weight: 600; + font-size: 0.3733333333rem; + color: #313131; + font-style: normal; + text-transform: none; +} +.salary_member_box .txt_box { + font-family: PingFang SC, PingFang SC; + font-weight: 400; + font-size: 0.3733333333rem; + color: #7B7B7D; + font-style: normal; + text-transform: none; + margin-top: 0.1333333333rem; +} +.salary_member_box .txt_box img { + width: 0.48rem; + height: 0.48rem; +} +.salary_member_box .xian { + height: 0.0266666667rem; + background: #E4E4E4; + margin-top: 0.24rem; +} +.salary_member_box .Issue_amounts { + background: #FFFFFF; + box-shadow: 0px 0px 0.2666666667rem 0px rgba(0, 0, 0, 0.3); + border-radius: 0.2133333333rem; + padding: 0.24rem; + font-family: PingFang SC, PingFang SC; + font-weight: 400; + font-size: 0.3466666667rem; + color: #313131; + line-height: 0.48rem; + text-align: center; + font-style: normal; + text-transform: none; + position: absolute; + top: 1.9733333333rem; + display: none; +} + .tab_list { display: flex; align-items: center; - margin: 0.4rem 0.5333333333rem 0; + margin: 2.4rem 0.5333333333rem 0; gap: 0.4533333333rem; } .tab_list .tab_box { @@ -112,24 +241,32 @@ color: #3571FF; } -.data-table { +.table-container { width: calc(100% - 0.8533333333rem); - border-collapse: collapse; margin: 0.3733333333rem 0.4266666667rem; + overflow-x: auto; + -webkit-overflow-scrolling: touch; + /* 隐藏滚动条 */ +} +.table-container::-webkit-scrollbar { + display: none; +} + +.data-table { + width: 100%; + min-width: 100%; + border-collapse: collapse; box-sizing: border-box; } .data-table tr { - display: flex; + vertical-align: middle; } .data-table th, .data-table td { padding: 0.4rem 0.1333333333rem; text-align: center; - display: flex; - align-items: center; - justify-content: center; - flex: 1; + vertical-align: middle; } .data-table th img, .data-table td img { @@ -204,6 +341,7 @@ font-style: normal; text-transform: none; padding: 0.1333333333rem 0.2666666667rem; + vertical-align: middle; } .data-table tbody tr:nth-child(even) { diff --git a/view/molistar/modules/guild-ar/css/diamondStatistics.scss b/view/molistar/modules/guild-ar/css/diamondStatistics.scss index e6b332a3..f78aef39 100644 --- a/view/molistar/modules/guild-ar/css/diamondStatistics.scss +++ b/view/molistar/modules/guild-ar/css/diamondStatistics.scss @@ -40,7 +40,7 @@ } .data_time { - margin: px2rem(180) px2rem(32) 0; + margin: px2rem(30) px2rem(32) 0; background: #F2F3F7; border-radius: px2rem(24); padding: px2rem(20) px2rem(18); @@ -108,10 +108,158 @@ } } +.salary_box { + background: #EBFFF6; + border-radius: px2rem(16); + margin: px2rem(28) px2rem(32) 0; + padding: px2rem(18); + + .title_box { + font-family: PingFang SC, PingFang SC; + font-weight: 600; + font-size: px2rem(28); + color: #313131; + font-style: normal; + text-transform: none; + } + + .xian { + height: px2rem(2); + background: #E4E4E4; + margin-top: px2rem(18); + } + + + + .Current_box { + margin-top: px2rem(18); + + span { + font-family: PingFang SC, PingFang SC; + font-weight: 400; + font-size: px2rem(24); + color: #7B7B7D; + line-height: px2rem(34); + font-style: normal; + text-transform: none; + } + + /* 进度条样式 */ + .progress_box { + height: px2rem(10); + background-color: #B2E8D0; + overflow: hidden; + border-radius: px2rem(502); + margin: px2rem(8) 0; + + .progress_bar { + width: 100%; + background: #04D5C6; + transition: width 0.3s ease; + position: relative; + height: px2rem(10); + border-radius: px2rem(502); + + } + } + } + + .Valid_box { + margin-top: px2rem(22); + + span { + font-family: PingFang SC, PingFang SC; + font-weight: 400; + font-size: px2rem(24); + color: #7B7B7D; + line-height: px2rem(34); + font-style: normal; + text-transform: none; + } + + /* 进度条样式 */ + .progress_box { + height: px2rem(10); + background-color: #B2E8D0; + overflow: hidden; + border-radius: px2rem(502); + margin: px2rem(8) 0; + + .progress_bar { + width: 100%; + background: #04D5C6; + transition: width 0.3s ease; + position: relative; + height: px2rem(10); + border-radius: px2rem(502); + + } + } + } +} + +.salary_member_box { + background: #EBFFF6; + border-radius: px2rem(16); + margin: px2rem(28) px2rem(32) 0; + padding: px2rem(18); + position: relative; + display: none; + .title_box { + font-family: PingFang SC, PingFang SC; + font-weight: 600; + font-size: px2rem(28); + color: #313131; + font-style: normal; + text-transform: none; + } + + .txt_box { + font-family: PingFang SC, PingFang SC; + font-weight: 400; + font-size: px2rem(28); + color: #7B7B7D; + font-style: normal; + text-transform: none; + margin-top: px2rem(10); + + img { + width: px2rem(36); + height: px2rem(36); + } + } + + + .xian { + height: px2rem(2); + background: #E4E4E4; + margin-top: px2rem(18); + } + + .Issue_amounts { + background: #FFFFFF; + box-shadow: 0px 0px px2rem(20) 0px rgba(0, 0, 0, 0.3); + border-radius: px2rem(16); + padding: px2rem(18); + font-family: PingFang SC, PingFang SC; + font-weight: 400; + font-size: px2rem(26); + color: #313131; + line-height: px2rem(36); + text-align: center; + font-style: normal; + text-transform: none; + position: absolute; + top: px2rem(148); + display: none; + } +} + + .tab_list { display: flex; align-items: center; - margin: px2rem(30) px2rem(40) 0; + margin: px2rem(180) px2rem(40) 0; gap: px2rem(34); .tab_box { @@ -131,15 +279,25 @@ color: #3571FF; } } - -.data-table { +.table-container{ width: calc(100% - #{px2rem(64)}); + margin: px2rem(28) px2rem(32); + overflow-x: auto; + -webkit-overflow-scrolling: touch; + /* 隐藏滚动条 */ + &::-webkit-scrollbar { + display: none; // 隐藏 Webkit 浏览器(如 iOS、Chrome)滚动条 + } +} +.data-table { + width: 100%; + min-width: 100%; border-collapse: collapse; - margin: px2rem(28) px2rem(32); box-sizing: border-box; tr { - display: flex; + // display: flex; + vertical-align: middle; } } @@ -153,15 +311,17 @@ height: px2rem(36); } - display: flex; - align-items: center; - justify-content: center; - flex: 1; + // display: flex; + // align-items: center; + // justify-content: center; + // flex: 1; + vertical-align: middle; .user_info { display: flex; align-items: center; position: relative; + .avatar { width: px2rem(60); height: px2rem(60); @@ -225,6 +385,7 @@ font-style: normal; text-transform: none; padding: px2rem(10) px2rem(20); + vertical-align: middle; } .data-table tbody tr:nth-child(even) { @@ -259,6 +420,7 @@ bottom: 0; left: 50%; transform: translateX(-50%); + // padding-bottom: px2rem(50); .title { width: 100%; @@ -290,6 +452,7 @@ height: 6rem; margin-top: px2rem(120); overflow-y: scroll; + &::-webkit-scrollbar { display: none; } diff --git a/view/molistar/modules/guild-ar/diamondStatistics.html b/view/molistar/modules/guild-ar/diamondStatistics.html index 2ccf52b7..0d081d0a 100644 --- a/view/molistar/modules/guild-ar/diamondStatistics.html +++ b/view/molistar/modules/guild-ar/diamondStatistics.html @@ -1,44 +1,103 @@ - -
- - + + +