diff --git a/view/molistar/activity/rechargeNew/css/index.css b/view/molistar/activity/rechargeNew/css/index.css index 3c4ecc95..f60164ff 100644 --- a/view/molistar/activity/rechargeNew/css/index.css +++ b/view/molistar/activity/rechargeNew/css/index.css @@ -196,7 +196,7 @@ body { position: absolute; left: 50%; transform: translateX(-50%); - top: 1.08rem; + top: 0.53333rem; } .recharge10 .bottom { @@ -304,7 +304,7 @@ body { position: absolute; left: 50%; transform: translateX(-50%); - top: 1.08rem; + top: 0.53333rem; } .recharge100 .bottom { @@ -412,7 +412,7 @@ body { position: absolute; left: 50%; transform: translateX(-50%); - top: 1.08rem; + top: 0.53333rem; } .recharge300 .bottom { @@ -591,7 +591,7 @@ body { position: absolute; left: 50%; transform: translateX(-50%); - top: 1.08rem; + top: 0.53333rem; } .recharge500 .bottom { @@ -770,7 +770,7 @@ body { position: absolute; left: 50%; transform: translateX(-50%); - top: 1.08rem; + top: 0.53333rem; } .recharge1000 .bottom { @@ -949,7 +949,7 @@ body { position: absolute; left: 50%; transform: translateX(-50%); - top: 1.08rem; + top: 0.53333rem; } .recharge3000 .bottom { @@ -1007,8 +1007,8 @@ body { width: 2.2rem; height: 2.2rem; position: absolute; - left: 1.6rem; - top: 11.1rem; + left: 5.76rem; + top: 0.4rem; } .recharge3000 .content .rewardImg .ts canvas { @@ -1021,8 +1021,8 @@ body { width: 0.69333rem; height: 0.69333rem; position: absolute; - top: 6.53333rem; - right: 2rem; + top: 8.1rem; + right: 5.7rem; z-index: 2; } @@ -1131,7 +1131,7 @@ body { position: absolute; left: 50%; transform: translateX(-50%); - top: 1.08rem; + top: 0.53333rem; } .recharge5000 .bottom { @@ -1313,7 +1313,7 @@ body { position: absolute; left: 50%; transform: translateX(-50%); - top: 1.08rem; + top: 0.53333rem; } .recharge8000 .bottom { @@ -1495,7 +1495,7 @@ body { position: absolute; left: 50%; transform: translateX(-50%); - top: 1.08rem; + top: 0.53333rem; } .recharge10000 .bottom { diff --git a/view/molistar/activity/rechargeNew/css/index.scss b/view/molistar/activity/rechargeNew/css/index.scss index 2ff12af3..01750054 100644 --- a/view/molistar/activity/rechargeNew/css/index.scss +++ b/view/molistar/activity/rechargeNew/css/index.scss @@ -200,7 +200,7 @@ body { position: absolute; left: 50%; transform: translateX(-50%); - top: px2rem(81); + top: px2rem(40); } } @@ -308,7 +308,7 @@ body { position: absolute; left: 50%; transform: translateX(-50%); - top: px2rem(81); + top: px2rem(40); } } @@ -416,7 +416,7 @@ body { position: absolute; left: 50%; transform: translateX(-50%); - top: px2rem(81); + top: px2rem(40); } } @@ -601,7 +601,7 @@ body { position: absolute; left: 50%; transform: translateX(-50%); - top: px2rem(81); + top: px2rem(40); } } @@ -786,7 +786,7 @@ body { position: absolute; left: 50%; transform: translateX(-50%); - top: px2rem(81); + top: px2rem(40); } } @@ -972,7 +972,7 @@ body { position: absolute; left: 50%; transform: translateX(-50%); - top: px2rem(81); + top: px2rem(40); } } @@ -1029,8 +1029,8 @@ body { width: 2.2rem; height: 2.2rem; position: absolute; - left: 1.6rem; - top: 11.1rem; + left: 5.76rem; + top: 0.4rem; canvas { position: absolute; @@ -1043,8 +1043,8 @@ body { width: px2rem(52); height: px2rem(52); position: absolute; - top: px2rem(490); - right: px2rem(150); + top: 8.1rem; + right: 5.7rem; z-index: 2; } @@ -1160,7 +1160,7 @@ body { position: absolute; left: 50%; transform: translateX(-50%); - top: px2rem(81); + top: px2rem(40); } } @@ -1348,7 +1348,7 @@ body { position: absolute; left: 50%; transform: translateX(-50%); - top: px2rem(81); + top: px2rem(40); } } @@ -1536,7 +1536,7 @@ body { position: absolute; left: 50%; transform: translateX(-50%); - top: px2rem(81); + top: px2rem(40); } } diff --git a/view/molistar/activity/rechargeNew/images/1000.png b/view/molistar/activity/rechargeNew/images/1000.png new file mode 100644 index 00000000..2280710e Binary files /dev/null and b/view/molistar/activity/rechargeNew/images/1000.png differ diff --git a/view/molistar/activity/rechargeNew/images/butAct.png b/view/molistar/activity/rechargeNew/images/butAct.png index 55b03c74..61b26abc 100644 Binary files a/view/molistar/activity/rechargeNew/images/butAct.png and b/view/molistar/activity/rechargeNew/images/butAct.png differ diff --git a/view/molistar/activity/rechargeNew/images/recharge10-ar.png b/view/molistar/activity/rechargeNew/images/recharge10-ar.png index e114280f..48ea2b23 100644 Binary files a/view/molistar/activity/rechargeNew/images/recharge10-ar.png and b/view/molistar/activity/rechargeNew/images/recharge10-ar.png differ diff --git a/view/molistar/activity/rechargeNew/images/recharge10.png b/view/molistar/activity/rechargeNew/images/recharge10.png index a4c70d25..64af1813 100644 Binary files a/view/molistar/activity/rechargeNew/images/recharge10.png and b/view/molistar/activity/rechargeNew/images/recharge10.png differ diff --git a/view/molistar/activity/rechargeNew/images/recharge100-ar.png b/view/molistar/activity/rechargeNew/images/recharge100-ar.png index 3fcd176c..a705f858 100644 Binary files a/view/molistar/activity/rechargeNew/images/recharge100-ar.png and b/view/molistar/activity/rechargeNew/images/recharge100-ar.png differ diff --git a/view/molistar/activity/rechargeNew/images/recharge100.png b/view/molistar/activity/rechargeNew/images/recharge100.png index 42fe0ff1..9ec58204 100644 Binary files a/view/molistar/activity/rechargeNew/images/recharge100.png and b/view/molistar/activity/rechargeNew/images/recharge100.png differ diff --git a/view/molistar/activity/rechargeNew/images/recharge1000-ar.png b/view/molistar/activity/rechargeNew/images/recharge1000-ar.png index 4f453c4b..36539611 100644 Binary files a/view/molistar/activity/rechargeNew/images/recharge1000-ar.png and b/view/molistar/activity/rechargeNew/images/recharge1000-ar.png differ diff --git a/view/molistar/activity/rechargeNew/images/recharge300-ar.png b/view/molistar/activity/rechargeNew/images/recharge300-ar.png index b3cb8ba9..99e4b460 100644 Binary files a/view/molistar/activity/rechargeNew/images/recharge300-ar.png and b/view/molistar/activity/rechargeNew/images/recharge300-ar.png differ diff --git a/view/molistar/activity/rechargeNew/images/recharge300.png b/view/molistar/activity/rechargeNew/images/recharge300.png index dccd06c1..972239fb 100644 Binary files a/view/molistar/activity/rechargeNew/images/recharge300.png and b/view/molistar/activity/rechargeNew/images/recharge300.png differ diff --git a/view/molistar/activity/rechargeNew/images/recharge3000-ar.png b/view/molistar/activity/rechargeNew/images/recharge3000-ar.png index 005a32f6..9d76e697 100644 Binary files a/view/molistar/activity/rechargeNew/images/recharge3000-ar.png and b/view/molistar/activity/rechargeNew/images/recharge3000-ar.png differ diff --git a/view/molistar/activity/rechargeNew/images/recharge3000.png b/view/molistar/activity/rechargeNew/images/recharge3000.png index dd18ca33..644b3d30 100644 Binary files a/view/molistar/activity/rechargeNew/images/recharge3000.png and b/view/molistar/activity/rechargeNew/images/recharge3000.png differ diff --git a/view/molistar/activity/rechargeNew/images/recharge500-ar.png b/view/molistar/activity/rechargeNew/images/recharge500-ar.png index de8b2c2a..b52679ea 100644 Binary files a/view/molistar/activity/rechargeNew/images/recharge500-ar.png and b/view/molistar/activity/rechargeNew/images/recharge500-ar.png differ diff --git a/view/molistar/activity/rechargeNew/images/recharge500.png b/view/molistar/activity/rechargeNew/images/recharge500.png index 0b4fcd96..3e377728 100644 Binary files a/view/molistar/activity/rechargeNew/images/recharge500.png and b/view/molistar/activity/rechargeNew/images/recharge500.png differ diff --git a/view/molistar/activity/rechargeNew/js/index.js b/view/molistar/activity/rechargeNew/js/index.js index d2e4a098..149bba69 100644 --- a/view/molistar/activity/rechargeNew/js/index.js +++ b/view/molistar/activity/rechargeNew/js/index.js @@ -182,7 +182,6 @@ $('.myRecharge .but').click(function () { if (channel == "google") { window.androidJsObj.openChargePage(6); } else { - window.androidJsObj.openChargePage(6); window.location.href = urlPrefix + '/molistar/modules/pay/index.html?channelType=4'; } } else if (browser.ios) { @@ -190,7 +189,6 @@ $('.myRecharge .but').click(function () { if (channel == "appstore") { window.webkit.messageHandlers.openChargePage.postMessage(null); } else { - window.webkit.messageHandlers.chargePayClickPage.postMessage(6); window.location.href = urlPrefix + '/molistar/modules/pay/index.html?channelType=4'; } } diff --git a/view/molistar/modules/dailyConsumption/local/ar.js b/view/molistar/modules/dailyConsumption/local/ar.js index d28d7095..53cb4f3a 100644 --- a/view/molistar/modules/dailyConsumption/local/ar.js +++ b/view/molistar/modules/dailyConsumption/local/ar.js @@ -12,13 +12,13 @@ langAr = { text5: `ثانية`, text6: `استهلاك العملات`, text7: `استهلاك 70K-700K`, - text8: `استهلاك 210K-7M`, + text8: `استهلاك 2.1M-7M`, text9: `استهلاك 700K`, text10: `استهلاك 350K`, text11: `استهلاك 70K`, text12: `استهلاك 7M`, - text13: `استهلاك 3500K`, - text14: `استهلاك 210K`, + text13: `استهلاك 3.5M`, + text14: `استهلاك 2.1M`, text15: `هذا الحدث لا علاقة له بـ Apple`, text16: `هذا الحدث لا علاقة له بـ Google`, priorityWinners: `الفائزون ذوو الأولوية`, diff --git a/view/molistar/modules/dailyConsumption/local/en.js b/view/molistar/modules/dailyConsumption/local/en.js index 39cbe960..ffe1bdea 100644 --- a/view/molistar/modules/dailyConsumption/local/en.js +++ b/view/molistar/modules/dailyConsumption/local/en.js @@ -10,13 +10,13 @@ langEn = { text5: `Sec`, text6: `Consume coins`, text7: `Consume 70K-700K`, - text8: `Consume 210K-7M`, + text8: `Consume 2.1M-7M`, text9: `Consume 700K`, text10: `Consume 350K`, text11: `Consume 70K`, text12: `Consume 7M`, - text13: `Consume 3500K`, - text14: `Consume 210K`, + text13: `Consume 3.5M`, + text14: `Consume 2.1M`, text15: `This event has nothing to do with Apple`, text16: `This event has nothing to do with Google`, priorityWinners: `Priority Winners`, diff --git a/view/molistar/modules/dailyConsumption/local/zh.js b/view/molistar/modules/dailyConsumption/local/zh.js index 7e7b811f..487a3094 100644 --- a/view/molistar/modules/dailyConsumption/local/zh.js +++ b/view/molistar/modules/dailyConsumption/local/zh.js @@ -12,13 +12,13 @@ langZh = { text5: `秒`, text6: `消耗金幣`, text7: `消耗 70K-700K`, - text8: `消耗 210K-700萬`, + text8: `消耗 2.1M-700萬`, text9: `消耗 700K`, text10: `消耗 350K`, text11: `消耗 70K`, text12: `消耗 700萬`, - text13: `消耗 3500K`, - text14: `消耗 210K`, + text13: `消耗 3.5M`, + text14: `消耗 2.1M`, text15: `此活動與 Apple 無關`, text16: `此活動與 Google 無關`, priorityWinners: `優先獲勝者`,