diff --git a/view/moliparty/modules/dailyConsumption/css/index.css b/view/moliparty/modules/dailyConsumption/css/index.css index 8be4fc9..a7ce37e 100644 --- a/view/moliparty/modules/dailyConsumption/css/index.css +++ b/view/moliparty/modules/dailyConsumption/css/index.css @@ -51,7 +51,7 @@ body { .header .rule_icon { width: 1.8666666667rem; height: 0.6666666667rem; - line-height: 0.6rem; + line-height: 0.6666666667rem; background: url(../images/rule_cion.png) no-repeat; background-size: 100% 100%; color: #FFED70; @@ -247,7 +247,7 @@ body { width: 8rem; height: 0.2133333333rem; border-radius: 0.2133333333rem; - background: #824115; + background: #000000; position: absolute; position: absolute; left: 50%; @@ -689,6 +689,7 @@ body { font-weight: 400; opacity: 0.6; margin-bottom: 0.5333333333rem; + margin-top: 0.2666666667rem; } .video, diff --git a/view/moliparty/modules/dailyConsumption/css/index.scss b/view/moliparty/modules/dailyConsumption/css/index.scss index 4ad770b..d2a8700 100644 --- a/view/moliparty/modules/dailyConsumption/css/index.scss +++ b/view/moliparty/modules/dailyConsumption/css/index.scss @@ -57,7 +57,7 @@ body { .rule_icon { width: px2rem(140); height: px2rem(50); - line-height: px2rem(45); + line-height: px2rem(50); background: url(../images/rule_cion.png) no-repeat; background-size: 100% 100%; color: #FFED70; @@ -282,7 +282,7 @@ body { // width: px2rem(750); height: px2rem(16); border-radius: px2rem(16); - background: #824115; + background: #000000; position: absolute; position: absolute; left: 50%; @@ -739,6 +739,7 @@ body { font-weight: 400; opacity: 0.6; margin-bottom: px2rem(40); + margin-top: px2rem(20); } .video, diff --git a/view/moliparty/modules/dailyConsumption/images/rule_cion.png b/view/moliparty/modules/dailyConsumption/images/rule_cion.png index 3686908..3d0235a 100644 Binary files a/view/moliparty/modules/dailyConsumption/images/rule_cion.png and b/view/moliparty/modules/dailyConsumption/images/rule_cion.png differ diff --git a/view/moliparty/modules/dailyConsumption/index.html b/view/moliparty/modules/dailyConsumption/index.html index 9781598..2cfa8d2 100644 --- a/view/moliparty/modules/dailyConsumption/index.html +++ b/view/moliparty/modules/dailyConsumption/index.html @@ -33,9 +33,9 @@
-
Daily Support
-
Weekly Support
-
Monthly Support
+
+
+
@@ -72,7 +72,10 @@
-
+
+ + +
diff --git a/view/moliparty/modules/dailyConsumption/js/index.js b/view/moliparty/modules/dailyConsumption/js/index.js index 8106695..59161ce 100644 --- a/view/moliparty/modules/dailyConsumption/js/index.js +++ b/view/moliparty/modules/dailyConsumption/js/index.js @@ -121,7 +121,7 @@ function translateFun() { $('.Monthly_Support').html(langReplace(localLang.demoModule.Monthly_Support)); $('.Days').html(langReplace(localLang.demoModule.Days)); $('.header .lastTopUserVos .title').text(langReplace(localLang.demoModule.Yesterday_Champion)) - + $('.myBox .Today_Support .title').text(langReplace(localLang.demoModule.Today_Support)); } console.log(unitProcessingAr(7000000, 1)); var activityType = 'DAY_CONSUME'; @@ -180,7 +180,7 @@ function getConfig() { // 处理顶部进度以及个人信息 $('.myBox .tx').attr('src', res.data.avatar); $('.myBox .name').text(res.data.nick); - $('.myBox .Today_Support').text(langReplace(localLang.demoModule.Today_Support) + res.data.goldNum); + $('.myBox .Today_Support .goldNum').text( res.data.goldNum); $('.myBox .Upgrade_Requires').text(langReplace(localLang.demoModule.Upgrade_Requires) + getNextLevelDifference(res.data.goldNum, gearPosition)); // 轮播图清空 $('.reward_list .swiper-wrapper .swiper-slide').remove(); @@ -422,6 +422,7 @@ $('.tab_list .tab_box').click(function () { 'background': 'url(./images/day_box.png) no-repeat', 'background-size': '100% 100%' }); + $('.myBox .Today_Support .title').text(langReplace(localLang.demoModule.Today_Support)); } else if (activityType == 'WEEK_CONSUME') { // 周消费 $('.header .lastTopUserVos .title').text(langReplace(localLang.demoModule.Last_Elite)) @@ -430,7 +431,7 @@ $('.tab_list .tab_box').click(function () { 'background': 'url(./images/week_box.png) no-repeat', 'background-size': '100% 100%' }); - + $('.myBox .Today_Support .title').text(langReplace(localLang.demoModule.Weekly_SupportTwo)); } else if (activityType == 'MONTH_CONSUME') { // 月消费 $('.header .lastTopUserVos .title').text(langReplace(localLang.demoModule.Last_Legend)) @@ -439,7 +440,7 @@ $('.tab_list .tab_box').click(function () { 'background': 'url(./images/month_box.png) no-repeat', 'background-size': '100% 100%' }); - + $('.myBox .Today_Support .title').text(langReplace(localLang.demoModule.Monthly_SupportTwo)); } getConfig(); }) diff --git a/view/moliparty/modules/dailyConsumption/local/ar.js b/view/moliparty/modules/dailyConsumption/local/ar.js index 461da52..62e3e89 100644 --- a/view/moliparty/modules/dailyConsumption/local/ar.js +++ b/view/moliparty/modules/dailyConsumption/local/ar.js @@ -81,6 +81,7 @@ langAr = { Today_Support: 'دعم اليوم:', Upgrade_Requires: 'متطلبات الترقية:', Consume:'استهلاك ', - + Weekly_SupportTwo:'الدعم الأسبوعي', + Monthly_SupportTwo:'الدعم الشهري', } } \ No newline at end of file diff --git a/view/moliparty/modules/dailyConsumption/local/en.js b/view/moliparty/modules/dailyConsumption/local/en.js index 66a80f4..6efe7ce 100644 --- a/view/moliparty/modules/dailyConsumption/local/en.js +++ b/view/moliparty/modules/dailyConsumption/local/en.js @@ -79,6 +79,7 @@ langEn = { Today_Support: `Today's Support:`, Upgrade_Requires: 'Upgrade Requires:', Consume:'Consume', - + Weekly_SupportTwo:'Weekly Support', + Monthly_SupportTwo:'Monthly Support', } } \ No newline at end of file diff --git a/view/moliparty/modules/dailyConsumption/local/tr.js b/view/moliparty/modules/dailyConsumption/local/tr.js index eba5914..840a34b 100644 --- a/view/moliparty/modules/dailyConsumption/local/tr.js +++ b/view/moliparty/modules/dailyConsumption/local/tr.js @@ -79,7 +79,8 @@ langTr = { Today_Support: 'Bugünün Desteği:', Upgrade_Requires: 'Yükseltme Gereksinimleri:', Consume:'tüket', - + Weekly_SupportTwo:'Haftalık Destek', + Monthly_SupportTwo:'Aylık Destek', } } \ No newline at end of file diff --git a/view/moliparty/modules/dailyConsumption/local/zh.js b/view/moliparty/modules/dailyConsumption/local/zh.js index 1e42ee9..d5f1356 100644 --- a/view/moliparty/modules/dailyConsumption/local/zh.js +++ b/view/moliparty/modules/dailyConsumption/local/zh.js @@ -81,5 +81,7 @@ langZh = { Today_Support: '今日支持:', Upgrade_Requires: '升級至下一等級所需:', Consume:'消耗', + Weekly_SupportTwo:'每週支持', + Monthly_SupportTwo:'每月支持', } } \ No newline at end of file