diff --git a/view/molistar/activity/gameChallenge/css/index.css b/view/molistar/activity/gameChallenge/css/index.css index ee45bae5..f4417e0e 100644 --- a/view/molistar/activity/gameChallenge/css/index.css +++ b/view/molistar/activity/gameChallenge/css/index.css @@ -55,7 +55,7 @@ body { bottom: 1.1733333333rem; right: 0; } -.header .coin_status { +.header .receive { width: 2.5333333333rem; height: 0.8rem; background: url(../images/receive.png) no-repeat center/100% 100%; @@ -68,6 +68,9 @@ body { bottom: 0.96rem; right: 0.2rem; } +.header .done { + background: url(../images/done.png) no-repeat center/100% 100%; +} .descBox { position: relative; @@ -526,7 +529,7 @@ body { width: 0.9066666667rem; height: 0.44rem; position: absolute; - bottom: 0.3466666667rem; + bottom: 0.4666666667rem; left: 1.4rem; } .page1 .my .info { @@ -590,7 +593,7 @@ body { height: 0.6666666667rem; background: url(../images/bottomBg.png) no-repeat; background-size: 100% 100%; - margin: -0.2rem auto 0; + margin: -0.4rem auto 0; } .page2 .content { width: 10rem; @@ -618,9 +621,10 @@ body { } .page2 .content .box .history_week { width: 100%; + padding-bottom: 0.2rem; } .page2 .content .box .history_week .title { - padding: 0.6rem 0 0.4rem; + padding: 0.4rem 0; display: flex; align-items: center; justify-content: center; @@ -886,7 +890,7 @@ body { .coins_pop .coins_pop_in .btn { width: 3.3866666667rem; height: 1.2rem; - background: url(../images/done.png) no-repeat center/100% 100%; + background: url(../images/receive.png) no-repeat center/100% 100%; margin: 0 auto; font-weight: 500; font-size: 0.3466666667rem; @@ -894,6 +898,9 @@ body { line-height: 1.2rem; text-align: center; } +.coins_pop .coins_pop_in .done { + background: url(../images/done.png) no-repeat center/100% 100%; +} .coins_pop .coins_pop_in h2 { font-weight: 400; font-size: 0.32rem; diff --git a/view/molistar/activity/gameChallenge/css/index.scss b/view/molistar/activity/gameChallenge/css/index.scss index 9ffb1968..c9bea0cb 100644 --- a/view/molistar/activity/gameChallenge/css/index.scss +++ b/view/molistar/activity/gameChallenge/css/index.scss @@ -62,7 +62,7 @@ body { right: 0; } - .coin_status { + .receive { width: px2rem(190); height: px2rem(60); background: url(../images/receive.png) no-repeat center/100% 100%; @@ -75,6 +75,10 @@ body { bottom: px2rem(72); right: px2rem(15); } + + .done { + background: url(../images/done.png) no-repeat center/100% 100%; + } } .descBox { @@ -582,7 +586,7 @@ body { width: px2rem(68); height: px2rem(33); position: absolute; - bottom: px2rem(26); + bottom: px2rem(35); left: px2rem(105); } @@ -655,7 +659,7 @@ body { height: px2rem(50); background: url(../images/bottomBg.png) no-repeat; background-size: 100% 100%; - margin: -0.2rem auto 0; + margin: -0.4rem auto 0; } .content { @@ -687,8 +691,9 @@ body { .history_week { width: 100%; + padding-bottom: px2rem(15); .title { - padding: px2rem(45) 0 px2rem(30); + padding: px2rem(30) 0; display: flex; align-items: center; justify-content: center; @@ -988,7 +993,7 @@ body { .btn { width: px2rem(254); height: px2rem(90); - background: url(../images/done.png) no-repeat center/100% 100%; + background: url(../images/receive.png) no-repeat center/100% 100%; margin: 0 auto; font-weight: 500; font-size: px2rem(26); @@ -997,6 +1002,10 @@ body { text-align: center; } + .done { + background: url(../images/done.png) no-repeat center/100% 100%; + } + h2 { font-weight: 400; font-size: px2rem(24); diff --git a/view/molistar/activity/gameChallenge/images/vip/1.png b/view/molistar/activity/gameChallenge/images/vip/1.png new file mode 100644 index 00000000..8ef00715 Binary files /dev/null and b/view/molistar/activity/gameChallenge/images/vip/1.png differ diff --git a/view/molistar/activity/gameChallenge/images/vip/2.png b/view/molistar/activity/gameChallenge/images/vip/2.png new file mode 100644 index 00000000..337fc593 Binary files /dev/null and b/view/molistar/activity/gameChallenge/images/vip/2.png differ diff --git a/view/molistar/activity/gameChallenge/images/vip/3.png b/view/molistar/activity/gameChallenge/images/vip/3.png new file mode 100644 index 00000000..0d0ad8ac Binary files /dev/null and b/view/molistar/activity/gameChallenge/images/vip/3.png differ diff --git a/view/molistar/activity/gameChallenge/images/vip/4.png b/view/molistar/activity/gameChallenge/images/vip/4.png new file mode 100644 index 00000000..0d50a099 Binary files /dev/null and b/view/molistar/activity/gameChallenge/images/vip/4.png differ diff --git a/view/molistar/activity/gameChallenge/images/vip/5.png b/view/molistar/activity/gameChallenge/images/vip/5.png new file mode 100644 index 00000000..045d4157 Binary files /dev/null and b/view/molistar/activity/gameChallenge/images/vip/5.png differ diff --git a/view/molistar/activity/gameChallenge/images/vip/6.png b/view/molistar/activity/gameChallenge/images/vip/6.png new file mode 100644 index 00000000..8fb3f951 Binary files /dev/null and b/view/molistar/activity/gameChallenge/images/vip/6.png differ diff --git a/view/molistar/activity/gameChallenge/images/vip/7.png b/view/molistar/activity/gameChallenge/images/vip/7.png new file mode 100644 index 00000000..8674fc24 Binary files /dev/null and b/view/molistar/activity/gameChallenge/images/vip/7.png differ diff --git a/view/molistar/activity/gameChallenge/images/vip/8.png b/view/molistar/activity/gameChallenge/images/vip/8.png new file mode 100644 index 00000000..3b9a2420 Binary files /dev/null and b/view/molistar/activity/gameChallenge/images/vip/8.png differ diff --git a/view/molistar/activity/gameChallenge/images/vip/9.png b/view/molistar/activity/gameChallenge/images/vip/9.png new file mode 100644 index 00000000..8bcb23a4 Binary files /dev/null and b/view/molistar/activity/gameChallenge/images/vip/9.png differ diff --git a/view/molistar/activity/gameChallenge/index.html b/view/molistar/activity/gameChallenge/index.html index 0b692596..f7057a42 100644 --- a/view/molistar/activity/gameChallenge/index.html +++ b/view/molistar/activity/gameChallenge/index.html @@ -20,7 +20,7 @@
-
Receive
+
Receive
@@ -97,7 +97,7 @@
More
@@ -149,8 +136,8 @@ Ranking only shows theTop10 users in the history.
(Regardless of whether they have received coins) - -
+ +
diff --git a/view/molistar/activity/gameChallenge/js/countNumber.js b/view/molistar/activity/gameChallenge/js/countNumber.js index f09c21f1..aff11a30 100644 --- a/view/molistar/activity/gameChallenge/js/countNumber.js +++ b/view/molistar/activity/gameChallenge/js/countNumber.js @@ -16,7 +16,9 @@ rollNum.prototype = { initHtml: function (obj, options) { // console.log(obj, options.deVal) - var nameDeVal = options.deVal.split(''); + // var nameDeVal = options.deVal.split(''); + var nameDeVal = options.deVal.toString().split(''); + var strHtml = '