diff --git a/view/molistar/common/local/langHandler.js b/view/molistar/common/local/langHandler.js index b7ef5f9f..c5311cce 100644 --- a/view/molistar/common/local/langHandler.js +++ b/view/molistar/common/local/langHandler.js @@ -34,7 +34,7 @@ function initLocalLang() { window.lang.code = 'id' window.lang.defaults = false } else if (lang === 'tr' || window.location.href.match('=tr')) { - if (window.location.href.match('roomLevel') || window.location.href.match('rechargeNew') || window.location.href.match('2024-newYear') || window.location.href.match('guild-ar') || window.location.href.match('2024-invitationFission') || window.location.href.match('inform') || window.location.href.match('superId') || window.location.href.match('newWeekStar') || window.location.href.match('home') || window.location.href.match('pay')) { + if (window.location.href.match('newRank') || window.location.href.match('roomLevel') || window.location.href.match('rechargeNew') || window.location.href.match('2024-newYear') || window.location.href.match('guild-ar') || window.location.href.match('2024-invitationFission') || window.location.href.match('inform') || window.location.href.match('superId') || window.location.href.match('newWeekStar') || window.location.href.match('home') || window.location.href.match('pay')) { // 土耳其 console.log("langHandler" + '土耳其') window.lang = langTr diff --git a/view/molistar/modules/newRank/css/index.css b/view/molistar/modules/newRank/css/index.css index ef773636..4034e864 100644 --- a/view/molistar/modules/newRank/css/index.css +++ b/view/molistar/modules/newRank/css/index.css @@ -1,7 +1,8 @@ html, body { width: 100%; - background: #fff; + background: #1C0E04; + overflow-x: hidden; } .back { @@ -10,7 +11,7 @@ body { line-height: 0.58667rem; position: fixed; left: 0; - top: 0.86667rem; + top: 1.33333rem; text-align: center; color: #FFFFFF; font-size: 0.50667rem; @@ -24,33 +25,54 @@ body { position: absolute; left: 0.24rem; top: 0rem; + z-index: 2; +} + +.back p { + width: 100%; + height: 0.58667rem; + line-height: 0.58667rem; + position: absolute; + left: 0.24rem; + top: 0rem; + text-align: center; + color: #FFF8C2; + font-size: 0.42667rem; + font-weight: 600; } .header { width: 10rem; - height: 11.70667rem; + height: 17rem; position: relative; margin: 0 auto; } .header .tabBox { - width: 7.6rem; - height: 0.46667rem; - line-height: 0.46667rem; + width: 10rem; + height: 1.12rem; + line-height: 1.12rem; display: flex; justify-content: space-between; position: absolute; - top: 1.52rem; + top: 2.17333rem; left: 50%; transform: translateX(-50%); + box-sizing: border-box; + padding: 0 0.14667rem; + z-index: 2; } .header .tabBox div { position: relative; - width: 1.32rem; - color: #C3BEBA; - font-size: 0.42667rem; - font-weight: 400; + width: 2.32rem; + height: 1.12rem; + color: #FFF8C2; + font-size: 0.37333rem; + font-weight: 600; + background: url(../images/tab.png) no-repeat; + background-size: 100% 100%; + text-align: center; } .header .tabBox div span { @@ -66,8 +88,10 @@ body { } .header .tabBox .act { - color: #fff; + color: #000; font-weight: bold; + background: url(../images/tabAct.png) no-repeat; + background-size: 100% 100%; } .header .tabBox .act span { @@ -76,48 +100,80 @@ body { .header .sTab { position: absolute; - width: 6.13333rem; - height: 0.74667rem; - top: 2.77333rem; + min-width: 6.8rem; + height: 0.73333rem; + top: 3.6rem; left: 50%; transform: translateX(-50%); - background: rgba(255, 255, 255, 0.4); + background: rgba(0, 0, 0, 0.5); border-radius: 0.74667rem; display: flex; justify-content: space-between; overflow: hidden; + z-index: 2; } .header .sTab div { - width: 3.06667rem; + min-width: 2.26667rem; height: 0.74667rem; line-height: 0.74667rem; border-radius: 0.74667rem; - color: #DBD6CF; - font-size: 0.4rem; - font-weight: 400; + color: #FFF8C2; + font-size: 0.37333rem; + font-weight: 500; text-align: center; } .header .sTab .act { - color: #6D6D6D; - background: #fff; + color: #000; + background: url(../images/butAct.png) no-repeat; + background-size: 100% 100%; +} + +.header .monthlyRewards { + width: 2.81333rem; + height: 3.86667rem; + z-index: 3; + position: absolute; + top: 3.69333rem; + right: -0.5rem; + background: url(../images/Rewards_icon.png) no-repeat; + background-size: 100% 100%; + color: #000; + font-size: 0.34667rem; + font-weight: 500; + display: none; +} + +.header .monthlyRewards p { + position: absolute; + width: 100%; + text-align: center; + right: 0; + top: 2.69333rem; +} + +.header .monthlyRewards b { + position: absolute; + width: 100%; + text-align: center; + right: 0; + top: 3.08rem; } .header .top { - width: 9.61333rem; - height: 4.02667rem; + width: 10rem; + height: 11.78667rem; position: absolute; - top: 7.86667rem; + top: 4.50667rem; left: 50%; transform: translateX(-50%); } .header .top .top1 { position: absolute; - top: -4rem; - width: 7.4rem; - height: 4.01333rem; + width: 10rem; + height: 6.66667rem; left: 50%; transform: translateX(-50%); } @@ -132,27 +188,29 @@ body { } .header .top .top1 .tx { - width: 2.34667rem; - height: 2.58667rem; + width: 2.77333rem; + height: 2.77333rem; position: absolute; - top: 0.93333rem; + top: 1.89333rem; left: 50%; transform: translateX(-50%); border-radius: 50%; } .header .top .top1 .nick { - width: 100%; + width: 50%; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; - color: #fff; + color: #FFF8C2; font-size: 0.37333rem; text-align: center; position: absolute; left: 50%; transform: translateX(-50%); - bottom: -1.46667rem; + top: 4.44rem; + z-index: 3; + font-weight: 500; } .header .top .top1 .fist { @@ -161,34 +219,44 @@ body { position: absolute; left: 50%; transform: translateX(-50%); - bottom: -2.88rem; + top: 4.8rem; + z-index: 3; + display: none; } .header .top .top1 .score { width: 100%; - height: 0.42667rem; - line-height: 0.42667rem; - color: #fff; + height: 0.4rem; + line-height: 0.4rem; + color: #FFF8C2; font-size: 0.34667rem; position: absolute; left: 50%; transform: translateX(-50%); - bottom: -2.26667rem; + top: 4.8rem; text-align: center; + z-index: 3; + font-weight: 400; + display: flex; + justify-content: center; } .header .top .top1 .score img { display: inline-block; - width: 0.45333rem; - height: 0.45333rem; + width: 0.4rem; + height: 0.4rem; +} + +.header .top .top1 .score span { + display: inline-block; } .header .top .top2 { position: absolute; - top: -1.52rem; - width: 2.82667rem; - height: 3.04rem; - left: 0.44rem; + top: 6.66667rem; + width: 5rem; + height: 5.12rem; + left: 0rem; z-index: 2; } @@ -202,55 +270,61 @@ body { } .header .top .top2 .tx { - width: 1.78667rem; - height: 1.78667rem; + width: 1.86667rem; + height: 1.86667rem; position: absolute; - top: 0.88rem; + top: 1.22667rem; left: 50%; transform: translateX(-50%); border-radius: 50%; } .header .top .top2 .nick { - width: 100%; + width: 50%; height: 0.5rem; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; - color: #fff; + color: #FFF8C2; + font-weight: 500; font-size: 0.37333rem; text-align: center; position: absolute; left: 50%; transform: translateX(-50%); - bottom: -0.68rem; + top: 3.04rem; + z-index: 3; } .header .top .top2 .score { width: 100%; - height: 0.42667rem; - line-height: 0.42667rem; - color: #fff; + height: 0.4rem; + line-height: 0.4rem; + color: #FFF8C2; font-size: 0.34667rem; + font-weight: 400; position: absolute; left: 50%; transform: translateX(-50%); - bottom: -1.33333rem; + top: 3.36rem; text-align: center; + display: flex; + justify-content: center; + z-index: 3; } .header .top .top2 .score img { display: inline-block; - width: 0.45333rem; - height: 0.45333rem; + width: 0.4rem; + height: 0.4rem; } .header .top .top3 { position: absolute; - top: -1.52rem; - width: 2.82667rem; - height: 3.04rem; - right: 0.44rem; + top: 6.66667rem; + width: 5rem; + height: 5.12rem; + right: 0rem; z-index: 2; } @@ -264,99 +338,81 @@ body { } .header .top .top3 .tx { - width: 1.78667rem; - height: 1.78667rem; + width: 1.86667rem; + height: 1.86667rem; position: absolute; - top: 0.88rem; + top: 1.22667rem; left: 50%; transform: translateX(-50%); border-radius: 50%; } .header .top .top3 .nick { - width: 100%; + width: 50%; height: 0.5rem; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; - color: #fff; + color: #FFF8C2; + font-weight: 500; font-size: 0.37333rem; text-align: center; position: absolute; left: 50%; transform: translateX(-50%); - bottom: -0.68rem; + top: 3.04rem; + z-index: 3; } .header .top .top3 .score { width: 100%; - height: 0.42667rem; - line-height: 0.42667rem; - color: #fff; + height: 0.4rem; + line-height: 0.4rem; + color: #FFF8C2; font-size: 0.34667rem; + font-weight: 400; position: absolute; left: 50%; transform: translateX(-50%); - bottom: -1.33333rem; + top: 3.36rem; text-align: center; + display: flex; + justify-content: center; + z-index: 3; } .header .top .top3 .score img { display: inline-block; - width: 0.45333rem; - height: 0.45333rem; -} - -.header .tops1 { - background: url(../images/bg1.png) no-repeat; - background-size: 100% 100%; -} - -.header .tops2 { - background: url(../images/bg2.png) no-repeat; - background-size: 100% 100%; -} - -.header .tops3 { - background: url(../images/bg3.png) no-repeat; - background-size: 100% 100%; -} - -.header .tops4 { - background: url(../images/bg4.png) no-repeat; - background-size: 100% 100%; + width: 0.4rem; + height: 0.4rem; } .header1 { background: url(../images/header1.png) no-repeat; - background-size: 100% 100%; + background-size: 100% 14.26667rem; } .header2 { background: url(../images/header2.png) no-repeat; - background-size: 100% 100%; + background-size: 100% 14.26667rem; } .header3 { background: url(../images/header3.png) no-repeat; - background-size: 100% 100%; + background-size: 100% 14.26667rem; } .header4 { background: url(../images/header4.png) no-repeat; - background-size: 100% 100%; + background-size: 100% 14.26667rem; } ul { width: 10rem; - height: 12.16rem; position: relative; z-index: 2; - margin: -0.6rem auto 2.04rem; - border-radius: 0.72rem 0.72rem 0px 0px; + margin: 0rem auto 2.04rem; box-sizing: border-box; - padding-top: 0.50667rem; - padding: 0.50667rem 0.45333rem 0 0.45333rem; overflow-y: scroll; } @@ -366,162 +422,191 @@ ul::-webkit-scrollbar { ul li { width: 100%; - height: 1.33333rem; - margin-bottom: 0.74667rem; + height: 2rem; + margin-bottom: 0.4rem; + background: url(../images/li.png) no-repeat; + background-size: 100% 100%; + position: relative; } ul li .seqNo { - width: 0.66667rem; - height: 1.33333rem; - line-height: 1.33333rem; + width: 0.88rem; + height: 1.05333rem; + line-height: 1.05333rem; text-align: center; - color: #15132B; - margin-right: 0.49333rem; - font-weight: 500; - float: left; + color: #000; + font-size: 0.50667rem; + font-weight: 600; + position: absolute; + top: -0.10667rem; + left: 0.82667rem; + background: url(../images/num.png) no-repeat; + background-size: 100% 100%; } ul li .tx { display: block; float: left; - width: 1.33333rem; - height: 1.33333rem; + width: 1.2rem; + height: 1.2rem; border-radius: 50%; - margin-right: 0.28rem; + margin-left: 1.94667rem; + margin-right: 0.24rem; + margin-top: 0.41333rem; } ul li .nick { width: 2.5rem; - height: 1.33333rem; - line-height: 1.33333rem; + height: 2rem; + line-height: 2rem; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; float: left; + color: #FFF8C2; + font-size: 0.37333rem; + font-weight: 500; } ul li .score { - height: 1.33333rem; - line-height: 1.33333rem; + height: 2rem; + line-height: 2rem; float: right; - color: #333333; + color: #FFF8C2; font-size: 0.34667rem; - font-weight: 500; + font-weight: 400; + margin-right: 1.17333rem; } ul li .score img { display: inline-block; - width: 0.42667rem; - height: 0.42667rem; + width: 0.4rem; + height: 0.4rem; vertical-align: middle; } -ul li .score span { +ul li .score span, +ul li .score b { vertical-align: middle; } -.ul1 { - background: linear-gradient(180deg, #FFF6BB -57%, #F9F7F8 90%); -} - -.ul2 { - background: linear-gradient(180deg, #B6CDFF -57%, #FEFEFE 90%); -} - -.ul3 { - background: linear-gradient(180deg, #FABBBB -57%, #FEF9F9 90%); -} - -.ul4 { - background: linear-gradient(180deg, #FFC6F5 -57%, #F9F7F9 90%); - margin-bottom: 0; -} - .my { width: 10rem; - height: 2.04rem; + height: 2rem; position: fixed; z-index: 9; - background: url(../images/myBg.png) no-repeat; + background: url(../images/myLi.png) no-repeat; background-size: 100% 100%; - left: 0; + left: 50%; + transform: translateX(-50%); bottom: 0; } .my .box { width: 100%; - height: 1.33333rem; - margin-top: 0.46667rem; - box-sizing: border-box; - padding: 0 0.4rem; + height: 100%; + position: relative; } .my .box .seqNo { - width: 0.66667rem; - height: 1.33333rem; - line-height: 1.33333rem; + width: 0.88rem; + height: 1.05333rem; + line-height: 1.05333rem; text-align: center; - color: #15132B; - margin-right: 0.49333rem; - font-weight: 500; - float: left; + color: #000; + font-size: 0.50667rem; + font-weight: 600; + position: absolute; + top: -0.10667rem; + left: 0.82667rem; + background: url(../images/num.png) no-repeat; + background-size: 100% 100%; } .my .box .tx { display: block; float: left; - width: 1.33333rem; - height: 1.33333rem; + width: 1.2rem; + height: 1.2rem; border-radius: 50%; - margin-right: 0.28rem; + margin-left: 1.94667rem; + margin-right: 0.24rem; + margin-top: 0.41333rem; } .my .box .nick { width: 2.5rem; - height: 1.33333rem; - line-height: 1.33333rem; + height: 2rem; + line-height: 2rem; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; float: left; + color: #FFF8C2; + font-size: 0.37333rem; + font-weight: 500; } .my .box .score { - height: 1.33333rem; - line-height: 1.33333rem; + height: 2rem; + line-height: 2rem; float: right; - color: #333333; + color: #FFF8C2; font-size: 0.34667rem; - font-weight: 500; + font-weight: 400; + margin-right: 1.17333rem; } .my .box .score img { display: inline-block; - width: 0.42667rem; - height: 0.42667rem; + width: 0.4rem; + height: 0.4rem; vertical-align: middle; } -.my .box .score span { +.my .box .score span, +.my .box .score b { vertical-align: middle; } -.arabic .header .tabBox { - width: 90%; +.arabic ul li .seqNo { + left: auto; + right: 0.82667rem; } -.arabic .header .tabBox div { - width: 1.9rem; - font-size: 0.33333rem; - white-space: nowrap; +.arabic ul li .tx { + float: right; + margin-left: 0.24rem; + margin-right: 1.94667rem; } -.english .header .tabBox { - width: 90%; +.arabic ul li .nick { + float: right; } -.english .header .tabBox div { - font-size: 0.34667rem; - white-space: nowrap; - width: 1.7rem; +.arabic ul li .score { + float: left; + margin-right: 0; + margin-left: 1.17333rem; +} + +.arabic .my .box .seqNo { + left: auto; + right: 0.82667rem; +} + +.arabic .my .box .tx { + float: right; + margin-left: 0.24rem; + margin-right: 1.94667rem; +} + +.arabic .my .box .nick { + float: right; +} + +.arabic .my .box .score { + float: left; + margin-right: 0; + margin-left: 1.17333rem; } diff --git a/view/molistar/modules/newRank/css/index.scss b/view/molistar/modules/newRank/css/index.scss index 572ab96c..c0ee7b1e 100644 --- a/view/molistar/modules/newRank/css/index.scss +++ b/view/molistar/modules/newRank/css/index.scss @@ -5,7 +5,8 @@ html, body { width: 100%; - background: #fff; + background: #1C0E04; + overflow-x: hidden; } .back { @@ -14,7 +15,7 @@ body { line-height: px2rem(44); position: fixed; left: 0; - top: px2rem(65); + top: px2rem(100); text-align: center; color: #FFFFFF; font-size: px2rem(38); @@ -27,32 +28,54 @@ body { position: absolute; left: px2rem(18); top: px2rem(0); + z-index: 2; + } + + p { + width: 100%; + height: px2rem(44); + line-height: px2rem(44); + position: absolute; + left: px2rem(18); + top: px2rem(0); + text-align: center; + color: #FFF8C2; + font-size: px2rem(32); + font-weight: 600; } } .header { width: px2rem(750); - height: px2rem(878); + // height: px2rem(1229); + height: 17rem; position: relative; margin: 0 auto; .tabBox { - width: px2rem(570); - height: px2rem(35); - line-height: px2rem(35); + width: px2rem(750); + height: px2rem(84); + line-height: px2rem(84); display: flex; justify-content: space-between; position: absolute; - top: px2rem(114); + top: px2rem(163); left: 50%; transform: translateX(-50%); + box-sizing: border-box; + padding: 0 px2rem(11); + z-index: 2; div { position: relative; - width: px2rem(99); - color: #C3BEBA; - font-size: px2rem(32); - font-weight: 400; + width: px2rem(174); + height: px2rem(84); + color: #FFF8C2; + font-size: px2rem(28); + font-weight: 600; + background: url(../images/tab.png) no-repeat; + background-size: 100% 100%; + text-align: center; span { width: px2rem(37); @@ -68,8 +91,10 @@ body { } .act { - color: #fff; + color: #000; font-weight: bold; + background: url(../images/tabAct.png) no-repeat; + background-size: 100% 100%; span { display: block; @@ -79,47 +104,81 @@ body { .sTab { position: absolute; - width: px2rem(460); - height: px2rem(56); - top: px2rem(208); + min-width: px2rem(510); + height: px2rem(55); + top: px2rem(270); left: 50%; transform: translateX(-50%); - background: rgba(255, 255, 255, .4); + background: rgba(0, 0, 0, .5); border-radius: px2rem(56); display: flex; justify-content: space-between; overflow: hidden; + z-index: 2; div { - width: px2rem(230); + min-width: px2rem(170); height: px2rem(56); line-height: px2rem(56); border-radius: px2rem(56); - color: #DBD6CF; - font-size: px2rem(30); - font-weight: 400; + color: #FFF8C2; + font-size: px2rem(28); + font-weight: 500; text-align: center; } .act { - color: #6D6D6D; - background: #fff; + color: #000; + background: url(../images/butAct.png) no-repeat; + background-size: 100% 100%; + } + } + + .monthlyRewards { + width: px2rem(211); + height: px2rem(290); + z-index: 3; + position: absolute; + top: px2rem(277); + right: -0.5rem; + background: url(../images/Rewards_icon.png) no-repeat; + background-size: 100% 100%; + color: #000; + font-size: px2rem(26); + font-weight: 500; + display: none; + + p { + position: absolute; + width: 100%; + text-align: center; + right: 0; + top: px2rem(202); + } + + b { + position: absolute; + width: 100%; + text-align: center; + right: 0; + top: 3.08rem; } } .top { - width: px2rem(721); - height: px2rem(302); + width: px2rem(750); + height: px2rem(884); position: absolute; - top: px2rem(590); + top: px2rem(338); + // top: 8.3rem; left: 50%; transform: translateX(-50%); .top1 { position: absolute; - top: px2rem(-300); - width: px2rem(555); - height: px2rem(301); + // top: px2rem(-300); + width: px2rem(750); + height: px2rem(500); left: 50%; transform: translateX(-50%); @@ -133,27 +192,29 @@ body { } .tx { - width: px2rem(176); - height: px2rem(194); + width: px2rem(208); + height: px2rem(208); position: absolute; - top: px2rem(70); + top: px2rem(142); left: 50%; transform: translateX(-50%); border-radius: 50%; } .nick { - width: 100%; + width: 50%; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; - color: #fff; + color: #FFF8C2; font-size: px2rem(28); text-align: center; position: absolute; left: 50%; transform: translateX(-50%); - bottom: px2rem(-110); + top: px2rem(333); + z-index: 3; + font-weight: 500; } .fist { @@ -162,36 +223,47 @@ body { position: absolute; left: 50%; transform: translateX(-50%); - bottom: px2rem(-216); + top: px2rem(360); + z-index: 3; + display: none; } + .score { width: 100%; - height: px2rem(32); - line-height: px2rem(32); - color: #fff; + height: px2rem(30); + line-height: px2rem(30); + color: #FFF8C2; font-size: px2rem(26); position: absolute; left: 50%; transform: translateX(-50%); - bottom: px2rem(-170); + top: px2rem(360); text-align: center; + z-index: 3; + font-weight: 400; + display: flex; + justify-content: center; img { display: inline-block; - width: px2rem(34); - height: px2rem(34); - // margin-top: -0.04rem; + width: px2rem(30); + height: px2rem(30); + } + + span { + display: inline-block; } } } .top2 { position: absolute; - top: px2rem(-114); - width: px2rem(212); - height: px2rem(228); - left: px2rem(33); + top: px2rem(500); + width: px2rem(375); + height: px2rem(384); + left: px2rem(0); z-index: 2; + // display: none; .ts { width: 100%; @@ -203,58 +275,64 @@ body { } .tx { - width: px2rem(134); - height: px2rem(134); + width: px2rem(140); + height: px2rem(140); position: absolute; - top: px2rem(66); + top: px2rem(92); left: 50%; transform: translateX(-50%); border-radius: 50%; } .nick { - width: 100%; + width: 50%; height: 0.5rem; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; - color: #fff; + color: #FFF8C2; + font-weight: 500; font-size: px2rem(28); text-align: center; position: absolute; left: 50%; transform: translateX(-50%); - bottom: px2rem(-51); + top: px2rem(228); + z-index: 3; } .score { width: 100%; - height: px2rem(32); - line-height: px2rem(32); - color: #fff; + height: px2rem(30); + line-height: px2rem(30); + color: #FFF8C2; font-size: px2rem(26); + font-weight: 400; position: absolute; left: 50%; transform: translateX(-50%); - bottom: px2rem(-100); + top: px2rem(252); text-align: center; + display: flex; + justify-content: center; + z-index: 3; img { display: inline-block; - width: px2rem(34); - height: px2rem(34); - // margin-top: -0.04rem; + width: px2rem(30); + height: px2rem(30); } } } .top3 { position: absolute; - top: px2rem(-114); - width: px2rem(212); - height: px2rem(228); - right: px2rem(33); + top: px2rem(500); + width: px2rem(375); + height: px2rem(384); + right: px2rem(0); z-index: 2; + // display: none; .ts { width: 100%; @@ -266,103 +344,105 @@ body { } .tx { - width: px2rem(134); - height: px2rem(134); + width: px2rem(140); + height: px2rem(140); position: absolute; - top: px2rem(66); + top: px2rem(92); left: 50%; transform: translateX(-50%); border-radius: 50%; } .nick { - width: 100%; + width: 50%; height: 0.5rem; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; - color: #fff; + color: #FFF8C2; + font-weight: 500; font-size: px2rem(28); text-align: center; position: absolute; left: 50%; transform: translateX(-50%); - bottom: px2rem(-51); + top: px2rem(228); + z-index: 3; } .score { width: 100%; - height: px2rem(32); - line-height: px2rem(32); - color: #fff; + height: px2rem(30); + line-height: px2rem(30); + color: #FFF8C2; font-size: px2rem(26); + font-weight: 400; position: absolute; left: 50%; transform: translateX(-50%); - bottom: px2rem(-100); + top: px2rem(252); text-align: center; + display: flex; + justify-content: center; + z-index: 3; img { display: inline-block; - width: px2rem(34); - height: px2rem(34); - // margin-top: -0.04rem; + width: px2rem(30); + height: px2rem(30); } } } } - .tops1 { - background: url(../images/bg1.png) no-repeat; - background-size: 100% 100%; - } + // .tops1 { + // background: url(../images/bg1.png) no-repeat; + // background-size: 100% 100%; + // } - .tops2 { - background: url(../images/bg2.png) no-repeat; - background-size: 100% 100%; - } + // .tops2 { + // background: url(../images/bg2.png) no-repeat; + // background-size: 100% 100%; + // } - .tops3 { - background: url(../images/bg3.png) no-repeat; - background-size: 100% 100%; - } + // .tops3 { + // background: url(../images/bg3.png) no-repeat; + // background-size: 100% 100%; + // } - .tops4 { - background: url(../images/bg4.png) no-repeat; - background-size: 100% 100%; - } + // .tops4 { + // background: url(../images/bg4.png) no-repeat; + // background-size: 100% 100%; + // } } .header1 { background: url(../images/header1.png) no-repeat; - background-size: 100% 100%; + background-size: 100% px2rem(1070); } .header2 { background: url(../images/header2.png) no-repeat; - background-size: 100% 100%; + background-size: 100% px2rem(1070); } .header3 { background: url(../images/header3.png) no-repeat; - background-size: 100% 100%; + background-size: 100% px2rem(1070); } .header4 { background: url(../images/header4.png) no-repeat; - background-size: 100% 100%; + background-size: 100% px2rem(1070); } ul { width: px2rem(750); - height: px2rem(912); + // height: px2rem(912); position: relative; z-index: 2; - margin: px2rem(-45) auto px2rem(153); - border-radius: px2rem(54) px2rem(54) 0px 0px; + margin: px2rem(0) auto px2rem(153); box-sizing: border-box; - padding-top: px2rem(38); - padding: px2rem(38) px2rem(34) 0 px2rem(34); overflow-y: scroll; &::-webkit-scrollbar { @@ -371,143 +451,167 @@ ul { li { width: 100%; - height: px2rem(100); - margin-bottom: px2rem(56); + height: px2rem(150); + margin-bottom: px2rem(30); + background: url(../images/li.png) no-repeat; + background-size: 100% 100%; + position: relative; .seqNo { - width: px2rem(50); - height: px2rem(100); - line-height: px2rem(100); + width: px2rem(66); + height: px2rem(79); + line-height: px2rem(79); text-align: center; - color: #15132B; - margin-right: px2rem(37); - font-weight: 500; - float: left; + color: #000; + font-size: px2rem(38); + font-weight: 600; + position: absolute; + top: px2rem(-8); + left: px2rem(62); + background: url(../images/num.png) no-repeat; + background-size: 100% 100%; } .tx { display: block; float: left; - width: px2rem(100); - height: px2rem(100); + width: px2rem(90); + height: px2rem(90); border-radius: 50%; - margin-right: px2rem(21); + margin-left: px2rem(146); + margin-right: px2rem(18); + margin-top: px2rem(31); } .nick { width: 2.5rem; - height: px2rem(100); - line-height: px2rem(100); + height: px2rem(150); + line-height: px2rem(150); overflow: hidden; white-space: nowrap; text-overflow: ellipsis; float: left; + color: #FFF8C2; + font-size: px2rem(28); + font-weight: 500; } .score { - height: px2rem(100); - line-height: px2rem(100); + height: px2rem(150); + line-height: px2rem(150); float: right; - color: #333333; + color: #FFF8C2; font-size: px2rem(26); - font-weight: 500; + font-weight: 400; + margin-right: px2rem(88); img { display: inline-block; - width: px2rem(32); - height: px2rem(32); + width: px2rem(30); + height: px2rem(30); vertical-align: middle; // margin-top: -0.1rem; } - span { + span, + b { vertical-align: middle; } } } } -.ul1 { - background: linear-gradient(180deg, #FFF6BB -57%, #F9F7F8 90%); -} +// .ul1 { +// background: linear-gradient(180deg, #FFF6BB -57%, #F9F7F8 90%); +// } -.ul2 { - background: linear-gradient(180deg, #B6CDFF -57%, #FEFEFE 90%); -} +// .ul2 { +// background: linear-gradient(180deg, #B6CDFF -57%, #FEFEFE 90%); +// } -.ul3 { - background: linear-gradient(180deg, #FABBBB -57%, #FEF9F9 90%); -} +// .ul3 { +// background: linear-gradient(180deg, #FABBBB -57%, #FEF9F9 90%); +// } -.ul4 { - background: linear-gradient(180deg, #FFC6F5 -57%, #F9F7F9 90%); - margin-bottom: 0; -} +// .ul4 { +// background: linear-gradient(180deg, #FFC6F5 -57%, #F9F7F9 90%); +// margin-bottom: 0; +// } .my { width: px2rem(750); - height: px2rem(153); + height: px2rem(150); position: fixed; z-index: 9; - background: url(../images/myBg.png) no-repeat; + background: url(../images/myLi.png) no-repeat; background-size: 100% 100%; - left: 0; + left: 50%; + transform: translateX(-50%); bottom: 0; .box { width: 100%; - height: px2rem(100); - margin-top: px2rem(35); - box-sizing: border-box; - padding: 0 px2rem(30); + height: 100%; + position: relative; .seqNo { - width: px2rem(50); - height: px2rem(100); - line-height: px2rem(100); + width: px2rem(66); + height: px2rem(79); + line-height: px2rem(79); text-align: center; - color: #15132B; - margin-right: px2rem(37); - font-weight: 500; - float: left; + color: #000; + font-size: px2rem(38); + font-weight: 600; + position: absolute; + top: px2rem(-8); + left: px2rem(62); + background: url(../images/num.png) no-repeat; + background-size: 100% 100%; } .tx { display: block; float: left; - width: px2rem(100); - height: px2rem(100); + width: px2rem(90); + height: px2rem(90); border-radius: 50%; - margin-right: px2rem(21); + margin-left: px2rem(146); + margin-right: px2rem(18); + margin-top: px2rem(31); } .nick { width: 2.5rem; - height: px2rem(100); - line-height: px2rem(100); + height: px2rem(150); + line-height: px2rem(150); overflow: hidden; white-space: nowrap; text-overflow: ellipsis; float: left; + color: #FFF8C2; + font-size: px2rem(28); + font-weight: 500; } .score { - height: px2rem(100); - line-height: px2rem(100); + height: px2rem(150); + line-height: px2rem(150); float: right; - color: #333333; + color: #FFF8C2; font-size: px2rem(26); - font-weight: 500; + font-weight: 400; + margin-right: px2rem(88); img { display: inline-block; - width: px2rem(32); - height: px2rem(32); + width: px2rem(30); + height: px2rem(30); vertical-align: middle; // margin-top: -0.1rem; } - span { + span, + b { vertical-align: middle; } } @@ -515,25 +619,49 @@ ul { } .arabic { - .header .tabBox { - width: 90%; + ul li { + .seqNo { + left: auto; + right: 0.82667rem; + } - div { - width: 1.9rem; - font-size: px2rem(25); - white-space: nowrap; + .tx { + float: right; + margin-left: 0.24rem; + margin-right: 1.94667rem; + } + + .nick { + float: right; + } + + .score { + float: left; + margin-right: 0; + margin-left: 1.17333rem; } } -} -.english { + .my .box { + .seqNo { + left: auto; + right: 0.82667rem; + } - .header .tabBox { - width: 90%; - div { - font-size: px2rem(26); - white-space: nowrap; - width: 1.7rem; + .tx { + float: right; + margin-left: 0.24rem; + margin-right: 1.94667rem; + } + + .nick { + float: right; + } + + .score { + float: left; + margin-right: 0; + margin-left: 1.17333rem; } } } \ No newline at end of file diff --git a/view/molistar/modules/newRank/css/monthlyRewards.css b/view/molistar/modules/newRank/css/monthlyRewards.css new file mode 100644 index 00000000..c324c438 --- /dev/null +++ b/view/molistar/modules/newRank/css/monthlyRewards.css @@ -0,0 +1,362 @@ +html, +body { + width: 100%; + background: #1C0E04; + overflow-x: hidden; +} + +.back { + width: 100%; + height: 0.58667rem; + line-height: 0.58667rem; + position: fixed; + left: 0; + top: 1.33333rem; + text-align: center; + color: #FFFFFF; + font-size: 0.50667rem; + font-weight: bold; + z-index: 10; +} + +.back img { + width: 0.58667rem; + height: 0.58667rem; + position: absolute; + left: 0.24rem; + top: 0rem; + z-index: 2; +} + +.back p { + width: 100%; + height: 0.58667rem; + line-height: 0.58667rem; + position: absolute; + left: 0.24rem; + top: 0rem; + text-align: center; + color: #FFF8C2; + font-size: 0.42667rem; + font-weight: 600; +} + +.header { + width: 10rem; + height: 17rem; + position: relative; + margin: 0 auto; +} + +.header .tabBox { + width: 10rem; + height: 1.12rem; + line-height: 1.12rem; + display: flex; + justify-content: space-evenly; + position: absolute; + top: 2.17333rem; + left: 50%; + transform: translateX(-50%); + box-sizing: border-box; + padding: 0 0.14667rem; + z-index: 2; +} + +.header .tabBox div { + position: relative; + width: 2.32rem; + height: 1.12rem; + color: #FFF8C2; + font-size: 0.37333rem; + font-weight: 600; + background: url(../images/tab.png) no-repeat; + background-size: 100% 100%; + text-align: center; +} + +.header .tabBox div span { + width: 0.49333rem; + height: 0.10667rem; + border-radius: 0.10667rem; + background: #fff; + position: absolute; + bottom: -0.29333rem; + left: 50%; + transform: translateX(-50%); + display: none; +} + +.header .tabBox .act { + color: #000; + font-weight: bold; + background: url(../images/tabAct.png) no-repeat; + background-size: 100% 100%; +} + +.header .tabBox .act span { + display: block; +} + +.header .lastMonthWealthTOP3 { + min-width: 5.06667rem; + height: 0.77333rem; + line-height: 0.77333rem; + text-align: center; + padding: 0 0.32rem; + background: url(../images/lastMonth.png) no-repeat; + background-size: 100% 100%; + color: #000; + font-size: 0.37333rem; + font-weight: 500; + position: absolute; + top: 3.57333rem; + left: 50%; + transform: translateX(-50%); +} + +.header .top { + width: 10rem; + height: 11.78667rem; + position: absolute; + top: 4.50667rem; + left: 50%; + transform: translateX(-50%); +} + +.header .top .top1 { + position: absolute; + width: 10rem; + height: 6.66667rem; + left: 50%; + transform: translateX(-50%); +} + +.header .top .top1 .ts { + width: 100%; + height: 100%; + position: absolute; + left: 0; + top: 0; + z-index: 2; +} + +.header .top .top1 .tx { + width: 2.77333rem; + height: 2.77333rem; + position: absolute; + top: 1.89333rem; + left: 50%; + transform: translateX(-50%); + border-radius: 50%; +} + +.header .top .top1 .nick { + width: 50%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + color: #FFF8C2; + font-size: 0.37333rem; + text-align: center; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: 4.44rem; + z-index: 3; + font-weight: 500; +} + +.header .top .top1 .fist { + width: 1.02667rem; + height: 1.24rem; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: 4.8rem; + z-index: 3; + display: none; +} + +.header .top .top1 .score { + width: 100%; + height: 0.4rem; + line-height: 0.4rem; + color: #FFF8C2; + font-size: 0.34667rem; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: 4.8rem; + text-align: center; + z-index: 3; + font-weight: 400; + display: flex; + justify-content: center; +} + +.header .top .top1 .score img { + display: inline-block; + width: 0.4rem; + height: 0.4rem; +} + +.header .top .top1 .score span { + display: inline-block; +} + +.header .top .top2 { + position: absolute; + top: 6.66667rem; + width: 5rem; + height: 5.12rem; + left: 0rem; + z-index: 2; +} + +.header .top .top2 .ts { + width: 100%; + height: 100%; + position: absolute; + left: 0; + top: 0; + z-index: 2; +} + +.header .top .top2 .tx { + width: 1.86667rem; + height: 1.86667rem; + position: absolute; + top: 1.22667rem; + left: 50%; + transform: translateX(-50%); + border-radius: 50%; +} + +.header .top .top2 .nick { + width: 50%; + height: 0.5rem; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + color: #FFF8C2; + font-weight: 500; + font-size: 0.37333rem; + text-align: center; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: 3.04rem; + z-index: 3; +} + +.header .top .top2 .score { + width: 100%; + height: 0.4rem; + line-height: 0.4rem; + color: #FFF8C2; + font-size: 0.34667rem; + font-weight: 400; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: 3.36rem; + text-align: center; + display: flex; + justify-content: center; + z-index: 3; +} + +.header .top .top2 .score img { + display: inline-block; + width: 0.4rem; + height: 0.4rem; +} + +.header .top .top3 { + position: absolute; + top: 6.66667rem; + width: 5rem; + height: 5.12rem; + right: 0rem; + z-index: 2; +} + +.header .top .top3 .ts { + width: 100%; + height: 100%; + position: absolute; + left: 0; + top: 0; + z-index: 2; +} + +.header .top .top3 .tx { + width: 1.86667rem; + height: 1.86667rem; + position: absolute; + top: 1.22667rem; + left: 50%; + transform: translateX(-50%); + border-radius: 50%; +} + +.header .top .top3 .nick { + width: 50%; + height: 0.5rem; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + color: #FFF8C2; + font-weight: 500; + font-size: 0.37333rem; + text-align: center; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: 3.04rem; + z-index: 3; +} + +.header .top .top3 .score { + width: 100%; + height: 0.4rem; + line-height: 0.4rem; + color: #FFF8C2; + font-size: 0.34667rem; + font-weight: 400; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: 3.36rem; + text-align: center; + display: flex; + justify-content: center; + z-index: 3; +} + +.header .top .top3 .score img { + display: inline-block; + width: 0.4rem; + height: 0.4rem; +} + +.header1 { + background: url(../images/header1.png) no-repeat; + background-size: 100% 14.26667rem; +} + +.header2 { + background: url(../images/header2.png) no-repeat; + background-size: 100% 14.26667rem; +} + +.header3 { + background: url(../images/header4.png) no-repeat; + background-size: 100% 14.26667rem; +} + +.header4 { + background: url(../images/header4.png) no-repeat; + background-size: 100% 14.26667rem; +} diff --git a/view/molistar/modules/newRank/css/monthlyRewards.scss b/view/molistar/modules/newRank/css/monthlyRewards.scss new file mode 100644 index 00000000..db940bcf --- /dev/null +++ b/view/molistar/modules/newRank/css/monthlyRewards.scss @@ -0,0 +1,372 @@ +@function px2rem($px) { + @return $px / 75+rem; +} + +html, +body { + width: 100%; + background: #1C0E04; + overflow-x: hidden; +} + +.back { + width: 100%; + height: px2rem(44); + line-height: px2rem(44); + position: fixed; + left: 0; + top: px2rem(100); + text-align: center; + color: #FFFFFF; + font-size: px2rem(38); + font-weight: bold; + z-index: 10; + + img { + width: px2rem(44); + height: px2rem(44); + position: absolute; + left: px2rem(18); + top: px2rem(0); + z-index: 2; + } + + p { + width: 100%; + height: px2rem(44); + line-height: px2rem(44); + position: absolute; + left: px2rem(18); + top: px2rem(0); + text-align: center; + color: #FFF8C2; + font-size: px2rem(32); + font-weight: 600; + } +} + +.header { + width: px2rem(750); + // height: px2rem(1229); + height: 17rem; + position: relative; + margin: 0 auto; + + .tabBox { + width: px2rem(750); + height: px2rem(84); + line-height: px2rem(84); + display: flex; + justify-content: space-evenly; + position: absolute; + top: px2rem(163); + left: 50%; + transform: translateX(-50%); + box-sizing: border-box; + padding: 0 px2rem(11); + z-index: 2; + + div { + position: relative; + width: px2rem(174); + height: px2rem(84); + color: #FFF8C2; + font-size: px2rem(28); + font-weight: 600; + background: url(../images/tab.png) no-repeat; + background-size: 100% 100%; + text-align: center; + + span { + width: px2rem(37); + height: px2rem(8); + border-radius: px2rem(8); + background: #fff; + position: absolute; + bottom: px2rem(-22); + left: 50%; + transform: translateX(-50%); + display: none; + } + } + + .act { + color: #000; + font-weight: bold; + background: url(../images/tabAct.png) no-repeat; + background-size: 100% 100%; + + span { + display: block; + } + } + } + + .lastMonthWealthTOP3 { + min-width: px2rem(380); + height: px2rem(58); + line-height: px2rem(58); + text-align: center; + padding: 0 px2rem(24); + background: url(../images/lastMonth.png) no-repeat; + background-size:100% 100%; + color: #000; + font-size: px2rem(28); + font-weight: 500; + position: absolute; + top: px2rem(268); + left: 50%; + transform: translateX(-50%); + } + + .top { + width: px2rem(750); + height: px2rem(884); + position: absolute; + top: px2rem(338); + // top: 8.3rem; + left: 50%; + transform: translateX(-50%); + + .top1 { + position: absolute; + // top: px2rem(-300); + width: px2rem(750); + height: px2rem(500); + left: 50%; + transform: translateX(-50%); + + .ts { + width: 100%; + height: 100%; + position: absolute; + left: 0; + top: 0; + z-index: 2; + } + + .tx { + width: px2rem(208); + height: px2rem(208); + position: absolute; + top: px2rem(142); + left: 50%; + transform: translateX(-50%); + border-radius: 50%; + } + + .nick { + width: 50%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + color: #FFF8C2; + font-size: px2rem(28); + text-align: center; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: px2rem(333); + z-index: 3; + font-weight: 500; + } + + .fist { + width: px2rem(77); + height: px2rem(93); + position: absolute; + left: 50%; + transform: translateX(-50%); + top: px2rem(360); + z-index: 3; + display: none; + } + + .score { + width: 100%; + height: px2rem(30); + line-height: px2rem(30); + color: #FFF8C2; + font-size: px2rem(26); + position: absolute; + left: 50%; + transform: translateX(-50%); + top: px2rem(360); + text-align: center; + z-index: 3; + font-weight: 400; + display: flex; + justify-content: center; + + img { + display: inline-block; + width: px2rem(30); + height: px2rem(30); + } + + span { + display: inline-block; + } + } + } + + .top2 { + position: absolute; + top: px2rem(500); + width: px2rem(375); + height: px2rem(384); + left: px2rem(0); + z-index: 2; + // display: none; + + .ts { + width: 100%; + height: 100%; + position: absolute; + left: 0; + top: 0; + z-index: 2; + } + + .tx { + width: px2rem(140); + height: px2rem(140); + position: absolute; + top: px2rem(92); + left: 50%; + transform: translateX(-50%); + border-radius: 50%; + } + + .nick { + width: 50%; + height: 0.5rem; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + color: #FFF8C2; + font-weight: 500; + font-size: px2rem(28); + text-align: center; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: px2rem(228); + z-index: 3; + } + + .score { + width: 100%; + height: px2rem(30); + line-height: px2rem(30); + color: #FFF8C2; + font-size: px2rem(26); + font-weight: 400; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: px2rem(252); + text-align: center; + display: flex; + justify-content: center; + z-index: 3; + + img { + display: inline-block; + width: px2rem(30); + height: px2rem(30); + } + } + } + + .top3 { + position: absolute; + top: px2rem(500); + width: px2rem(375); + height: px2rem(384); + right: px2rem(0); + z-index: 2; + // display: none; + + .ts { + width: 100%; + height: 100%; + position: absolute; + left: 0; + top: 0; + z-index: 2; + } + + .tx { + width: px2rem(140); + height: px2rem(140); + position: absolute; + top: px2rem(92); + left: 50%; + transform: translateX(-50%); + border-radius: 50%; + } + + .nick { + width: 50%; + height: 0.5rem; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + color: #FFF8C2; + font-weight: 500; + font-size: px2rem(28); + text-align: center; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: px2rem(228); + z-index: 3; + } + + .score { + width: 100%; + height: px2rem(30); + line-height: px2rem(30); + color: #FFF8C2; + font-size: px2rem(26); + font-weight: 400; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: px2rem(252); + text-align: center; + display: flex; + justify-content: center; + z-index: 3; + + img { + display: inline-block; + width: px2rem(30); + height: px2rem(30); + } + } + } + } + +} + +.header1 { + background: url(../images/header1.png) no-repeat; + background-size: 100% px2rem(1070); +} + +.header2 { + background: url(../images/header2.png) no-repeat; + background-size: 100% px2rem(1070); +} + +.header3 { + background: url(../images/header4.png) no-repeat; + background-size: 100% px2rem(1070); +} + +.header4 { + background: url(../images/header4.png) no-repeat; + background-size: 100% px2rem(1070); +} \ No newline at end of file diff --git a/view/molistar/modules/newRank/images/Rewards_icon.png b/view/molistar/modules/newRank/images/Rewards_icon.png new file mode 100644 index 00000000..59867800 Binary files /dev/null and b/view/molistar/modules/newRank/images/Rewards_icon.png differ diff --git a/view/molistar/modules/newRank/images/butAct.png b/view/molistar/modules/newRank/images/butAct.png new file mode 100644 index 00000000..59822bc9 Binary files /dev/null and b/view/molistar/modules/newRank/images/butAct.png differ diff --git a/view/molistar/modules/newRank/images/gold.png b/view/molistar/modules/newRank/images/gold.png index 0e056ce8..9f48b7cd 100644 Binary files a/view/molistar/modules/newRank/images/gold.png and b/view/molistar/modules/newRank/images/gold.png differ diff --git a/view/molistar/modules/newRank/images/header1.png b/view/molistar/modules/newRank/images/header1.png index 012f67d2..b68afe82 100644 Binary files a/view/molistar/modules/newRank/images/header1.png and b/view/molistar/modules/newRank/images/header1.png differ diff --git a/view/molistar/modules/newRank/images/header2.png b/view/molistar/modules/newRank/images/header2.png index 138e20f5..bd02bb22 100644 Binary files a/view/molistar/modules/newRank/images/header2.png and b/view/molistar/modules/newRank/images/header2.png differ diff --git a/view/molistar/modules/newRank/images/header3.png b/view/molistar/modules/newRank/images/header3.png index 164c120a..8d2ecb89 100644 Binary files a/view/molistar/modules/newRank/images/header3.png and b/view/molistar/modules/newRank/images/header3.png differ diff --git a/view/molistar/modules/newRank/images/header4.png b/view/molistar/modules/newRank/images/header4.png index 19712b6d..2a37243d 100644 Binary files a/view/molistar/modules/newRank/images/header4.png and b/view/molistar/modules/newRank/images/header4.png differ diff --git a/view/molistar/modules/newRank/images/lastMonth.png b/view/molistar/modules/newRank/images/lastMonth.png new file mode 100644 index 00000000..88f9548c Binary files /dev/null and b/view/molistar/modules/newRank/images/lastMonth.png differ diff --git a/view/molistar/modules/newRank/images/li.png b/view/molistar/modules/newRank/images/li.png new file mode 100644 index 00000000..7e01b068 Binary files /dev/null and b/view/molistar/modules/newRank/images/li.png differ diff --git a/view/molistar/modules/newRank/images/myLi.png b/view/molistar/modules/newRank/images/myLi.png new file mode 100644 index 00000000..e031b35e Binary files /dev/null and b/view/molistar/modules/newRank/images/myLi.png differ diff --git a/view/molistar/modules/newRank/images/no1.png b/view/molistar/modules/newRank/images/no1.png index 73c408f0..56768f2b 100644 Binary files a/view/molistar/modules/newRank/images/no1.png and b/view/molistar/modules/newRank/images/no1.png differ diff --git a/view/molistar/modules/newRank/images/no2.png b/view/molistar/modules/newRank/images/no2.png index ec247e71..df8b37fb 100644 Binary files a/view/molistar/modules/newRank/images/no2.png and b/view/molistar/modules/newRank/images/no2.png differ diff --git a/view/molistar/modules/newRank/images/no3.png b/view/molistar/modules/newRank/images/no3.png index 7222144f..17433115 100644 Binary files a/view/molistar/modules/newRank/images/no3.png and b/view/molistar/modules/newRank/images/no3.png differ diff --git a/view/molistar/modules/newRank/images/num.png b/view/molistar/modules/newRank/images/num.png new file mode 100644 index 00000000..3d926e04 Binary files /dev/null and b/view/molistar/modules/newRank/images/num.png differ diff --git a/view/molistar/modules/newRank/images/tab.png b/view/molistar/modules/newRank/images/tab.png new file mode 100644 index 00000000..f0923646 Binary files /dev/null and b/view/molistar/modules/newRank/images/tab.png differ diff --git a/view/molistar/modules/newRank/images/tabAct.png b/view/molistar/modules/newRank/images/tabAct.png new file mode 100644 index 00000000..db977fe5 Binary files /dev/null and b/view/molistar/modules/newRank/images/tabAct.png differ diff --git a/view/molistar/modules/newRank/index.html b/view/molistar/modules/newRank/index.html index d96c4065..e7435904 100644 --- a/view/molistar/modules/newRank/index.html +++ b/view/molistar/modules/newRank/index.html @@ -4,7 +4,7 @@ - MoliStar + MoliStar @@ -13,6 +13,7 @@
+
@@ -23,8 +24,14 @@
-
-
+
+
+
+
+ +
+

+
@@ -43,20 +50,22 @@
- +
- +
@@ -79,7 +88,8 @@
- + +
@@ -96,5 +106,6 @@ - + + \ No newline at end of file diff --git a/view/molistar/modules/newRank/js/index.js b/view/molistar/modules/newRank/js/index.js index f310d20e..977765b4 100644 --- a/view/molistar/modules/newRank/js/index.js +++ b/view/molistar/modules/newRank/js/index.js @@ -65,6 +65,11 @@ function translateFun() { $('.text4').html(langReplace(localLang.demoModule.text4)); $('.text5').html(langReplace(localLang.demoModule.text5)); $('.text6').html(langReplace(localLang.demoModule.text6)); + $('.newText1').html(langReplace(localLang.demoModule.newText1)); + $('.newText2').html(langReplace(localLang.demoModule.newText2)); + $('.newText3').html(langReplace(localLang.demoModule.newText3)); + $('.newText4').html(langReplace(localLang.demoModule.newText4)); + $('.newText5').html(langReplace(localLang.demoModule.newText5)); } // 榜单接口 @@ -105,7 +110,7 @@ function geth5() { $(`.header .top .top${i + 1} .tx`).attr('src', res.avatar); $(`.header .top .top${i + 1} .nick`).text(res.nick); // if (i > 0) { - $(`.header .top .top${i + 1} .score span`).text(unitProcessingAr(res.totalNum, 1)); + $(`.header .top .top${i + 1} .score span`).text(unitProcessingAr(res.totalNum, 1)); // } }); // 非前三 @@ -116,7 +121,8 @@ function geth5() {
${res.seqNo}
${res.nick}
- @@ -127,7 +133,11 @@ function geth5() { // 处理自己 $('.my .box .tx').attr('src', my.avatar); $('.my .box .nick').text(my.nick); - $('.my .box .score span').text(my.totalNum <= 0 ? langReplace(localLang.demoModule.text7) : unitProcessingAr(my.totalNum, 1)); + $('.my .box .seqNo').text(my.totalNum <= 0 ? '-' : my.totalNum); + $('.my .box .score span').text(my.totalNum <= 0 ? '-' : unitProcessingAr(my.totalNum, 1)); + if (my.totalNum <= 0) { + $('.my .box .score b').hide(); + } } else { toastMsg(res.message) } @@ -171,7 +181,7 @@ function listRank() { $(`.header .top .top${i + 1} .tx`).attr('src', res.avatar); $(`.header .top .top${i + 1} .nick`).text(res.name); // if (i > 0) { - $(`.header .top .top${i + 1} .score span`).text(unitProcessingAr(res.income, 1)); + $(`.header .top .top${i + 1} .score span`).text(unitProcessingAr(res.income, 1)); // } }); // 非前三 @@ -182,7 +192,8 @@ function listRank() {
${i + 4}
${res.name}
- @@ -211,6 +222,7 @@ $('.header .tabBox div').click(function () { $(`.header`).addClass(`header${i}`); $('.top').removeClass('tops1').removeClass('tops2').removeClass('tops3').removeClass('tops4'); $(`.top`).addClass(`tops${i}`); + $('.header .monthlyRewards').hide(); timeType = 1; $('.header .sTab div').removeClass('act'); $('.header .sTab div').eq(0).addClass('act'); @@ -231,7 +243,12 @@ $('.header .tabBox div').click(function () { $('.header .sTab div').click(function () { var i = $(this).index() + 1; $(this).addClass('act').siblings().removeClass('act'); - timeType = i; + timeType = $(this).attr('type'); + if (timeType == 5) { + $('.header .monthlyRewards').show(); + } else { + $('.header .monthlyRewards').hide(); + } geth5(); }) // 前三跳转个人页 @@ -255,4 +272,9 @@ $('ul').on('click', 'li .tx', function () { window.androidJsObj.openPersonPage(uid); } } +}) + +// 跳转奖励页面 +$('.header .monthlyRewards').click(function(){ + window.location.href = './monthlyRewards.html' }) \ No newline at end of file diff --git a/view/molistar/modules/newRank/js/monthlyRewards.js b/view/molistar/modules/newRank/js/monthlyRewards.js new file mode 100644 index 00000000..531a4726 --- /dev/null +++ b/view/molistar/modules/newRank/js/monthlyRewards.js @@ -0,0 +1,249 @@ +let urlPrefix = getUrlPrefix() +let browser = checkVersion() +let env = EnvCheck(); +if (env == 'test') { + new VConsole(); +} +// 封裝layer消息提醒框 +let layerIndex +const showLoading = (content = langReplace(localLang.demoModule.layerIndex1)) => { + layer.open({ + type: 2, + shadeClose: false, + content, + success(e) { + layerIndex = $(e).attr('index') + } + }) +} +const hideLoading = (index) => { + layer.close(index) +} +const toastMsg = (content = langReplace(localLang.demoModule.layerIndex2), time = 2) => { + layer.open({ + content, + time, + skin: 'msg' + }) +} +var listType = 2;//2爱意榜 1魅力榜 3房间榜 +var timeType = 1;//1日 2周 +// 初始化函數 +$(function () { + getInfoFromClient(); + fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言 + setTimeout(function () { + // 頁面全屏 + if (browser.app) { + if (browser.android) { + window.androidJsObj.initShowNav(false) + } else { + window.webkit.messageHandlers.initShowNav.postMessage(0) + } + }; + // 頂部返回事件 + $('.back img').click(() => { + window.history.back(); + }) + langReplace = window.lang.replace; + localLang = window.lang; + translateFun(); + showLoading() + geth5() + }, 100) +}) +function translateFun() { + var langReplace = window.lang.replace; + var localLang = window.lang; + $('.text1').html(langReplace(localLang.demoModule.text1)); + $('.text2').html(langReplace(localLang.demoModule.text2)); + $('.text3').html(langReplace(localLang.demoModule.text3)); + $('.text4').html(langReplace(localLang.demoModule.text4)); + $('.text5').html(langReplace(localLang.demoModule.text5)); + $('.text6').html(langReplace(localLang.demoModule.text6)); + $('.newText1').html(langReplace(localLang.demoModule.newText1)); + $('.newText2').html(langReplace(localLang.demoModule.newText2)); + $('.newText3').html(langReplace(localLang.demoModule.newText3)); + $('.newText4').html(langReplace(localLang.demoModule.newText4)); + $('.newText5').html(langReplace(localLang.demoModule.newText5)); + $('.newText6').html(langReplace(localLang.demoModule.newText6)); + +} +// 榜单接口 +function geth5() { + $('ul li').remove(); + $('.header .sTab').show(); + $('.my').show() + $('.header .top .top2 .score,.header .top .top3 .score').show(); + // $('.header .top .top1 .fist').show(); + $('.header .top .top1 .fist').hide(); + $('ul li .score').show(); + // showLoading() + networkRequest({ + type: 'get', + url: urlPrefix + '/allrank/geth5', + data: { + type: listType, + datetype: timeType, + uid: pubInfo.uid + }, + success(res) { + if (res.code === 200) { + var my = res.data.me; + var listTo3 = res.data.rankVoList.slice(0, 3); + var notListTo3 = res.data.rankVoList.slice(3); + // 处理前三 + if (listTo3.length < 3) { + let arr = new Array(3 - listTo3.length).fill({ + avatar: './images/logo.png', + nick: '', + totalNum: "", + uid: "0", + }) + listTo3.push(...arr) + } + listTo3.forEach((res, i) => { + $(`.header .top .top${i + 1} .ts`).attr('uid', res.uid); + $(`.header .top .top${i + 1} .tx`).attr('src', res.avatar); + $(`.header .top .top${i + 1} .nick`).text(res.nick); + // if (i > 0) { + $(`.header .top .top${i + 1} .score span`).text(unitProcessingAr(res.totalNum, 1)); + // } + }); + // 非前三 + var str = ''; + notListTo3.forEach((res, i) => { + str += ` +
  • +
    ${res.seqNo}
    + +
    ${res.nick}
    +
    + ${langReplace(localLang.demoModule.newText3)} + + ${unitProcessingAr(res.totalNum, 1)} +
    +
  • + ` + }) + $('ul').append(str); + // 处理自己 + $('.my .box .tx').attr('src', my.avatar); + $('.my .box .nick').text(my.nick); + $('.my .box .seqNo').text(my.totalNum <= 0 ? '-' : my.totalNum); + $('.my .box .score span').text(my.totalNum <= 0 ? '-' : unitProcessingAr(my.totalNum, 1)); + if (my.totalNum <= 0) { + $('.my .box .score b').hide(); + } + } else { + toastMsg(res.message) + } + hideLoading(layerIndex) + }, + error(err) { + hideLoading(layerIndex) + toastMsg(langReplace(localLang.demoModule.layerIndex3)) + } + }) +} +// 公会接口 +function listRank() { + $('ul li').remove(); + $('.header .sTab').hide(); + $('.my').hide() + // $('.header .top .top2 .score,.header .top .top3 .score').hide(); + $('.header .top .top1 .fist').hide(); + $('ul li .score').hide(); + // showLoading() + networkRequest({ + type: 'get', + url: urlPrefix + '/clan/listRank', + success(res) { + if (res.code === 200) { + var my = res.data.me; + var listTo3 = res.data.slice(0, 3); + var notListTo3 = res.data.slice(3); + // 处理前三 + if (listTo3.length < 3) { + let arr = new Array(3 - listTo3.length).fill({ + avatar: './images/logo.png', + name: '', + totalNum: "", + uid: "0", + }) + listTo3.push(...arr) + } + listTo3.forEach((res, i) => { + $(`.header .top .top${i + 1} .ts`).attr('uid', res.clanElderUid); + $(`.header .top .top${i + 1} .tx`).attr('src', res.avatar); + $(`.header .top .top${i + 1} .nick`).text(res.name); + // if (i > 0) { + $(`.header .top .top${i + 1} .score span`).text(unitProcessingAr(res.income, 1)); + // } + }); + // 非前三 + var str = ''; + notListTo3.forEach((res, i) => { + str += ` +
  • +
    ${i + 4}
    + +
    ${res.name}
    +
    + ${langReplace(localLang.demoModule.newText3)} + + ${unitProcessingAr(res.income, 1)} +
    +
  • + ` + }) + $('ul').append(str); + } else { + toastMsg(res.message) + } + hideLoading(layerIndex) + }, + error(err) { + hideLoading(layerIndex) + toastMsg(langReplace(localLang.demoModule.layerIndex3)) + } + }) +} +// 榜单切换tab +$('.header .tabBox div').click(function () { + var i = $(this).index() + 1; + $(this).addClass('act').siblings().removeClass('act'); + $('ul').removeClass('ul1').removeClass('ul2').removeClass('ul3').removeClass('ul4'); + $(`ul`).addClass(`ul${i}`); + $('.header').removeClass('header1').removeClass('header2').removeClass('header3').removeClass('header4'); + $(`.header`).addClass(`header${i}`); + $('.top').removeClass('tops1').removeClass('tops2').removeClass('tops3').removeClass('tops4'); + $(`.top`).addClass(`tops${i}`); + $('.header .monthlyRewards').hide(); + timeType = 1; + $('.header .sTab div').removeClass('act'); + $('.header .sTab div').eq(0).addClass('act'); + if (i == 1) { + listType = 2; + geth5(); + } else if (i == 2) { + listType = 1; + geth5(); + } else if (i == 3) { + listType = 3; + geth5(); + } else if (i == 4) { + listRank(); + } +}) +// 前三跳转个人页 +$('.header .top .ts').click(function () { + var uid = $(this).attr('uid'); + if (browser.ios) { + window.webkit.messageHandlers.openPersonPage.postMessage(uid); + } else if (browser.android) { + if (androidJsObj && typeof androidJsObj === "object") { + window.androidJsObj.openPersonPage(uid); + } + } +}) \ No newline at end of file diff --git a/view/molistar/modules/newRank/local/ar.js b/view/molistar/modules/newRank/local/ar.js index c643a2b9..21424a4f 100644 --- a/view/molistar/modules/newRank/local/ar.js +++ b/view/molistar/modules/newRank/local/ar.js @@ -2,15 +2,21 @@ langAr = { // 模块 demoModule: { - layerIndex1: 'جار التحميل...', - layerIndex2: 'تمت العملية', + layerIndex1: 'جارٍ التحميل...', + layerIndex2: 'تمت العملية بنجاح', layerIndex3: 'خطأ في الشبكة، يرجى الخروج وإعادة الدخول', - text1: "قائمة الأغنياء", - text2: "قائمة الجاذبية", - text3: "قائمة الغرف", - text4: "قائمة الوكالات", - text5: "قائمة اليومية", - text6: "قائمة الأسبوعية", - text7: "غير مدرج", + text1: 'ثروة ', + text2: 'جاذبية ', + text3: 'غرفة', + text4: 'عائلة', + text5: 'يومي ', + text6: 'أسبوعي ', + text7: 'غير مدرج', + newText1: 'تصنيف الشرف', + newText2: 'شهري', + newText3: 'خلف', + newText4: 'شهري', + newText5: 'المكافآت', + newText6: 'أفضل 3 ثروة في الشهر الماضي', } } \ No newline at end of file diff --git a/view/molistar/modules/newRank/local/en.js b/view/molistar/modules/newRank/local/en.js index b83cee8c..aa414d97 100644 --- a/view/molistar/modules/newRank/local/en.js +++ b/view/molistar/modules/newRank/local/en.js @@ -5,12 +5,18 @@ langEn = { layerIndex1: 'Loading...', layerIndex2: 'Operation completed', layerIndex3: 'Network error, please exit and re-enter', - text1: "Wealth List", - text2: "Charm List", - text3: "Room List", - text4: "Family List", - text5: "Daily List", - text6: "Weekly List", + text1: "Wealth ", + text2: "Charm ", + text3: "Room", + text4: "Family", + text5: "Daily ", + text6: "Weekly ", text7: "Not Listed", + newText1:`Honor Ranking`, + newText2:`Monthly`, + newText3:`Behind`, + newText4:`Monthly`, + newText5:`Rewards`, + newText6:`Last Month Wealth TOP3`, } } \ No newline at end of file diff --git a/view/molistar/modules/newRank/local/tr.js b/view/molistar/modules/newRank/local/tr.js new file mode 100644 index 00000000..bdf48cb9 --- /dev/null +++ b/view/molistar/modules/newRank/local/tr.js @@ -0,0 +1,22 @@ +// 土耳其 +langTr = { + // 模塊 + demoModule: { + layerIndex1: 'Yükleniyor...', + layerIndex2: 'İşlem tamamlandı', + layerIndex3: 'Ağ hatası, lütfen çıkış yapıp tekrar girin', + text1: 'Servet ', + text2: 'Çekicilik ', + text3: 'Oda', + text4: 'Aile', + text5: 'Günlük ', + text6: 'Haftalık ', + text7: 'Listeye Girmedi', + newText1: 'Onur Sıralaması', + newText2: 'Aylık', + newText3: 'Geride', + newText4: 'Aylık', + newText5: 'Ödüller', + newText6: 'Geçen Ay Servet İlk 3', + } +} \ No newline at end of file diff --git a/view/molistar/modules/newRank/local/zh.js b/view/molistar/modules/newRank/local/zh.js index 214ebb70..a86d87c9 100644 --- a/view/molistar/modules/newRank/local/zh.js +++ b/view/molistar/modules/newRank/local/zh.js @@ -4,13 +4,19 @@ langZh = { demoModule: { layerIndex1: '加載中...', layerIndex2: '操作完成', - layerIndex3: '網絡錯誤,請退出重進', - text1: '愛意榜', - text2: '魅力榜', - text3: '房間榜', - text4: '公會榜', - text5: '日榜', - text6: '周榜', + layerIndex3: '網絡錯誤,請退出後重新進入', + text1: '財富 ', + text2: '魅力 ', + text3: '房間', + text4: '家族', + text5: '每日 ', + text6: '每週 ', text7: '未上榜', + newText1: '榮譽排行', + newText2: '每月', + newText3: '落後', + newText4: '每月', + newText5: '獎勵', + newText6: '上月財富前三名', } } \ No newline at end of file diff --git a/view/molistar/modules/newRank/monthlyRewards.html b/view/molistar/modules/newRank/monthlyRewards.html new file mode 100644 index 00000000..b21b9583 --- /dev/null +++ b/view/molistar/modules/newRank/monthlyRewards.html @@ -0,0 +1,76 @@ + + + + + + + MoliStar + + + + + + +
    + + +
    + +
    +
    +
    +
    +
    +
    +
    Last Month Wealth TOP3
    + +
    +
    + + +
    + +
    + + 0 +
    +
    +
    + + +
    + +
    + + + +
    +
    +
    + + +
    + +
    + + + +
    +
    +
    +
    + + + + + + + + + + + + + + + \ No newline at end of file