diff --git a/view/molistar/modules/dailyConsumption/css/index.css b/view/molistar/modules/dailyConsumption/css/index.css
index 7baf9f7..1d92287 100644
--- a/view/molistar/modules/dailyConsumption/css/index.css
+++ b/view/molistar/modules/dailyConsumption/css/index.css
@@ -266,12 +266,23 @@ body {
background-size: 100% 100%;
}
+.tab .tabbox {
+ background: url(../images/tab2.png) no-repeat;
+ background-size: 100% 100%;
+}
+
.tab .act {
color: #290C05;
background: url(../images/act.png) no-repeat;
background-size: 100% 100%;
}
+.tab .act2 {
+ color: #290C05;
+ background: url(../images/tabact2.png) no-repeat;
+ background-size: 100% 100%;
+}
+
.content1 {
width: 10rem;
height: auto;
@@ -403,6 +414,7 @@ body {
border-radius: 50%;
left: 0;
top: 0;
+ border: 0.04rem #FFED70 solid;
}
.content1 .contentBox1 .priorityWinnersBox div span,
@@ -420,6 +432,7 @@ body {
position: absolute;
left: 0;
bottom: -0.6rem;
+ height: 0.4rem;
}
.content1 .contentBox2 .box {
@@ -731,6 +744,11 @@ body {
margin-bottom: 0.45333rem;
}
+.arabic .header {
+ background: url(../images/header-ar.png) no-repeat;
+ background-size: 100% 100%;
+}
+
.arabic .myBox .tetxBox {
direction: ltr;
}
diff --git a/view/molistar/modules/dailyConsumption/css/index.scss b/view/molistar/modules/dailyConsumption/css/index.scss
index b9a0c5e..5d5beae 100644
--- a/view/molistar/modules/dailyConsumption/css/index.scss
+++ b/view/molistar/modules/dailyConsumption/css/index.scss
@@ -269,11 +269,22 @@ body {
background-size: 100% 100%;
}
+ .tabbox {
+ background: url(../images/tab2.png) no-repeat;
+ background-size: 100% 100%;
+ }
+
.act {
color: #290C05;
background: url(../images/act.png) no-repeat;
background-size: 100% 100%;
}
+
+ .act2 {
+ color: #290C05;
+ background: url(../images/tabact2.png) no-repeat;
+ background-size: 100% 100%;
+ }
}
.content1 {
@@ -382,6 +393,7 @@ body {
border-radius: 50%;
left: 0;
top: 0;
+ border: px2rem(3) #FFED70 solid;
}
span {
@@ -397,6 +409,7 @@ body {
position: absolute;
left: 0;
bottom: -0.6rem;
+ height: 0.4rem;
}
}
}
@@ -689,6 +702,11 @@ body {
}
.arabic {
+ .header {
+ background: url(../images/header-ar.png) no-repeat;
+ background-size: 100% 100%;
+ }
+
.myBox .tetxBox {
direction: ltr;
}
diff --git a/view/molistar/modules/dailyConsumption/images/header-ar.png b/view/molistar/modules/dailyConsumption/images/header-ar.png
new file mode 100644
index 0000000..0370f61
Binary files /dev/null and b/view/molistar/modules/dailyConsumption/images/header-ar.png differ
diff --git a/view/molistar/modules/dailyConsumption/images/null.png b/view/molistar/modules/dailyConsumption/images/null.png
new file mode 100644
index 0000000..71d79c2
Binary files /dev/null and b/view/molistar/modules/dailyConsumption/images/null.png differ
diff --git a/view/molistar/modules/dailyConsumption/images/tab2.png b/view/molistar/modules/dailyConsumption/images/tab2.png
new file mode 100644
index 0000000..85813d5
Binary files /dev/null and b/view/molistar/modules/dailyConsumption/images/tab2.png differ
diff --git a/view/molistar/modules/dailyConsumption/images/tabact2.png b/view/molistar/modules/dailyConsumption/images/tabact2.png
new file mode 100644
index 0000000..55e7ac7
Binary files /dev/null and b/view/molistar/modules/dailyConsumption/images/tabact2.png differ
diff --git a/view/molistar/modules/dailyConsumption/index.html b/view/molistar/modules/dailyConsumption/index.html
index d3716fc..f9ec803 100644
--- a/view/molistar/modules/dailyConsumption/index.html
+++ b/view/molistar/modules/dailyConsumption/index.html
@@ -57,12 +57,12 @@
-
+

@@ -77,7 +77,7 @@
-
+

@@ -100,7 +100,7 @@
-->
-
+

@@ -118,7 +118,7 @@
-
+

@@ -135,7 +135,7 @@
-
+

@@ -160,7 +160,7 @@
-->
-
+

@@ -178,19 +178,19 @@
-
-
+
-
+
diff --git a/view/molistar/modules/dailyConsumption/js/index.js b/view/molistar/modules/dailyConsumption/js/index.js
index 12ac244..e2a42eb 100644
--- a/view/molistar/modules/dailyConsumption/js/index.js
+++ b/view/molistar/modules/dailyConsumption/js/index.js
@@ -116,7 +116,7 @@ function translateFun() {
$('.null').text(langReplace(localLang.demoModule.text16));
}
}
-console.log(unitProcessingAr(210000, 1));
+console.log(unitProcessingAr(7000000, 1));
// 配置接口
function getConfig() {
showLoading()
@@ -136,6 +136,7 @@ function getConfig() {
$('.myBox .tx').attr('src', res.data.avatar);
$('.myBox .name').text(res.data.nick);
$('.myBox .tetxBox .r b').text(res.data.goldNum);
+ console.log(res.data.goldNum < 700000);
if (res.data.goldNum < 700000) {
$('.myBox .tetxBox .r strong').text(700000);
$('.myBox .lineBox .box1 span b').text('70K');
@@ -144,39 +145,48 @@ function getConfig() {
$('.myBox .lineBox .box2').css('left', `${(350000 / 700000) * 100}%`);
$('.myBox .lineBox .box3 span b').text('700K');
$('.myBox .lineBox .box3').css('right', `0%`);
- $('.myBox .lineBox .line').css('width', `${(res.data.goldNum / 700000) * 100}%`);
+ $('.myBox .lineBox .line').css('width', `${((res.data.goldNum / 700000) * 100) > 100 ? 100 : (res.data.goldNum / 700000) * 100}%`);
res.data.goldNum >= 70000 ? $('.myBox .lineBox .box1').addClass('act') : res.data.goldNum >= 350000 ? $('.myBox .lineBox .box2').addClass('act') : res.data.goldNum >= 700000 ? $('.myBox .lineBox .box3').addClass('act') : ''
} else {
$('.myBox .tetxBox .r strong').text(7000000);
- $('.myBox .lineBox .box1 span b').text('70K');
+ $('.myBox .lineBox .box1 span b').text('210K');
$('.myBox .lineBox .box1').css('left', `${(70000 / 7000000) * 100}%`);
- $('.myBox .lineBox .box2 span b').text('350K');
+ $('.myBox .lineBox .box2 span b').text('3500K');
$('.myBox .lineBox .box2').css('left', `${(3500000 / 7000000) * 100}%`);
- $('.myBox .lineBox .box3 span b').text('700K');
+ $('.myBox .lineBox .box3 span b').text('7M');
$('.myBox .lineBox .box3').css('right', `0`);
- $('.myBox .lineBox .line').css('width', `${(res.data.goldNum / 7000000) * 100}%`);
+ $('.myBox .lineBox .line').css('width', `${((res.data.goldNum / 7000000) * 100) > 100 ? 100 : (res.data.goldNum / 7000000) * 100}%`);
res.data.goldNum >= 210000 ? $('.myBox .lineBox .box1').addClass('act') : res.data.goldNum >= 3500000 ? $('.myBox .lineBox .box2').addClass('act') : res.data.goldNum >= 7000000 ? $('.myBox .lineBox .box3').addClass('act') : ''
}
// 处理每个档位的用户前四名
res.data.activityLevelUserVo.forEach((res, i) => {
var str = '';
- if ((i + 1) <= 3) {
- $(`.content1 .contentBox${i + 1} .priorityWinnersBox div`).remove();
+ if ((res.level) <= 3) {
+ $(`.content1 .level${res.level} .priorityWinnersBox div`).remove();
} else {
- $(`.content2 .contentBox${i + 1} .priorityWinnersBox div`).remove();
+ $(`.content2 .level${res.level} .priorityWinnersBox div`).remove();
}
- res.userVos.forEach(val => {
- str += `
+ if (res.userVos.length > 0) {
+ res.userVos.forEach(val => {
+ str += `
${val.name}
`
- })
- if ((i + 1) <= 3) {
- $(`.content1 .contentBox${i + 1} .priorityWinnersBox`).append(str);
+ })
} else {
- $(`.content2 .contentBox${i + 1} .priorityWinnersBox`).append(str);
+ str += `
+
+

+
${localLang.demoModule.waiting}
+
+ `
+ }
+ if ((res.level) <= 3) {
+ $(`.content1 .level${res.level} .priorityWinnersBox`).append(str);
+ } else {
+ $(`.content2 .level${res.level} .priorityWinnersBox`).append(str);
}
})
} else {
@@ -233,7 +243,7 @@ $('.tab div').click(function () {
var i = $(this).index() + 1;
$('.content1,.content2').hide();
$(`.content${i}`).show();
- $(this).addClass('act').siblings().removeClass('act')
+ $(this).addClass(`${i == 2 ? 'act2' : 'act'}`).siblings().removeClass('act').removeClass('act2')
})
// 打开mp4弹窗
$('.content2 .contentBox1 .box .zjIcon').click(function () {
diff --git a/view/molistar/modules/dailyConsumption/local/ar.js b/view/molistar/modules/dailyConsumption/local/ar.js
index 6a157b0..d28d709 100644
--- a/view/molistar/modules/dailyConsumption/local/ar.js
+++ b/view/molistar/modules/dailyConsumption/local/ar.js
@@ -53,6 +53,7 @@ langAr = {
ملاحظة:
1. هذا النشاط ليس له علاقة بـ Google و Apple.
- `
+ `,
+ waiting: `ي انتظار`,
}
}
\ No newline at end of file
diff --git a/view/molistar/modules/dailyConsumption/local/en.js b/view/molistar/modules/dailyConsumption/local/en.js
index 105cc89..39cbe96 100644
--- a/view/molistar/modules/dailyConsumption/local/en.js
+++ b/view/molistar/modules/dailyConsumption/local/en.js
@@ -52,6 +52,7 @@ langEn = {
Attention:
1. This activity has nothing to do with Google and Apple.
- `
+ `,
+ waiting: `Waiting`,
}
}
\ No newline at end of file
diff --git a/view/molistar/modules/dailyConsumption/local/zh.js b/view/molistar/modules/dailyConsumption/local/zh.js
index 3da74ff..7e7b811 100644
--- a/view/molistar/modules/dailyConsumption/local/zh.js
+++ b/view/molistar/modules/dailyConsumption/local/zh.js
@@ -53,6 +53,7 @@ langZh = {
注意:
1. 此活動與 Google 和 Apple 無關。
- `
+ `,
+ waiting: `等待中`,
}
}
\ No newline at end of file