diff --git a/view/molistar/activity/customizedGift/css/index.css b/view/molistar/activity/customizedGift/css/index.css index f630fbb..bc554c0 100644 --- a/view/molistar/activity/customizedGift/css/index.css +++ b/view/molistar/activity/customizedGift/css/index.css @@ -311,6 +311,7 @@ body { background: url(../images/rule.png) no-repeat; background-size: 100% 100%; text-indent: -0.2rem; + z-index: 2; } .page1 .thisWeek .top .reward { @@ -631,6 +632,7 @@ body { background: url(../images/rule.png) no-repeat; background-size: 100% 100%; text-indent: -0.2rem; + z-index: 2; } .page2 .myList .top .reward { @@ -932,6 +934,86 @@ body { color: #FDF565; } +.ruleBox2 { + position: fixed; + left: 0; + top: 0; + bottom: 0; + right: 0; + background: rgba(0, 0, 0, 0.5); + z-index: 99; + display: none; +} + +.ruleBox2 .rule_in { + width: 9.6rem; + height: 6.13333rem; + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + background: url(../images/rule_bg.png) no-repeat; + background-size: 100% 100%; +} + +.ruleBox2 .rule_in .close { + width: 0.88rem; + height: 0.88rem; + position: absolute; + top: -0.56rem; + right: 0; +} + +.ruleBox2 .rule_in .title { + width: 5.04rem; + height: 1.25333rem; + background: url(../images/title.png) no-repeat; + background-size: 100% 100%; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: 0rem; + text-align: center; + line-height: 1.25333rem; + color: #FDF565; + font-size: 0.42667rem; + font-weight: 600; +} + +.ruleBox2 .rule_in .box { + width: 8rem; + height: 3.30667rem; + margin: 1.73333rem auto 0; + overflow-y: scroll; +} + +.ruleBox2 .rule_in .box::-webkit-scrollbar { + display: none; +} + +.ruleBox2 .rule_in .box p { + width: 100%; + line-height: 0.50667rem; + font-size: 0.37333rem; + font-weight: 400; + color: #FDF565; +} + +.ruleBox2 .rule_in .box img { + display: block; + width: 7.73333rem; + display: none; +} + +.ruleBox2 .rule_in .box .img2 { + width: 7.73333rem; + margin: 0 auto; +} + +.ruleBox2 .rule_in .box .img6 { + display: block; +} + .rewardBox { position: fixed; left: 0; @@ -1040,6 +1122,32 @@ body { background-size: 100% 100%; } +.rewardBox2 .rule_in .stabBox { + width: 8rem; + height: 0.76rem; + line-height: 0.76rem; + display: flex; + justify-content: space-between; + background: #360100; + border-radius: 0.76rem; + overflow: hidden; + margin: 1.65333rem auto 0.25333rem; +} + +.rewardBox2 .rule_in .stabBox div { + width: 1.33333rem; + color: #FDF565; + font-size: 0.4rem; + font-weight: 400; + border-radius: 0.76rem; + text-align: center; +} + +.rewardBox2 .rule_in .stabBox .act { + background: linear-gradient(-90deg, #FDF565, #FFAF31); + color: #360100; +} + .rewardBox2 .rule_in .close { width: 0.88rem; height: 0.88rem; @@ -1066,8 +1174,8 @@ body { .rewardBox2 .rule_in .box { width: 9.2rem; - height: 8.7rem; - margin: 1.73333rem auto 0; + height: 7.7rem; + margin: 0rem auto 0; overflow-y: scroll; } @@ -1086,20 +1194,156 @@ body { } .rewardBox2 .rule_in .box img { + width: 7.73333rem; + display: none; + margin: 0 auto; + display: none; +} + +.rewardBox2 .rule_in .box .img6 { + width: 7.73333rem; + height: 10.24rem; + background: url(../images/6.png) no-repeat; + background-size: 100% 100%; display: block; - width: 100%; + margin: 0 auto; + position: relative; } -.rewardBox2 .rule_in .box .img1 { - margin: 0 auto 0.49333rem; +.rewardBox2 .rule_in .box .img6 .why { + width: 0.69333rem; + height: 0.69333rem; + position: absolute; + left: 4.28rem; + bottom: 2.32rem; + background: url(../images/why.png) no-repeat; + background-size: 100% 100%; } -.rewardBox2 .rule_in .box .img2 { - width: 2.77333rem; - margin: 0 auto 0.46667rem; +.rewardBox2 .rule_in .box .img6 .why span { + position: absolute; + width: 3.8rem; + height: 3.2rem; + top: 0.13333rem; + right: -3.6rem; + text-align: center; + color: #FDF565; + font-size: 0.34667rem; + font-weight: 400; + background: rgba(0, 0, 0, 0.8); + padding: 0.24rem 0.32rem 0.29333rem 0.28rem; + line-height: 0.48rem; + box-sizing: border-box; + border-radius: 0.10667rem; + display: none; } -.rewardBox2 .rule_in .box .img3 { - width: 7.65333rem; - margin: 0 auto 0.53333rem; +.rewardBox2 .rule_in .box .img5 { + width: 7.73333rem; + height: 10.24rem; + background: url(../images/5.png) no-repeat; + background-size: 100% 100%; + margin: 0 auto; + position: relative; +} + +.rewardBox2 .rule_in .box .img5 .why { + width: 0.69333rem; + height: 0.69333rem; + position: absolute; + left: 4.28rem; + bottom: 2.32rem; + background: url(../images/why.png) no-repeat; + background-size: 100% 100%; +} + +.rewardBox2 .rule_in .box .img5 .why span { + position: absolute; + width: 3.8rem; + height: 3.2rem; + top: 0.13333rem; + right: -3.6rem; + text-align: center; + color: #FDF565; + font-size: 0.34667rem; + font-weight: 400; + background: rgba(0, 0, 0, 0.8); + padding: 0.24rem 0.32rem 0.29333rem 0.28rem; + line-height: 0.48rem; + box-sizing: border-box; + border-radius: 0.10667rem; + display: none; +} + +.rewardBox2 .rule_in .box .img4 { + width: 7.73333rem; + height: 10.24rem; + background: url(../images/4.png) no-repeat; + background-size: 100% 100%; + margin: 0 auto; + position: relative; +} + +.rewardBox2 .rule_in .box .img4 .why { + width: 0.69333rem; + height: 0.69333rem; + position: absolute; + left: 4.28rem; + bottom: 2.32rem; + background: url(../images/why.png) no-repeat; + background-size: 100% 100%; +} + +.rewardBox2 .rule_in .box .img4 .why span { + position: absolute; + width: 3.8rem; + height: 3.2rem; + top: 0.13333rem; + right: -3.6rem; + text-align: center; + color: #FDF565; + font-size: 0.34667rem; + font-weight: 400; + background: rgba(0, 0, 0, 0.8); + padding: 0.24rem 0.32rem 0.29333rem 0.28rem; + line-height: 0.48rem; + box-sizing: border-box; + border-radius: 0.10667rem; + display: none; +} + +.arabic .header { + background: url(../images/header-ar.png) no-repeat; + background-size: 100% 100%; +} + +.arabic .lastWeek .top .title { + font-size: 0.34667rem; +} + +.arabic .page2 .myList .content ul li span { + text-align: left; +} + +.arabic .page2 .myList .top .rule { + text-indent: 0.2rem; +} + +.arabic .page1 .thisWeek .top .rule { + text-indent: 0.2rem; +} + +.arabic .rewardBox2 .rule_in .box .img6 { + background: url(../images/6-ar.png) no-repeat; + background-size: 100% 100%; +} + +.arabic .rewardBox2 .rule_in .box .img5 { + background: url(../images/5-ar.png) no-repeat; + background-size: 100% 100%; +} + +.arabic .rewardBox2 .rule_in .box .img4 { + background: url(../images/4-ar.png) no-repeat; + background-size: 100% 100%; } diff --git a/view/molistar/activity/customizedGift/css/index.scss b/view/molistar/activity/customizedGift/css/index.scss index f56de0b..29a2345 100644 --- a/view/molistar/activity/customizedGift/css/index.scss +++ b/view/molistar/activity/customizedGift/css/index.scss @@ -312,6 +312,7 @@ body { background: url(../images/rule.png) no-repeat; background-size: 100% 100%; text-indent: -0.2rem; + z-index: 2; } .reward { @@ -636,6 +637,7 @@ body { background: url(../images/rule.png) no-repeat; background-size: 100% 100%; text-indent: -0.2rem; + z-index: 2; } .reward { @@ -940,6 +942,86 @@ body { } } +.ruleBox2 { + position: fixed; + left: 0; + top: 0; + bottom: 0; + right: 0; + background: rgba(0, 0, 0, .5); + z-index: 99; + display: none; + + .rule_in { + width: px2rem(720); + height: px2rem(460); + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + background: url(../images/rule_bg.png) no-repeat; + background-size: 100% 100%; + + .close { + width: px2rem(66); + height: px2rem(66); + position: absolute; + top: px2rem(-42); + right: 0; + } + + .title { + width: px2rem(378); + height: px2rem(94); + background: url(../images/title.png) no-repeat; + background-size: 100% 100%; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: px2rem(-0); + text-align: center; + line-height: px2rem(94); + color: #FDF565; + font-size: px2rem(32); + font-weight: 600; + } + + .box { + width: px2rem(600); + height: px2rem(248); + margin: px2rem(130) auto 0; + overflow-y: scroll; + + &::-webkit-scrollbar { + display: none; + } + + p { + width: 100%; + line-height: px2rem(38); + font-size: px2rem(28); + font-weight: 400; + color: #FDF565; + } + + img { + display: block; + width: px2rem(580); + display: none; + } + + .img2 { + width: px2rem(580); + margin: 0 auto; + } + + .img6 { + display: block; + } + } + } +} + .rewardBox { position: fixed; left: 0; @@ -1025,6 +1107,7 @@ body { } } } + .rewardBox2 { position: fixed; left: 0; @@ -1045,6 +1128,32 @@ body { background: url(../images/rewardBox.png) no-repeat; background-size: 100% 100%; + .stabBox { + width: px2rem(600); + height: px2rem(57); + line-height: px2rem(57); + display: flex; + justify-content: space-between; + background: #360100; + border-radius: px2rem(57); + overflow: hidden; + margin: px2rem(124) auto px2rem(19); + + div { + width: px2rem(100); + color: #FDF565; + font-size: px2rem(30); + font-weight: 400; + border-radius: px2rem(57); + text-align: center; + } + + .act { + background: linear-gradient(-90deg, #FDF565, #FFAF31); + color: #360100; + } + } + .close { width: px2rem(66); height: px2rem(66); @@ -1071,8 +1180,8 @@ body { .box { width: px2rem(690); - height: 8.7rem; - margin: px2rem(130) auto 0; + height: 7.7rem; + margin: px2rem(0) auto 0; overflow-y: scroll; &::-webkit-scrollbar { @@ -1090,25 +1199,162 @@ body { } img { + width: px2rem(580); + display: none; + margin: 0 auto; + display: none; + } + + .img6 { + width: px2rem(580); + height: px2rem(768); + background: url(../images/6.png) no-repeat; + background-size: 100% 100%; display: block; - width: 100%; + margin: 0 auto; + position: relative; + + .why { + width: px2rem(52); + height: px2rem(52); + //justify-self: px2rem(52); + position: absolute; + left: px2rem(321); + bottom: px2rem(174); + background: url(../images/why.png) no-repeat; + background-size: 100% 100%; + + span { + position: absolute; + width: px2rem(285); + height: px2rem(240); + top: px2rem(10); + right: px2rem(-270); + text-align: center; + color: #FDF565; + font-size: px2rem(26); + font-weight: 400; + background: rgba(0, 0, 0, .8); + padding: px2rem(18) px2rem(24) px2rem(22) px2rem(21); + line-height: px2rem(36); + box-sizing: border-box; + border-radius: px2rem(8); + display: none; + } + } } - .img1 { - margin: 0 auto px2rem(37); + .img5 { + width: px2rem(580); + height: px2rem(768); + background: url(../images/5.png) no-repeat; + background-size: 100% 100%; + margin: 0 auto; + position: relative; + + .why { + width: px2rem(52); + height: px2rem(52); + //justify-self: px2rem(52); + position: absolute; + left: px2rem(321); + bottom: px2rem(174); + background: url(../images/why.png) no-repeat; + background-size: 100% 100%; + + span { + position: absolute; + width: px2rem(285); + height: px2rem(240); + top: px2rem(10); + right: px2rem(-270); + text-align: center; + color: #FDF565; + font-size: px2rem(26); + font-weight: 400; + background: rgba(0, 0, 0, .8); + padding: px2rem(18) px2rem(24) px2rem(22) px2rem(21); + line-height: px2rem(36); + box-sizing: border-box; + border-radius: px2rem(8); + display: none; + } + } } - .img2 { - width: px2rem(208); - margin: 0 auto px2rem(35); - } + .img4 { + width: px2rem(580); + height: px2rem(768); + background: url(../images/4.png) no-repeat; + background-size: 100% 100%; + margin: 0 auto; + position: relative; - .img3 { - width: px2rem(574); - margin: 0 auto px2rem(40); + .why { + width: px2rem(52); + height: px2rem(52); + //justify-self: px2rem(52); + position: absolute; + left: px2rem(321); + bottom: px2rem(174); + background: url(../images/why.png) no-repeat; + background-size: 100% 100%; + + span { + position: absolute; + width: px2rem(285); + height: px2rem(240); + top: px2rem(10); + right: px2rem(-270); + text-align: center; + color: #FDF565; + font-size: px2rem(26); + font-weight: 400; + background: rgba(0, 0, 0, .8); + padding: px2rem(18) px2rem(24) px2rem(22) px2rem(21); + line-height: px2rem(36); + box-sizing: border-box; + border-radius: px2rem(8); + display: none; + } + } } } } } -.arabic {} \ No newline at end of file +.arabic { + .header { + background: url(../images/header-ar.png) no-repeat; + background-size: 100% 100%; + } + + .lastWeek .top .title { + font-size: px2rem(26); + } + + .page2 .myList .content ul li span { + text-align: left; + } + + .page2 .myList .top .rule { + text-indent: 0.2rem; + } + + .page1 .thisWeek .top .rule { + text-indent: 0.2rem; + } + + .rewardBox2 .rule_in .box .img6 { + background: url(../images/6-ar.png) no-repeat; + background-size: 100% 100%; + } + + .rewardBox2 .rule_in .box .img5 { + background: url(../images/5-ar.png) no-repeat; + background-size: 100% 100%;} + + .rewardBox2 .rule_in .box .img4 { + background: url(../images/4-ar.png) no-repeat; + background-size: 100% 100%;} +} \ No newline at end of file diff --git a/view/molistar/activity/customizedGift/images/1-ar.png b/view/molistar/activity/customizedGift/images/1-ar.png new file mode 100644 index 0000000..533deec Binary files /dev/null and b/view/molistar/activity/customizedGift/images/1-ar.png differ diff --git a/view/molistar/activity/customizedGift/images/1.png b/view/molistar/activity/customizedGift/images/1.png new file mode 100644 index 0000000..1d71415 Binary files /dev/null and b/view/molistar/activity/customizedGift/images/1.png differ diff --git a/view/molistar/activity/customizedGift/images/2-ar.png b/view/molistar/activity/customizedGift/images/2-ar.png new file mode 100644 index 0000000..a11dc98 Binary files /dev/null and b/view/molistar/activity/customizedGift/images/2-ar.png differ diff --git a/view/molistar/activity/customizedGift/images/2.png b/view/molistar/activity/customizedGift/images/2.png new file mode 100644 index 0000000..7898706 Binary files /dev/null and b/view/molistar/activity/customizedGift/images/2.png differ diff --git a/view/molistar/activity/customizedGift/images/3-ar.png b/view/molistar/activity/customizedGift/images/3-ar.png new file mode 100644 index 0000000..ced32e0 Binary files /dev/null and b/view/molistar/activity/customizedGift/images/3-ar.png differ diff --git a/view/molistar/activity/customizedGift/images/3.png b/view/molistar/activity/customizedGift/images/3.png new file mode 100644 index 0000000..9cca16f Binary files /dev/null and b/view/molistar/activity/customizedGift/images/3.png differ diff --git a/view/molistar/activity/customizedGift/images/4-ar.png b/view/molistar/activity/customizedGift/images/4-ar.png new file mode 100644 index 0000000..8f7b595 Binary files /dev/null and b/view/molistar/activity/customizedGift/images/4-ar.png differ diff --git a/view/molistar/activity/customizedGift/images/4.png b/view/molistar/activity/customizedGift/images/4.png new file mode 100644 index 0000000..48d0758 Binary files /dev/null and b/view/molistar/activity/customizedGift/images/4.png differ diff --git a/view/molistar/activity/customizedGift/images/5-ar.png b/view/molistar/activity/customizedGift/images/5-ar.png new file mode 100644 index 0000000..beb6be3 Binary files /dev/null and b/view/molistar/activity/customizedGift/images/5-ar.png differ diff --git a/view/molistar/activity/customizedGift/images/5.png b/view/molistar/activity/customizedGift/images/5.png new file mode 100644 index 0000000..267de0d Binary files /dev/null and b/view/molistar/activity/customizedGift/images/5.png differ diff --git a/view/molistar/activity/customizedGift/images/6-ar.png b/view/molistar/activity/customizedGift/images/6-ar.png new file mode 100644 index 0000000..7e04727 Binary files /dev/null and b/view/molistar/activity/customizedGift/images/6-ar.png differ diff --git a/view/molistar/activity/customizedGift/images/6.png b/view/molistar/activity/customizedGift/images/6.png new file mode 100644 index 0000000..2647f4b Binary files /dev/null and b/view/molistar/activity/customizedGift/images/6.png differ diff --git a/view/molistar/activity/customizedGift/images/bgBottom.png b/view/molistar/activity/customizedGift/images/bgBottom.png index 0b8d9c9..1a74cae 100644 Binary files a/view/molistar/activity/customizedGift/images/bgBottom.png and b/view/molistar/activity/customizedGift/images/bgBottom.png differ diff --git a/view/molistar/activity/customizedGift/images/bgCentent.png b/view/molistar/activity/customizedGift/images/bgCentent.png index 802e5b8..7251720 100644 Binary files a/view/molistar/activity/customizedGift/images/bgCentent.png and b/view/molistar/activity/customizedGift/images/bgCentent.png differ diff --git a/view/molistar/activity/customizedGift/images/bgTop.png b/view/molistar/activity/customizedGift/images/bgTop.png index 9e6bf8d..97fc32a 100644 Binary files a/view/molistar/activity/customizedGift/images/bgTop.png and b/view/molistar/activity/customizedGift/images/bgTop.png differ diff --git a/view/molistar/activity/customizedGift/images/bgTopL.png b/view/molistar/activity/customizedGift/images/bgTopL.png index 5f9fb74..507039c 100644 Binary files a/view/molistar/activity/customizedGift/images/bgTopL.png and b/view/molistar/activity/customizedGift/images/bgTopL.png differ diff --git a/view/molistar/activity/customizedGift/images/bgTopS.png b/view/molistar/activity/customizedGift/images/bgTopS.png index 565c615..17345ce 100644 Binary files a/view/molistar/activity/customizedGift/images/bgTopS.png and b/view/molistar/activity/customizedGift/images/bgTopS.png differ diff --git a/view/molistar/activity/customizedGift/images/close.png b/view/molistar/activity/customizedGift/images/close.png index add0a3a..1dc8916 100644 Binary files a/view/molistar/activity/customizedGift/images/close.png and b/view/molistar/activity/customizedGift/images/close.png differ diff --git a/view/molistar/activity/customizedGift/images/header-ar.png b/view/molistar/activity/customizedGift/images/header-ar.png new file mode 100644 index 0000000..556fc58 Binary files /dev/null and b/view/molistar/activity/customizedGift/images/header-ar.png differ diff --git a/view/molistar/activity/customizedGift/images/header.png b/view/molistar/activity/customizedGift/images/header.png index 67a782f..e3dacd5 100644 Binary files a/view/molistar/activity/customizedGift/images/header.png and b/view/molistar/activity/customizedGift/images/header.png differ diff --git a/view/molistar/activity/customizedGift/images/liBg.png b/view/molistar/activity/customizedGift/images/liBg.png index 5f3da60..6b5e8ca 100644 Binary files a/view/molistar/activity/customizedGift/images/liBg.png and b/view/molistar/activity/customizedGift/images/liBg.png differ diff --git a/view/molistar/activity/customizedGift/images/liBgB.png b/view/molistar/activity/customizedGift/images/liBgB.png index cf43d40..60212f4 100644 Binary files a/view/molistar/activity/customizedGift/images/liBgB.png and b/view/molistar/activity/customizedGift/images/liBgB.png differ diff --git a/view/molistar/activity/customizedGift/images/null.png b/view/molistar/activity/customizedGift/images/null.png index 5744001..c884eed 100644 Binary files a/view/molistar/activity/customizedGift/images/null.png and b/view/molistar/activity/customizedGift/images/null.png differ diff --git a/view/molistar/activity/customizedGift/images/numBg.png b/view/molistar/activity/customizedGift/images/numBg.png index a9d3c7c..7de508b 100644 Binary files a/view/molistar/activity/customizedGift/images/numBg.png and b/view/molistar/activity/customizedGift/images/numBg.png differ diff --git a/view/molistar/activity/customizedGift/images/reward.png b/view/molistar/activity/customizedGift/images/reward.png index f81ccc6..c255c5f 100644 Binary files a/view/molistar/activity/customizedGift/images/reward.png and b/view/molistar/activity/customizedGift/images/reward.png differ diff --git a/view/molistar/activity/customizedGift/images/reward1-ar.png b/view/molistar/activity/customizedGift/images/reward1-ar.png new file mode 100644 index 0000000..40f01ea Binary files /dev/null and b/view/molistar/activity/customizedGift/images/reward1-ar.png differ diff --git a/view/molistar/activity/customizedGift/images/reward1.png b/view/molistar/activity/customizedGift/images/reward1.png index a052bb5..e77022e 100644 Binary files a/view/molistar/activity/customizedGift/images/reward1.png and b/view/molistar/activity/customizedGift/images/reward1.png differ diff --git a/view/molistar/activity/customizedGift/images/reward2.png b/view/molistar/activity/customizedGift/images/reward2.png index f48e4b8..317e0e6 100644 Binary files a/view/molistar/activity/customizedGift/images/reward2.png and b/view/molistar/activity/customizedGift/images/reward2.png differ diff --git a/view/molistar/activity/customizedGift/images/reward3.png b/view/molistar/activity/customizedGift/images/reward3.png index 9f2d7ab..25d73fb 100644 Binary files a/view/molistar/activity/customizedGift/images/reward3.png and b/view/molistar/activity/customizedGift/images/reward3.png differ diff --git a/view/molistar/activity/customizedGift/images/rewardBox.png b/view/molistar/activity/customizedGift/images/rewardBox.png index 5dfa5ef..c8be43f 100644 Binary files a/view/molistar/activity/customizedGift/images/rewardBox.png and b/view/molistar/activity/customizedGift/images/rewardBox.png differ diff --git a/view/molistar/activity/customizedGift/images/rule.png b/view/molistar/activity/customizedGift/images/rule.png index 459ad86..3ac7658 100644 Binary files a/view/molistar/activity/customizedGift/images/rule.png and b/view/molistar/activity/customizedGift/images/rule.png differ diff --git a/view/molistar/activity/customizedGift/images/rule_bg.png b/view/molistar/activity/customizedGift/images/rule_bg.png index d866130..9f87511 100644 Binary files a/view/molistar/activity/customizedGift/images/rule_bg.png and b/view/molistar/activity/customizedGift/images/rule_bg.png differ diff --git a/view/molistar/activity/customizedGift/images/tab.png b/view/molistar/activity/customizedGift/images/tab.png index d6e2a39..d5e6049 100644 Binary files a/view/molistar/activity/customizedGift/images/tab.png and b/view/molistar/activity/customizedGift/images/tab.png differ diff --git a/view/molistar/activity/customizedGift/images/titleBox.png b/view/molistar/activity/customizedGift/images/titleBox.png index 5991263..c56492b 100644 Binary files a/view/molistar/activity/customizedGift/images/titleBox.png and b/view/molistar/activity/customizedGift/images/titleBox.png differ diff --git a/view/molistar/activity/customizedGift/images/ts1.png b/view/molistar/activity/customizedGift/images/ts1.png index 551417d..1f61b08 100644 Binary files a/view/molistar/activity/customizedGift/images/ts1.png and b/view/molistar/activity/customizedGift/images/ts1.png differ diff --git a/view/molistar/activity/customizedGift/images/ts2.png b/view/molistar/activity/customizedGift/images/ts2.png index 26cb757..1570300 100644 Binary files a/view/molistar/activity/customizedGift/images/ts2.png and b/view/molistar/activity/customizedGift/images/ts2.png differ diff --git a/view/molistar/activity/customizedGift/images/ts3.png b/view/molistar/activity/customizedGift/images/ts3.png index d6a4f5a..6846d0a 100644 Binary files a/view/molistar/activity/customizedGift/images/ts3.png and b/view/molistar/activity/customizedGift/images/ts3.png differ diff --git a/view/molistar/activity/customizedGift/images/why.png b/view/molistar/activity/customizedGift/images/why.png new file mode 100644 index 0000000..ed42489 Binary files /dev/null and b/view/molistar/activity/customizedGift/images/why.png differ diff --git a/view/molistar/activity/customizedGift/index.html b/view/molistar/activity/customizedGift/index.html index fc29d71..5b5e057 100644 --- a/view/molistar/activity/customizedGift/index.html +++ b/view/molistar/activity/customizedGift/index.html @@ -4,7 +4,7 @@ - Custom Gift Competition + @@ -18,31 +18,29 @@
-
Activity introduction
-
-

Have you ever thought about sending a custom gift that expresses your feelings?

-

Now, the opportunity has come! Our customized gift competition allows you to upload your own customized - gifts and gain recognition in the competition. Looking forward to your creativity and enthusiasm!

+
+
+
-
Top 3 Gifts Last Week
+
-
Gift name:
-
Gifted time:
+
+
-
Gift name:
-
Gifted time:
+
Gift name:
+
Gifted time:
-
Gift name:
-
Gifted time:
+
Gift name:
+
Gifted time:
@@ -51,53 +49,53 @@
-
Popular Custom Gifts
-
Custom Gifts Supporter
+
+
-
Rule
+
- Reward +
-
Countdown
+
0 - Day +
0 - Hours +
0 - Mins +
0 - Secs +
-
Gift name:
-
Gifted time:
+
Gift name:
+
Gifted time:
-
Gift name:
-
Gifted time:
+
Gift name:
+
Gifted time:
-
Gift name:
-
Gifted time:
+
Gift name:
+
Gifted time:
@@ -120,29 +118,29 @@
-
Rule
+
Rule
- Reward + Reward
-
Countdown
+
0 - Day + Day
0 - Hours + Hours
0 - Mins + Mins
0 - Secs + Secs
@@ -174,32 +172,35 @@
-
Rule
+
Rule
-
-

1. Event time: the 1st of this month to the end of the second month(GMT+3)

-

2. Calculate the number of customized gifts sent during the event. The more gifts sent, the more you - will get.

-

3. This event has nothing to do with Google and Apple

+
+ +
+
+
+ +
+
+
Rule
+ +
+
-
Reward
+
Reward
-

Reward 1: When the customized gift ranks first on this week’s gift list, the gift will be customized - as a start page and banner.

+

-

Reward 2: When the customized gifts are among the top three of the week, they will be updated to the - gift panel as an exclusive customized lucky gift.

+

-

Reward 3: When the customized gifts are among the top three of the - week, there will be a specific area on the event page to display the corresponding gifts.

-

Reward 4: When the customized gifts are the top three of the week, these three gifts will have a - special presence on the customized gift panel.

+

+

@@ -207,7 +208,7 @@
-
Reward
+
Reward
700
@@ -215,20 +216,28 @@
3500
4900
5600
-
7000
+
7000
-

Reward 1: When the customized gift ranks first on this week’s gift list, the gift will be customized - as a start page and banner.

- -

Reward 2: When the customized gifts are among the top three of the week, they will be updated to the - gift panel as an exclusive customized lucky gift.

- -

Reward 3: When the customized gifts are among the top three of the - week, there will be a specific area on the event page to display the corresponding gifts.

-

Reward 4: When the customized gifts are the top three of the week, these three gifts will have a - special presence on the customized gift panel.

- +

+ + + + + +
+
+ +
+
diff --git a/view/molistar/activity/customizedGift/js/index.js b/view/molistar/activity/customizedGift/js/index.js index 618f44e..350aa59 100644 --- a/view/molistar/activity/customizedGift/js/index.js +++ b/view/molistar/activity/customizedGift/js/index.js @@ -62,7 +62,35 @@ $(function () { function translateFun() { var langReplace = window.lang.replace; var localLang = window.lang; - // $('.text1').text(langReplace(localLang.demoModule.text1)); + $('.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)); + $('.text7').html(langReplace(localLang.demoModule.text7)); + $('.text8').html(langReplace(localLang.demoModule.text8)); + $('.text9').html(langReplace(localLang.demoModule.text9)); + $('.text10').html(langReplace(localLang.demoModule.text10)); + $('.text11').html(langReplace(localLang.demoModule.text11)); + $('.text12').html(langReplace(localLang.demoModule.text12)); + $('.text13').html(langReplace(localLang.demoModule.text13)); + $('.text14').html(langReplace(localLang.demoModule.text14)); + $('.text15').html(langReplace(localLang.demoModule.text15)); + $('.text16').html(langReplace(localLang.demoModule.text16)); + $('.text17').html(langReplace(localLang.demoModule.text17)); + $('.text18').html(langReplace(localLang.demoModule.text18)); + $('.text19').html(langReplace(localLang.demoModule.text19)); + $('.text20').html(langReplace(localLang.demoModule.text20)); + $('.text21').html(langReplace(localLang.demoModule.text21)); + $('.text22').html(langReplace(localLang.demoModule.text22)); + $('.text23').html(langReplace(localLang.demoModule.text23)); + $('.text24').html(langReplace(localLang.demoModule.text24)); + $('.text25').html(langReplace(localLang.demoModule.text25)); + $('.rewardBox .rule_in .box .img1').attr('src', langReplace(localLang.demoModule.img1)); + $('.rewardBox2 .rule_in .box .img1').attr('src', langReplace(localLang.demoModule.img2)); + $('.rewardBox2 .rule_in .box .img2').attr('src', langReplace(localLang.demoModule.img3)); + $('.rewardBox2 .rule_in .box .img3').attr('src', langReplace(localLang.demoModule.img4)); } // 第一Tab接口 function rankGift() { @@ -73,48 +101,6 @@ function rankGift() { data: { uid: pubInfo.uid }, success(res) { if (res.code === 200) { - res.data = { - "lastWeekTop": [ - { - "picUrl": "https://image.pekolive.com/2233.png", - "giftName": "monik", - "giftNum": 43, - "giftId": 2261, - "rank": 1 - }, - { - "picUrl": "https://image.pekolive.com/Tarekconstmsda.png", - "giftName": "Tarek II", - "giftNum": 4, - "giftId": 2284, - "rank": 2 - }, - { - "giftNum": 1, - "giftId": 3207, - "rank": 3 - } - ], - "thisWeekTop": [ - { - "picUrl": "https://image.pekolive.com/2233.png", - "giftName": "monik", - "giftNum": 43, - "giftId": 2261, - "rank": 1 - }, - { - "picUrl": "https://image.pekolive.com/Tarekconstmsda.png", - "giftName": "Tarek II", - "giftNum": 4, - "giftId": 2284, - "rank": 2 - } - ], - "endTime": 1733086799999, - "partitionId": 2 - } - console.log(res.data); // 处理倒计时 countup1(res.data.endTime - res.timestamp); var listTo3 = res.data.lastWeekTop.slice(0, 3); @@ -157,8 +143,8 @@ function rankGift() {
${res.rank}
-

Gift name:${res.giftName}

- Gifted time:${res.giftNum} +

${langReplace(localLang.demoModule.text5)}${res.giftName}

+ ${langReplace(localLang.demoModule.text6)}${res.giftNum}
` @@ -189,8 +175,8 @@ function giftRank() { // 处理自己 $('.page2 .myList .top .my .tx').attr('src', res.data.myRank.avatar); $('.page2 .myList .top .my p').text(res.data.myRank.name); - $('.page2 .myList .top .my b').text('Gifted time:' + unitProcessingAr(res.data.myRank.totalNum, 1)); - $('.page2 .myList .top .my span').text('Coins of Gifted:' + unitProcessingAr(res.data.myRank.totalGoldNum, 1)); + $('.page2 .myList .top .my b').text(langReplace(localLang.demoModule.text5) + unitProcessingAr(res.data.myRank.totalNum, 1)); + $('.page2 .myList .top .my span').text(langReplace(localLang.demoModule.text5) + unitProcessingAr(res.data.myRank.totalGoldNum, 1)); // 处理列表 $('.page2 .myList .content ul li').remove(); var str = ''; @@ -202,8 +188,8 @@ function giftRank() { ${res.name}
-

Gifted time:${unitProcessingAr(res.totalNum, 1)}

- Coins of Gifted:${unitProcessingAr(res.totalGoldNum, 1)} +

${langReplace(localLang.demoModule.text5)}${unitProcessingAr(res.totalNum, 1)}

+ ${langReplace(localLang.demoModule.text25)}${unitProcessingAr(res.totalGoldNum, 1)}
` @@ -297,9 +283,24 @@ function getzf(num) { } return num; } +// 打开规则 +$('.page2 .myList .top .rule').click(function () { + $('.ruleBox').show(); + bodyScroolFun(true); +}) // 关闭规则 -$('.rule .rule_in .close').click(function () { - $('.rule').hide(); +$('.ruleBox .rule_in .close').click(function () { + $('.ruleBox').hide(); + bodyScroolFun(false); +}) +// 打开规则 +$('.page1 .thisWeek .top .rule').click(function () { + $('.ruleBox2').show(); + bodyScroolFun(true); +}) +// 关闭规则 +$('.ruleBox2 .rule_in .close').click(function () { + $('.ruleBox2').hide(); bodyScroolFun(false); }) // 打开奖励 @@ -311,4 +312,28 @@ $('.page1 .thisWeek .top .reward').click(function () { $('.rewardBox .rule_in .close').click(function () { $('.rewardBox').hide(); bodyScroolFun(false); +}) +// 打开奖励 +$('.page2 .myList .top .reward').click(function () { + $('.rewardBox2').show(); + bodyScroolFun(true); +}) +// 关闭奖励 +$('.rewardBox2 .rule_in .close').click(function () { + $('.rewardBox2').hide(); + $('.rewardBox2 .rule_in .box .img6 .why span,.rewardBox2 .rule_in .box .img5 .why span,.rewardBox2 .rule_in .box .img4 .why span').hide(); + bodyScroolFun(false); +}) + +// 奖励tab切换 +$('.rewardBox2 .rule_in .stabBox div').click(function () { + var i = $(this).index() + 1; + $(this).addClass('act').siblings().removeClass(); + $('.rewardBox2 .rule_in .box img').hide(); + $('.rewardBox2 .rule_in .box .boxs').hide(); + $(`.rewardBox2 .rule_in .box .img${i}`).css('display', 'block'); +}) +$('.rewardBox2 .rule_in .box .img6 .why,.rewardBox2 .rule_in .box .img5 .why,.rewardBox2 .rule_in .box .img4 .why').click(function () { + $('.rewardBox2 .rule_in .box .img6 .why span,.rewardBox2 .rule_in .box .img5 .why span,.rewardBox2 .rule_in .box .img4 .why span').show(); + return }) \ No newline at end of file diff --git a/view/molistar/activity/customizedGift/local/ar.js b/view/molistar/activity/customizedGift/local/ar.js index 95ccdba..f913e81 100644 --- a/view/molistar/activity/customizedGift/local/ar.js +++ b/view/molistar/activity/customizedGift/local/ar.js @@ -5,6 +5,39 @@ langAr = { layerIndex1: `جار التحميل...`, layerIndex2: `نجاح`, layerIndex3: `خطأ في الشبكة`, - + text1: `مسابقة الهدايا المخصصة`, + text2: `مقدمة النشاط`, + text3: `

هل فكرت يومًا في إرسال هدية مخصصة تعبر عن مشاعرك؟

+

الآن، الفرصة قد جاءت! مسابقتنا للهدايا المخصصة تتيح لك تحميل هداياك المخصصة والحصول على التقدير في المسابقة. نتطلع إلى إبداعك وحماسك!

`, + text4: `أفضل 3 هدايا الأسبوع الماضي`, + text5: `اسم الهدية:`, + text6: `وقت الإهداء:`, + text7: `الهدايا المخصصة الشائعة`, + text8: `داعمي الهدايا المخصصة`, + text9: `القواعد`, + text10: `المكافأة`, + text11: `العد التنازلي`, + text12: `يوم`, + text13: `ساعة`, + text14: `دقيقة`, + text15: `ثانية`, + text16: `العد التنازلي`, + text17: `

1. وقت النشاط: من اليوم الأول من هذا الشهر إلى نهاية الشهر الثاني (GMT+3)

+

2. احتساب عدد الهدايا المخصصة المرسلة خلال الحدث. كلما زادت الهدايا المرسلة، زادت المكافآت التي ستحصل عليها.

+

3. هذا الحدث لا علاقة له بـ Google أو Apple

`, + text18: `

1. وقت بدء الحدث: من الساعة 00:00 كل يوم اثنين إلى الساعة 23:59 كل يوم أحد (GMT+3)

+

2. أفضل 3 هدايا مخصصة شائعة ستفوز بجوائز سخية.

+

3. هذا الحدث لا علاقة له بـ Google أو Apple

`, + text19: `المكافأة 1: عندما تحتل الهدية المخصصة المرتبة الأولى في قائمة هدايا هذا الأسبوع، سيتم تخصيص الهدية كصفحة بداية وبانر.`, + text20: `المكافأة 2: عندما تكون الهدايا المخصصة ضمن المراكز الثلاثة الأولى لهذا الأسبوع، سيتم تحديثها في لوحة الهدايا كهدية حصرية مخصصة.`, + text21: `المكافأة 3: عندما تكون الهدايا المخصصة ضمن المراكز الثلاثة الأولى لهذا الأسبوع، سيكون هناك منطقة مخصصة في صفحة الحدث لعرض الهدايا المقابلة.`, + text22: `المكافأة 4: عندما تكون الهدايا المخصصة ضمن المراكز الثلاثة الأولى لهذا الأسبوع، ستحظى هذه الهدايا الثلاثة بظهور خاص على لوحة الهدايا المخصصة.`, + text23: `خلال الحدث، إذا وصل عدد الهدايا المخصصة المرسلة إلى 7000، يمكنك الحصول على المكافآت التالية!`, + text24: `يرجى الاتصال بخدمة العملاء لدينا، وتحميل فيديو سيارة مدته 10 ثوانٍ، وتخصيص سيارتك الخاصة.`, + text25: `عدد عملات الهدايا:`, + img1: `./images/reward1-ar.png`, + img2: `./images/1-ar.png`, + img3: `./images/2-ar.png`, + img4: `./images/3-ar.png`, } } \ No newline at end of file diff --git a/view/molistar/activity/customizedGift/local/en.js b/view/molistar/activity/customizedGift/local/en.js index 7db177f..967dd88 100644 --- a/view/molistar/activity/customizedGift/local/en.js +++ b/view/molistar/activity/customizedGift/local/en.js @@ -3,5 +3,53 @@ langEn = { layerIndex1: `Loading...`, layerIndex2: `Success`, layerIndex3: `Network error`, + text1: `Custom Gift Competition`, + text2: `Activity introduction`, + text3: `

Have you ever thought about sending a custom gift that expresses your feelings?

+

Now, the opportunity has come! Our customized gift competition allows you to upload your own customized + gifts and gain recognition in the competition. Looking forward to your creativity and enthusiasm!

`, + text4: `Top 3 Gifts Last Week`, + text5: `Gift name:`, + text6: `Gifted time:`, + text7: `Popular Custom Gifts`, + text8: `Custom Gifts Supporter`, + text9: `Rule`, + text10: `Reward`, + text11: `Countdown`, + text12: `Day`, + text13: `Hours`, + text14: `Mins`, + text15: `Secs`, + text16: `Countdown`, + text17: `

1. Event time: the 1st of this month to the end of the second month(GMT+3)

+

2. Calculate the number of customized gifts sent during the event. The more gifts sent, the more you + will get.

+

3. This event has nothing to do with Google and Apple

`, + text18: `

1 Event start time: 00:00 every Monday - 23:59 every Sunday (GMT+3)

+

2. The Top3 popular customized gifts will get generous gifts.

+

3 This event has nothing to do with Google and Apple

`, + text19: `Reward 1: When the customized gift ranks first on this week’s gift list, the gift will + be customized + as a start page and banner.`, + text20: `Reward 2: When the customized gifts are among the top three of the week, they will be + updated to the + gift panel as an exclusive customized lucky gift.`, + text21: `Reward 3: When the customized gifts are among the top + three of the + week, there will be a specific area on the event page to display the corresponding gifts.`, + text22: `Reward 4: When the customized gifts are the top three of the week, these three gifts + will have a + special presence on the customized gift panel.`, + text23: `During the event, if the number of customized gifts sent + in the gift + times reaches 7000, you can get the following rewards!`, + text24: `Please contact our customer service, upload a 10-second car video, and + customize your own + car.`, + text25: `Coins of Gifted:`, + img1: `./images/reward1.png`, + img2: `./images/1.png`, + img3: `./images/2.png`, + img4: `./images/3.png`, } } diff --git a/view/molistar/activity/customizedGift/local/zh.js b/view/molistar/activity/customizedGift/local/zh.js index 9f26e52..c80fb28 100644 --- a/view/molistar/activity/customizedGift/local/zh.js +++ b/view/molistar/activity/customizedGift/local/zh.js @@ -5,5 +5,39 @@ langZh = { layerIndex1: `加载中...`, layerIndex2: `成功`, layerIndex3: `网络错误`, + text1: `客製禮物競賽`, + text2: `活動介紹`, + text3: `

您是否曾想過送出一份能表達您情感的客製禮物?

+

現在,機會來了!我們的客製禮物競賽允許您上傳自己的客製禮物,並在競賽中獲得認可。期待您的創意和熱情!

`, + text4: `上週前三名禮物`, + text5: `禮物名稱:`, + text6: `送出時間:`, + text7: `熱門客製禮物`, + text8: `客製禮物支持者`, + text9: `規則`, + text10: `獎勵`, + text11: `倒計時`, + text12: `天`, + text13: `小時`, + text14: `分鐘`, + text15: `秒`, + text16: `倒計時`, + text17: `

1. 活動時間:本月1日至第二個月月底(GMT+3)

+

2. 計算活動期間送出的客製禮物數量。送出的禮物越多,獲得的獎勵越多。

+

3. 此活動與 Google 和 Apple 無關

`, + text18: `

1. 活動開始時間:每週一 00:00 - 每週日 23:59(GMT+3)

+

2. 最受歡迎的前三名客製禮物將獲得豐厚禮品。

+

3. 此活動與 Google 和 Apple 無關

`, + text19: `獎勵1:當客製禮物在本週的禮物榜上排名第一時,該禮物將被客製為起始頁面和橫幅。`, + text20: `獎勵2:當客製禮物進入本週前三名時,將被更新到禮物面板,作為專屬的客製幸運禮物。`, + text21: `獎勵3:當客製禮物進入本週前三名時,活動頁面上將有專屬區域展示相應禮物。`, + text22: `獎勵4:當客製禮物為本週前三名時,這三份禮物將在客製禮物面板上有特別展示。`, + text23: `活動期間,如果客製禮物的送出次數達到7000次,您將獲得以下獎勵!`, + text24: `請聯繫我們的客服,並上傳一段10秒的汽車影片,客製化您的專屬汽車。`, + text25: `禮物的硬幣數:`, + img1: `./images/reward1.png`, + img2: `./images/1.png`, + img3: `./images/2.png`, + img4: `./images/3.png`, } } \ No newline at end of file