diff --git a/view/molistar/modules/guild-ar/css/index.css b/view/molistar/modules/guild-ar/css/index.css index 429fcfd..1de4dbb 100644 --- a/view/molistar/modules/guild-ar/css/index.css +++ b/view/molistar/modules/guild-ar/css/index.css @@ -2,6 +2,7 @@ html, body { width: 100%; background: #fff; + overflow-x: hidden; } .back { @@ -32,6 +33,7 @@ body { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; + display: none; } .header { @@ -202,7 +204,7 @@ body { .weeklyRewards { width: 10rem; - height: 3.62667rem; + height: 4.8rem; margin: 0.34667rem auto 0; } @@ -243,6 +245,163 @@ body { font-style: normal; } +.weeklyRewards .top img { + display: block; + float: right; + width: 0.56rem; + height: 0.56rem; + margin-top: 0.05333rem; +} + +.weeklyRewards .weeklyRewards_in { + width: 9.14667rem; + height: 4.05333rem; + background: linear-gradient(180deg, #FFA13C 0%, #FF563D 100%); + border-radius: 0.42667rem; + margin: 0.26667rem auto 0.26667rem; + position: relative; + overflow: hidden; +} + +.weeklyRewards .weeklyRewards_in .topImg { + width: 9.14667rem; + height: 1.01333rem; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: 0; +} + +.weeklyRewards .weeklyRewards_in .title { + width: 9.14667rem; + height: 1.01333rem; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: 0; + line-height: 1.01333rem; + text-align: center; + color: #FFFFFF; + font-size: 0.37333rem; + font-weight: 600; +} + +.weeklyRewards .weeklyRewards_in .box { + width: 8.66667rem; + height: 2.16rem; + background: #fff; + margin: 1.01333rem auto 0.21333rem; + border-radius: 0.42667rem; + box-sizing: border-box; + padding: 0 0.24rem; +} + +.weeklyRewards .weeklyRewards_in .box .left { + float: left; + width: 1.68rem; +} + +.weeklyRewards .weeklyRewards_in .box .left .gold { + width: 0.58667rem; + height: 0.58667rem; + margin-top: 0.64rem; + display: block; + margin: 0.24rem auto 0.02667rem; +} + +.weeklyRewards .weeklyRewards_in .box .left span { + display: block; + width: 100%; + text-align: center; + color: #313131; + font-size: 0.34667rem; + font-weight: 600; + height: 0.48rem; + line-height: 0.48rem; + margin: 0 auto 0.08rem; +} + +.weeklyRewards .weeklyRewards_in .box .left .get { + width: 1.38667rem; + height: 0.50667rem; + line-height: 0.50667rem; + text-align: center; + color: #AFB1B3; + font-size: 0.32rem; + font-weight: 500; + border-radius: 0.50667rem; + border: 0.02667rem solid #AFB1B3; + margin: 0 auto; +} + +.weeklyRewards .weeklyRewards_in .box .left .getAct { + background: linear-gradient(270deg, #E29030 0%, #FCC074 100%); + border: none; + color: #fff; +} + +.weeklyRewards .weeklyRewards_in .box .right { + float: right; + width: 6.21333rem; + margin-top: 0.64rem; +} + +.weeklyRewards .weeklyRewards_in .box .right .textTop { + width: 100%; + height: 0.45333rem; + line-height: 0.45333rem; + display: flex; + justify-content: space-between; + margin: 0 auto 0.21333rem; +} + +.weeklyRewards .weeklyRewards_in .box .right .textTop .l { + color: #313131; + font-size: 0.34667rem; + font-weight: 500; +} + +.weeklyRewards .weeklyRewards_in .box .right .textTop .r { + color: #7B7B7D; + font-size: 0.32rem; + font-weight: 400; +} + +.weeklyRewards .weeklyRewards_in .box .right .textTop .r img { + display: inline-block; + width: 0.45333rem; + height: 0.45333rem; + margin: 0 0.05333rem; +} + +.weeklyRewards .weeklyRewards_in .box .right .line { + width: 100%; + height: 0.21333rem; + position: relative; + background: #FCD7B3; + border-radius: 0.21333rem; + position: relative; + overflow: hidden; +} + +.weeklyRewards .weeklyRewards_in .box .right .line .line_in { + width: 0%; + height: 100%; + background: #FF8C00; + position: absolute; + left: 0; + top: 0; +} + +.weeklyRewards .weeklyRewards_in .bottom { + width: 100%; + box-sizing: border-box; + padding: 0 0.24rem; + color: #FFFFFF; + font-weight: 400; + font-size: 0.32rem; +} + .agencylevel { width: 10rem; height: 3.62667rem; @@ -330,7 +489,7 @@ body { position: absolute; top: 0; left: 0; - width: 10%; + width: 0%; background: #04D5C6; height: 100%; } @@ -603,6 +762,19 @@ body { color: #fff; } +.arabic .weeklyRewards .weeklyRewards_in .box .left { + float: right; +} + +.arabic .weeklyRewards .weeklyRewards_in .box .right { + float: left; +} + +.arabic .weeklyRewards .weeklyRewards_in .box .right .line .line_in { + left: auto; + right: 0; +} + .arabic .back img { left: auto; right: 0.24rem; diff --git a/view/molistar/modules/guild-ar/css/index.scss b/view/molistar/modules/guild-ar/css/index.scss index c4ae12b..7e20baf 100644 --- a/view/molistar/modules/guild-ar/css/index.scss +++ b/view/molistar/modules/guild-ar/css/index.scss @@ -7,6 +7,7 @@ body { width: 100%; // height: px2rem(1334); background: #fff; + overflow-x: hidden; } .back { @@ -36,6 +37,7 @@ body { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; + display: none; } } @@ -209,7 +211,7 @@ body { .weeklyRewards { width: px2rem(750); - height: px2rem(272); + height: px2rem(360); margin: px2rem(26) auto 0; .top { @@ -247,8 +249,166 @@ body { float: left; font-style: normal; } + + img { + display: block; + float: right; + width: px2rem(42); + height: px2rem(42); + margin-top: px2rem(4); + } + } + + .weeklyRewards_in { + width: px2rem(686); + height: px2rem(304); + background: linear-gradient(180deg, #FFA13C 0%, #FF563D 100%); + border-radius: px2rem(32); + margin: px2rem(20) auto px2rem(20); + position: relative; + overflow: hidden; + + .topImg { + width: px2rem(686); + height: px2rem(76); + position: absolute; + left: 50%; + transform: translateX(-50%); + top: 0; + } + + .title { + width: px2rem(686); + height: px2rem(76); + position: absolute; + left: 50%; + transform: translateX(-50%); + top: 0; + line-height: px2rem(76); + text-align: center; + color: #FFFFFF; + font-size: px2rem(28); + font-weight: 600; + } + + .box { + width: px2rem(650); + height: px2rem(162); + background: #fff; + margin: px2rem(76) auto px2rem(16); + border-radius: px2rem(32); + box-sizing: border-box; + padding: 0 px2rem(18); + + .left { + float: left; + width: px2rem(126); + + .gold { + width: px2rem(44); + height: px2rem(44); + margin-top: px2rem(48); + display: block; + margin: px2rem(18) auto px2rem(2); + } + + span { + display: block; + width: 100%; + text-align: center; + color: #313131; + font-size: px2rem(26); + font-weight: 600; + height: px2rem(36); + line-height: px2rem(36); + margin: 0 auto px2rem(6); + } + + .get { + width: px2rem(104); + height: px2rem(38); + line-height: px2rem(38); + text-align: center; + color: #AFB1B3; + font-size: px2rem(24); + font-weight: 500; + border-radius: px2rem(38); + border: px2rem(2) solid #AFB1B3; + margin: 0 auto; + } + + .getAct { + background: linear-gradient(270deg, #E29030 0%, #FCC074 100%); + border: none; + color: #fff; + } + } + + .right { + float: right; + width: px2rem(466); + margin-top: px2rem(48); + + .textTop { + width: 100%; + height: px2rem(34); + line-height: px2rem(34); + display: flex; + justify-content: space-between; + margin: 0 auto px2rem(16); + + .l { + color: #313131; + font-size: px2rem(26); + font-weight: 500; + } + + .r { + color: #7B7B7D; + font-size: px2rem(24); + font-weight: 400; + + img { + display: inline-block; + width: px2rem(34); + height: px2rem(34); + margin: 0 px2rem(4); + } + } + } + + .line { + width: 100%; + height: px2rem(16); + position: relative; + background: #FCD7B3; + border-radius: px2rem(16); + position: relative; + overflow: hidden; + + .line_in { + width: 0%; + height: 100%; + background: #FF8C00; + position: absolute; + left: 0; + top: 0; + } + } + } + } + + .bottom { + width: 100%; + box-sizing: border-box; + padding: 0 px2rem(18); + color: #FFFFFF; + font-weight: 400; + font-size: px2rem(24); + } } } + .agencylevel { width: px2rem(750); height: px2rem(272); @@ -333,7 +493,7 @@ body { position: absolute; top: 0; left: 0; - width: 10%; + width: 0%; background: #04D5C6; height: 100%; } @@ -619,6 +779,19 @@ body { .arabic { + .weeklyRewards .weeklyRewards_in .box .left { + float: right; + } + + .weeklyRewards .weeklyRewards_in .box .right { + float: left; + } + + .weeklyRewards .weeklyRewards_in .box .right .line .line_in { + left: auto; + right: 0; + } + .back img { left: auto; right: 0.24rem; diff --git a/view/molistar/modules/guild-ar/css/weeklyRewards.css b/view/molistar/modules/guild-ar/css/weeklyRewards.css new file mode 100644 index 0000000..9094605 --- /dev/null +++ b/view/molistar/modules/guild-ar/css/weeklyRewards.css @@ -0,0 +1,241 @@ +html, +body { + width: 100%; + background: #fff; +} + +.back { + width: 100%; + height: 2.34667rem; + background: #fff; + position: fixed; + left: 0; + top: 0; + z-index: 2; +} + +.back .backIcon { + width: 0.58667rem; + height: 0.58667rem; + position: absolute; + left: 0.42667rem; + top: 1.46667rem; + z-index: 2; +} + +.back b { + width: 100%; + height: 0.58667rem; + line-height: 0.58667rem; + text-align: center; + position: absolute; + top: 1.46667rem; + left: 50%; + transform: translateX(-50%); + color: #313131; + font-size: 0.48rem; + font-weight: 600; +} + +.back .why { + width: 0.58667rem; + height: 0.58667rem; + position: absolute; + right: 0.42667rem; + top: 1.46667rem; + z-index: 2; +} + +.tab { + width: 9.14667rem; + height: 0.58667rem; + line-height: 0.58667rem; + margin: 2.64rem auto 0.29333rem; + display: flex; +} + +.tab div { + margin-right: 0.66667rem; + color: #7B7B7D; + font-size: 0.37333rem; + font-weight: 400; +} + +.tab .act { + color: #FF8C03; + font-size: 0.42667rem; +} + +.box { + width: 9.14667rem; + background: linear-gradient(180deg, #FFA13C 0%, #FF563D 100%); + border-radius: 0.42667rem; + box-sizing: border-box; + padding: 1.01333rem 0.24rem 0.24rem; + position: relative; + margin: 0 auto; +} + +.box .topImg { + width: 9.14667rem; + height: 1.01333rem; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: 0; +} + +.box .title { + width: 9.14667rem; + height: 1.01333rem; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: 0; + line-height: 1.01333rem; + text-align: center; + color: #FFFFFF; + font-size: 0.37333rem; + font-weight: 600; +} + +.box ul { + width: 8.66667rem; + margin: 0 auto; +} + +.box ul li { + width: 100%; + height: 2.16rem; + background: #fff; + margin: 0rem auto 0.24rem; + border-radius: 0.42667rem; + box-sizing: border-box; + padding: 0 0.24rem; +} + +.box ul li .left { + float: left; + width: 1.68rem; +} + +.box ul li .left .gold { + width: 0.58667rem; + height: 0.58667rem; + margin-top: 0.64rem; + display: block; + margin: 0.24rem auto 0.02667rem; +} + +.box ul li .left span { + display: block; + width: 100%; + text-align: center; + color: #313131; + font-size: 0.34667rem; + font-weight: 600; + height: 0.48rem; + line-height: 0.48rem; + margin: 0 auto 0.08rem; +} + +.box ul li .left .get { + width: 1.38667rem; + height: 0.50667rem; + line-height: 0.50667rem; + text-align: center; + color: #AFB1B3; + font-size: 0.32rem; + font-weight: 500; + border-radius: 0.50667rem; + border: 0.02667rem solid #AFB1B3; + margin: 0 auto; +} + +.box ul li .left .getAct { + background: linear-gradient(270deg, #E29030 0%, #FCC074 100%); + border: none; + color: #fff; +} + +.box ul li .right { + float: right; + width: 6.21333rem; + margin-top: 0.64rem; +} + +.box ul li .right .textTop { + width: 100%; + height: 0.45333rem; + line-height: 0.45333rem; + display: flex; + justify-content: space-between; + margin: 0 auto 0.21333rem; +} + +.box ul li .right .textTop .l { + color: #313131; + font-size: 0.34667rem; + font-weight: 500; +} + +.box ul li .right .textTop .r { + color: #7B7B7D; + font-size: 0.32rem; + font-weight: 400; +} + +.box ul li .right .textTop .r img { + display: inline-block; + width: 0.45333rem; + height: 0.45333rem; + margin: 0 0.05333rem; +} + +.box ul li .right .line { + width: 100%; + height: 0.21333rem; + position: relative; + background: #FCD7B3; + border-radius: 0.21333rem; + position: relative; + overflow: hidden; +} + +.box ul li .right .line .line_in { + width: 10%; + height: 100%; + background: #FF8C00; + position: absolute; + left: 0; + top: 0; +} + +.arabic .back .backIcon { + left: auto; + right: 0.42667rem; + transform: rotate(180deg); +} + +.arabic .back .why { + right: auto; + left: 0.42667rem; +} + +.arabic .box ul li .left { + float: right; +} + +.arabic .box ul li .right { + float: left; +} + +.arabic .box ul li .right .line .line_in { + left: auto; + right: 0; +} + +.arabic .tab div { + margin-right: 0; + margin-left: 0.66667rem; +} diff --git a/view/molistar/modules/guild-ar/css/weeklyRewards.scss b/view/molistar/modules/guild-ar/css/weeklyRewards.scss new file mode 100644 index 0000000..1d4247f --- /dev/null +++ b/view/molistar/modules/guild-ar/css/weeklyRewards.scss @@ -0,0 +1,244 @@ +@function px2rem($px) { + @return $px / 75+rem; +} + +html, +body { + width: 100%; + // height: px2rem(1334); + background: #fff; +} + +.back { + width: 100%; + height: px2rem(176); + background: #fff; + position: fixed; + left: 0; + top: 0; + z-index: 2; + + .backIcon { + width: px2rem(44); + height: px2rem(44); + position: absolute; + left: px2rem(32); + top: px2rem(110); + z-index: 2; + } + + b { + width: 100%; + height: px2rem(44); + line-height: px2rem(44); + text-align: center; + position: absolute; + top: px2rem(110); + left: 50%; + transform: translateX(-50%); + color: #313131; + font-size: px2rem(36); + font-weight: 600; + } + + .why { + width: px2rem(44); + height: px2rem(44); + position: absolute; + right: px2rem(32); + top: px2rem(110); + z-index: 2; + } +} + +.tab { + width: px2rem(686); + height: px2rem(44); + line-height: px2rem(44); + margin: px2rem(198) auto px2rem(22); + display: flex; + + div { + margin-right: px2rem(50); + color: #7B7B7D; + font-size: px2rem(28); + font-weight: 400; + } + + .act { + color: #FF8C03; + font-size: px2rem(32); + } +} + +.box { + width: px2rem(686); + background: linear-gradient(180deg, #FFA13C 0%, #FF563D 100%); + border-radius: px2rem(32); + box-sizing: border-box; + padding: px2rem(76) px2rem(18) px2rem(18); + position: relative; + margin: 0 auto; + + .topImg { + width: px2rem(686); + height: px2rem(76); + position: absolute; + left: 50%; + transform: translateX(-50%); + top: 0; + } + + .title { + width: px2rem(686); + height: px2rem(76); + position: absolute; + left: 50%; + transform: translateX(-50%); + top: 0; + line-height: px2rem(76); + text-align: center; + color: #FFFFFF; + font-size: px2rem(28); + font-weight: 600; + } + + ul { + width: px2rem(650); + margin: 0 auto; + + li { + width: 100%; + height: px2rem(162); + background: #fff; + margin: px2rem(0) auto px2rem(18); + border-radius: px2rem(32); + box-sizing: border-box; + padding: 0 px2rem(18); + + .left { + float: left; + width: px2rem(126); + + .gold { + width: px2rem(44); + height: px2rem(44); + margin-top: px2rem(48); + display: block; + margin: px2rem(18) auto px2rem(2); + } + + span { + display: block; + width: 100%; + text-align: center; + color: #313131; + font-size: px2rem(26); + font-weight: 600; + height: px2rem(36); + line-height: px2rem(36); + margin: 0 auto px2rem(6); + } + + .get { + width: px2rem(104); + height: px2rem(38); + line-height: px2rem(38); + text-align: center; + color: #AFB1B3; + font-size: px2rem(24); + font-weight: 500; + border-radius: px2rem(38); + border: px2rem(2) solid #AFB1B3; + margin: 0 auto; + } + + .getAct { + background: linear-gradient(270deg, #E29030 0%, #FCC074 100%); + border: none; + color: #fff; + } + } + + .right { + float: right; + width: px2rem(466); + margin-top: px2rem(48); + + .textTop { + width: 100%; + height: px2rem(34); + line-height: px2rem(34); + display: flex; + justify-content: space-between; + margin: 0 auto px2rem(16); + + .l { + color: #313131; + font-size: px2rem(26); + font-weight: 500; + } + + .r { + color: #7B7B7D; + font-size: px2rem(24); + font-weight: 400; + + img { + display: inline-block; + width: px2rem(34); + height: px2rem(34); + margin: 0 px2rem(4); + } + } + } + + .line { + width: 100%; + height: px2rem(16); + position: relative; + background: #FCD7B3; + border-radius: px2rem(16); + position: relative; + overflow: hidden; + + .line_in { + width: 10%; + height: 100%; + background: #FF8C00; + position: absolute; + left: 0; + top: 0; + } + } + } + } + } +} + +.arabic { + .back .backIcon { + left: auto; + right: px2rem(32); + transform: rotate(180deg); + } + + .back .why { + right: auto; + left: px2rem(32); + } + .box ul li .left{ + float: right; + } + .box ul li .right{ + float: left; + } + .box ul li .right .line .line_in{ + left: auto; + right: 0; + } + .tab div{ + margin-right: 0; + margin-left: px2rem(50); + } +} \ No newline at end of file diff --git a/view/molistar/modules/guild-ar/css/weeklyRewardsRule.css b/view/molistar/modules/guild-ar/css/weeklyRewardsRule.css new file mode 100644 index 0000000..5c08102 --- /dev/null +++ b/view/molistar/modules/guild-ar/css/weeklyRewardsRule.css @@ -0,0 +1,53 @@ +html, +body { + width: 100%; + background: #fff; +} + +.back { + width: 100%; + height: 2.34667rem; + background: #fff; + position: fixed; + left: 0; + top: 0; + z-index: 2; +} + +.back .backIcon { + width: 0.58667rem; + height: 0.58667rem; + position: absolute; + left: 0.42667rem; + top: 1.46667rem; + z-index: 2; +} + +.back b { + width: 100%; + height: 0.58667rem; + line-height: 0.58667rem; + text-align: center; + position: absolute; + top: 1.46667rem; + left: 50%; + transform: translateX(-50%); + color: #313131; + font-size: 0.48rem; + font-weight: 600; +} + +.text { + width: 9.14667rem; + margin: 2.61333rem auto 0.32rem; + color: #313131; + font-size: 0.37333rem; + font-weight: 500; + line-height: 0.53333rem; +} + +img { + display: block; + width: 9.14667rem; + margin: 0 auto 0.4rem; +} diff --git a/view/molistar/modules/guild-ar/css/weeklyRewardsRule.scss b/view/molistar/modules/guild-ar/css/weeklyRewardsRule.scss new file mode 100644 index 0000000..32d8948 --- /dev/null +++ b/view/molistar/modules/guild-ar/css/weeklyRewardsRule.scss @@ -0,0 +1,58 @@ +@function px2rem($px) { + @return $px / 75+rem; +} + +html, +body { + width: 100%; + // height: px2rem(1334); + background: #fff; +} + +.back { + width: 100%; + height: px2rem(176); + background: #fff; + position: fixed; + left: 0; + top: 0; + z-index: 2; + + .backIcon { + width: px2rem(44); + height: px2rem(44); + position: absolute; + left: px2rem(32); + top: px2rem(110); + z-index: 2; + } + + b { + width: 100%; + height: px2rem(44); + line-height: px2rem(44); + text-align: center; + position: absolute; + top: px2rem(110); + left: 50%; + transform: translateX(-50%); + color: #313131; + font-size: px2rem(36); + font-weight: 600; + } +} + +.text { + width: px2rem(686); + margin: px2rem(196) auto px2rem(24); + color: #313131; + font-size: px2rem(28); + font-weight: 500; + line-height: px2rem(40); +} + +img { + display: block; + width: px2rem(686); + margin: 0 auto px2rem(30); +} \ No newline at end of file diff --git a/view/molistar/modules/guild-ar/images/rewardsTbg.png b/view/molistar/modules/guild-ar/images/rewardsTbg.png index b01e35e..0d12a6d 100644 Binary files a/view/molistar/modules/guild-ar/images/rewardsTbg.png and b/view/molistar/modules/guild-ar/images/rewardsTbg.png differ diff --git a/view/molistar/modules/guild-ar/images/rewardsWhy.png b/view/molistar/modules/guild-ar/images/rewardsWhy.png new file mode 100644 index 0000000..4581aa5 Binary files /dev/null and b/view/molistar/modules/guild-ar/images/rewardsWhy.png differ diff --git a/view/molistar/modules/guild-ar/images/weeklyRewardsRule.png b/view/molistar/modules/guild-ar/images/weeklyRewardsRule.png new file mode 100644 index 0000000..7ad87f3 Binary files /dev/null and b/view/molistar/modules/guild-ar/images/weeklyRewardsRule.png differ diff --git a/view/molistar/modules/guild-ar/images/weeklyRewardsRule2-ar.png b/view/molistar/modules/guild-ar/images/weeklyRewardsRule2-ar.png new file mode 100644 index 0000000..8a621e4 Binary files /dev/null and b/view/molistar/modules/guild-ar/images/weeklyRewardsRule2-ar.png differ diff --git a/view/molistar/modules/guild-ar/images/weeklyRewardsRule2.png b/view/molistar/modules/guild-ar/images/weeklyRewardsRule2.png new file mode 100644 index 0000000..24fd782 Binary files /dev/null and b/view/molistar/modules/guild-ar/images/weeklyRewardsRule2.png differ diff --git a/view/molistar/modules/guild-ar/index.html b/view/molistar/modules/guild-ar/index.html index 0f12ad4..2e29751 100644 --- a/view/molistar/modules/guild-ar/index.html +++ b/view/molistar/modules/guild-ar/index.html @@ -92,7 +92,31 @@
diff --git a/view/molistar/modules/guild-ar/js/index.js b/view/molistar/modules/guild-ar/js/index.js index bb12f56..c40e09d 100644 --- a/view/molistar/modules/guild-ar/js/index.js +++ b/view/molistar/modules/guild-ar/js/index.js @@ -91,6 +91,11 @@ function translateFun() { $('.newtext6').text(langReplace(localLang.demoModule.newtext6)); $('.newtext7').text(langReplace(localLang.demoModule.newtext7)); $('.audit').text(langReplace(localLang.demoModule.audit)); + $('.weeklyRewardsText1').text(langReplace(localLang.demoModule.weeklyRewardsText1)); + $('.weeklyRewardsText2').text(langReplace(localLang.demoModule.weeklyRewardsText2)); + $('.weeklyRewardsText3').text(langReplace(localLang.demoModule.weeklyRewardsText3)); + $('.weeklyRewardsText4').text(langReplace(localLang.demoModule.weeklyRewardsText4)); + $('.weeklyRewardsText5').text(langReplace(localLang.demoModule.weeklyRewardsText5)); } // 判断公会身份函数 function guildFun(type) { @@ -205,6 +210,47 @@ function get() { ` }); $('.guildList ul').append(str); + // 渲染周奖励 + $('.weeklyRewards .weeklyRewards_in .box .left span').text(unitProcessingAr(res.data.weekLevelReward.totalReward, 0)); + $('.weeklyRewards .weeklyRewards_in .box .right .textTop .l b').text(res.data.weekLevelReward.itemList[0].level); + $('.weeklyRewards .weeklyRewards_in .box .right .textTop .r .b1').text(res.data.weekLevelReward.itemList[0].processNum); + $('.weeklyRewards .weeklyRewards_in .box .right .textTop .r .b2').text(res.data.weekLevelReward.itemList[0].maxNum); + $('.weeklyRewards .weeklyRewards_in .box .right .line .line_in').css('width', `${(res.data.weekLevelReward.itemList[0].processNum / res.data.weekLevelReward.itemList[0].maxNum) * 100}%`); + $('.weeklyRewards .weeklyRewards_in .box .left .get').attr('id', res.data.weekLevelReward.itemList[0].id); + if (res.data.weekLevelReward.itemList[0].status == 1) { + $('.weeklyRewards .weeklyRewards_in .box .left .get').addClass('act'); + $('.weeklyRewards .weeklyRewards_in .box .left .get').attr('status', res.data.weekLevelReward.itemList[0].status); + } + } else { + toastMsg(res.message) + } + hideLoading(layerIndex) + }, + error(err) { + hideLoading(layerIndex) + toastMsg(langReplace(localLang.demoModule.layerIndex3)) + } + }) +} +// 领取按钮 +$('.weeklyRewards .weeklyRewards_in .box .left .get').click(function () { + var status = $(this).attr('status'); + var id = $(this).attr('id'); + if (status == 1) { + getReward(id); + } +}) +function getReward(id) { + showLoading() + networkRequest({ + type: 'post', + url: urlPrefix + '/familyMemberWeekLevelReward/getReward', + data: { + id, + }, + success(res) { + if (res.code === 200) { + get(); } else { toastMsg(res.message) } diff --git a/view/molistar/modules/guild-ar/js/weeklyRewards.js b/view/molistar/modules/guild-ar/js/weeklyRewards.js new file mode 100644 index 0000000..94254f7 --- /dev/null +++ b/view/molistar/modules/guild-ar/js/weeklyRewards.js @@ -0,0 +1,164 @@ +let urlPrefix = getUrlPrefix() +let browser = checkVersion() +let env = EnvCheck(); +if (env == 'test') { + new VConsole(); +} +// 封裝layer消息提醒框 +let layerIndex +var langReplace; +var localLang; +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 countupTime;//倒计时容器 +var page = 0; +var maxPage = 0; +var arr = []; +var music = true; +var data; +var totalReward; +// 初始化函數 +$(function () { + getInfoFromClient(); + fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言 + setTimeout(function () { + // 頁面全屏 + if (browser.app) { + if (browser.android) { + window.androidJsObj.initShowNav(false) + } else { + window.webkit.messageHandlers.initShowNav.postMessage(0) + } + }; + // 頂部返回事件 + $('.back .backIcon').click(() => { + window.history.back() + }) + fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言 + langReplace = window.lang.replace; + localLang = window.lang; + translateFun(); + getConfig(); + }, 100) +}) +function translateFun() { + var langReplace = window.lang.replace; + var localLang = window.lang; + $('.text1').text(langReplace(localLang.weeklyRewards.text1)); + $('.text2').html(langReplace(localLang.weeklyRewards.text2)); + $('.text3').text(langReplace(localLang.weeklyRewards.text3)); + $('.text4').text(langReplace(localLang.weeklyRewards.text4)); + $('.text5').text(langReplace(localLang.weeklyRewards.text5)); +} +// 配置接口 +function getConfig() { + $('.box ul li').remove(); + $('.tab div').remove(); + showLoading() + networkRequest({ + type: 'get', + url: urlPrefix + '/familyMemberWeekLevelReward/get', + success(res) { + if (res.code === 200) { + data = res.data; + totalReward = res.data[0].totalReward; + var tabStr = ''; + data.forEach(((res, i) => { + tabStr += ` +1 وقت النشاط: 0:00-23:59 (GMT+3) كل أسبوع.
+2 مكافآت العملات: يتم حساب دخل المستخدم من الألماس أسبوعيًا، ويمكنك الحصول على العملات عند الوصول إلى مستوى معين.
+3 تدرج مكافآت العملات
`, + text3: `./images/weeklyRewardsRule2-ar.png`, + }, } \ No newline at end of file diff --git a/view/molistar/modules/guild-ar/local/en.js b/view/molistar/modules/guild-ar/local/en.js index 15b0092..7854cbb 100644 --- a/view/molistar/modules/guild-ar/local/en.js +++ b/view/molistar/modules/guild-ar/local/en.js @@ -33,7 +33,12 @@ langEn = { newtext7: "Next level need:", coins: "Coins", transfer_salary: "Salary Transfer:", - audit:'In Audit', + audit: 'In Audit', + weeklyRewardsText1: 'Host weekly rewards', + weeklyRewardsText2: 'You can get 560000 coins totally.', + weeklyRewardsText3: 'Get', + weeklyRewardsText4: 'Host Lv', + weeklyRewardsText5: 'Reset time: Monday 0:00 (GMT+3)', }, adminSet: { text1: `Administrator`, @@ -82,7 +87,7 @@ langEn = { textConte3: `Add`, textConte4: `Payment Account`, text55: `Guild Avatar`, - toastMsgText1: `GIF upload is not supported at the moment`, + toastMsgText1: `GIF upload is not supported at the moment`, }, invitation: { text1: `Find`, @@ -314,5 +319,20 @@ langEn = { p5: `payeeName(Only Enter English)`, p6: `Address(Only Enter English)`, p7: `payeeAccount(E-mail fomat)`, - } + }, + weeklyRewards: { + text1: `Host weekly rewards`, + text2: `You can get 560000 coins totally.`, + text3: `Get`, + text4: `Host Lv`, + text5: ``, + }, + weeklyRewardsRule: { + text1: `Rules`, + text2: `1 Activity time: 0:00-23:59 (GMT+3) every week.
+2 Coin rewards: Calculate the user's diamond income every week, and you can get corresponding coins when you + reach a certain level.
+3 Coin reward gradient
`, + text3: `./images/weeklyRewardsRule2.png`, + }, } diff --git a/view/molistar/modules/guild-ar/local/zh.js b/view/molistar/modules/guild-ar/local/zh.js index 42f2922..c3cbacc 100644 --- a/view/molistar/modules/guild-ar/local/zh.js +++ b/view/molistar/modules/guild-ar/local/zh.js @@ -36,6 +36,11 @@ langZh = { coins: "金幣", transfer_salary: "薪资转账:", audit: '審核中', + weeklyRewardsText1: '主播每週獎勵', + weeklyRewardsText2: '您可以總共獲得 560000 金幣。', + weeklyRewardsText3: '領取', + weeklyRewardsText4: '主播等級', + weeklyRewardsText5: '重置時間:週一 0:00(GMT+3)', }, adminSet: { text1: `管理員設置`, @@ -316,5 +321,19 @@ langZh = { p5: `收款人姓名(僅輸入英文)`, p6: `地址(僅輸入英文)`, p7: `收款人賬號(電子郵件格式)`, - } + }, + weeklyRewards: { + text1: `主播每週獎勵`, + text2: `您可以總共獲得 560000 金幣。`, + text3: `領取`, + text4: `主播等級`, + text5: ``, + }, + weeklyRewardsRule: { + text1: `規則`, + text2: `1 活動時間:每週 0:00-23:59(GMT+3)。
+2 金幣獎勵:每週計算用戶的鑽石收入,達到特定級別時可以獲得相應的金幣獎勵。
+3 金幣獎勵梯度
`, + text3: `./images/weeklyRewardsRule2.png`, + }, } \ No newline at end of file diff --git a/view/molistar/modules/guild-ar/weeklyRewards.html b/view/molistar/modules/guild-ar/weeklyRewards.html new file mode 100644 index 0000000..1f20dfa --- /dev/null +++ b/view/molistar/modules/guild-ar/weeklyRewards.html @@ -0,0 +1,58 @@ + + + + + + +1 وقت النشاط: 0:00-23:59 (GMT+8) كل أسبوع.
+2 مكافآت العملات: يتم حساب دخل المستخدم من العملات أسبوعيًا، ويمكنك الحصول على العملات عند الوصول إلى مستوى معين.
+3 تدرج مكافآت العملات
`, + text3: `./images/weeklyRewardsRule-ar.png`, + }, } \ No newline at end of file diff --git a/view/molistar/modules/guildAr/local/en.js b/view/molistar/modules/guildAr/local/en.js index daee17d..1869692 100644 --- a/view/molistar/modules/guildAr/local/en.js +++ b/view/molistar/modules/guildAr/local/en.js @@ -28,6 +28,11 @@ langEn = { newText2: `Agency`, newText3: `Administrator`, audit:'In Audit', + weeklyRewardsText1: 'Host weekly rewards', + weeklyRewardsText2: 'You can get 93000 coins totally.', + weeklyRewardsText3: 'Get', + weeklyRewardsText4: 'Host Lv', + weeklyRewardsText5: 'Reset time: Monday 0:00 (GMT+8)', }, adminSet: { text1: `Administrator`, @@ -180,5 +185,19 @@ langEn = { text7:`Duration`, text8:`Me`, text9:`Member`, - } + }, + weeklyRewards: { + text1: `Host weekly rewards`, + text2: `You can get 93000 coins totally.`, + text3: `Get`, + text4: `Host Lv`, + text5: ``, + }, + weeklyRewardsRule: { + text1: `Rules`, + text2: `1 Activity time: 0:00-23:59 (GMT+8) every week.
+2 Coin rewards: Calculate the user's coin income every week, and you can get corresponding coins when you reach a certain level.
+3 Coin reward gradient
`, + text3: `./images/weeklyRewardsRule.png`, + }, } diff --git a/view/molistar/modules/guildAr/local/zh.js b/view/molistar/modules/guildAr/local/zh.js index 008d4d2..76b1d04 100644 --- a/view/molistar/modules/guildAr/local/zh.js +++ b/view/molistar/modules/guildAr/local/zh.js @@ -30,6 +30,11 @@ langZh = { newText2: `機構`, newText3: `管理員`, audit: '審核中', + weeklyRewardsText1: '主播每週獎勵', + weeklyRewardsText2: '您可以總共獲得 93000 金幣。', + weeklyRewardsText3: '領取', + weeklyRewardsText4: '主播等級', + weeklyRewardsText5: '重置時間:週一 0:00(GMT+8)', }, adminSet: { text1: `管理員設置`, @@ -174,14 +179,28 @@ langZh = { incomeStatistics: { text1: `收入統計`, text2: `總幣收入`, - text22:`公會收入`, - text222:`個人收入`, - text3:`個人資料`, + text22: `公會收入`, + text222: `個人收入`, + text3: `個人資料`, text4: `會員數據`, text5: `日期`, text6: `幣收入`, text7: `持續時間`, text8: `我`, text9: `會員`, - } + }, + weeklyRewards: { + text1: `主播每週獎勵`, + text2: `您可以總共獲得 93000 金幣。`, + text3: `領取`, + text4: `主播等級`, + text5: ``, + }, + weeklyRewardsRule: { + text1: `規則`, + text2: `1 活動時間:每週 0:00-23:59(GMT+8)。
+2 金幣獎勵:每週計算用戶的金幣收入,達到特定級別時可以獲得相應的金幣獎勵。
+3 金幣獎勵梯度
`, + text3: `./images/weeklyRewardsRule.png`, + }, } \ No newline at end of file diff --git a/view/molistar/modules/guildAr/weeklyRewards.html b/view/molistar/modules/guildAr/weeklyRewards.html new file mode 100644 index 0000000..1f20dfa --- /dev/null +++ b/view/molistar/modules/guildAr/weeklyRewards.html @@ -0,0 +1,58 @@ + + + + + + +