diff --git a/view/molistar/activity/ssGuild/css/index.css b/view/molistar/activity/ssGuild/css/index.css index ad5aac9..8358e7e 100644 --- a/view/molistar/activity/ssGuild/css/index.css +++ b/view/molistar/activity/ssGuild/css/index.css @@ -44,6 +44,23 @@ body::-webkit-scrollbar { padding-top: 8.46667rem; } +.header .actTime { + width: 7.06667rem; + height: 0.77333rem; + line-height: 0.77333rem; + text-align: center; + color: #FFEDC1; + font-size: 0.37333rem; + font-weight: 500; + background: linear-gradient(0deg, #152738, #0F5881); + border-radius: 0.77333rem; + border: 0.04rem solid #FFDFB2; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: 5.21333rem; +} + .header .time { width: 7.6rem; height: 1.89333rem; @@ -92,6 +109,8 @@ body::-webkit-scrollbar { font-size: 0.34667rem; font-weight: 400; line-height: 0.49rem; + position: relative; + z-index: 2; } .header .tab { @@ -558,3 +577,53 @@ body::-webkit-scrollbar { .bootomTextPage1 { margin-bottom: 2.8rem; } + +.english { + background: url(../images/header-en.png) no-repeat; + background-size: 100% 100%; +} + +.arabic { + background: url(../images/header-ar.png) no-repeat; + background-size: 100% 100%; +} + +.arabic .page1 .my .grade { + float: left; +} + +.arabic .page1 .my .num { + float: right; + margin-right: 0; + margin-left: 0.50667rem; +} + +.arabic .page1 .my .tx { + float: right; + margin-left: 0.42667rem; + margin-right: 0; +} + +.arabic .page1 .my .user { + float: right; +} + +.arabic .page1 ul li .grade { + float: left; +} + +.arabic .page1 ul li .num { + float: right; + margin-right: 0; + margin-left: 0.50667rem; +} + +.arabic .page1 ul li .tx { + float: right; + margin-left: 0.42667rem; + margin-right: 0; +} + +.arabic .page1 ul li .user { + float: right; +} diff --git a/view/molistar/activity/ssGuild/css/index.scss b/view/molistar/activity/ssGuild/css/index.scss index 81af666..ef4a739 100644 --- a/view/molistar/activity/ssGuild/css/index.scss +++ b/view/molistar/activity/ssGuild/css/index.scss @@ -46,6 +46,23 @@ body { box-sizing: border-box; padding-top: px2rem(635); + .actTime { + width: px2rem(530); + height: px2rem(58); + line-height: px2rem(58); + text-align: center; + color: #FFEDC1; + font-size: px2rem(28); + font-weight: 500; + background: linear-gradient(0deg, #152738, #0F5881); + border-radius: px2rem(58); + border: px2rem(3) solid #FFDFB2; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: px2rem(391); + } + .time { width: px2rem(570); height: px2rem(142); @@ -94,6 +111,8 @@ body { font-size: px2rem(26); font-weight: 400; line-height: 0.49rem; + position: relative; + z-index: 2; } .tab { @@ -565,4 +584,58 @@ body { .bootomTextPage1 { margin-bottom: px2rem(210); +} + +.english { + background: url(../images/header-en.png) no-repeat; + background-size: 100% 100%; +} + +.arabic { + background: url(../images/header-ar.png) no-repeat; + background-size: 100% 100%; + + .page1 .my { + .grade { + float: left; + } + + .num { + float: right; + margin-right: 0; + margin-left: 0.50667rem; + } + + .tx { + float: right; + margin-left: 0.42667rem; + margin-right: 0; + } + + .user { + float: right; + } + } + + .page1 ul li { + .grade { + float: left; + } + + .num { + float: right; + margin-right: 0; + margin-left: 0.50667rem; + } + + .tx { + float: right; + margin-left: 0.42667rem; + margin-right: 0; + } + + .user { + float: right; + } + } } \ No newline at end of file diff --git a/view/molistar/activity/ssGuild/images/A.png b/view/molistar/activity/ssGuild/images/A.png index 47f28f9..2ef06b0 100644 Binary files a/view/molistar/activity/ssGuild/images/A.png and b/view/molistar/activity/ssGuild/images/A.png differ diff --git a/view/molistar/activity/ssGuild/images/B.png b/view/molistar/activity/ssGuild/images/B.png index 8f1edc4..b21b162 100644 Binary files a/view/molistar/activity/ssGuild/images/B.png and b/view/molistar/activity/ssGuild/images/B.png differ diff --git a/view/molistar/activity/ssGuild/images/S.png b/view/molistar/activity/ssGuild/images/S.png index d0681e8..e2c3002 100644 Binary files a/view/molistar/activity/ssGuild/images/S.png and b/view/molistar/activity/ssGuild/images/S.png differ diff --git a/view/molistar/activity/ssGuild/images/SS.png b/view/molistar/activity/ssGuild/images/SS.png index ef2065f..3f5db61 100644 Binary files a/view/molistar/activity/ssGuild/images/SS.png and b/view/molistar/activity/ssGuild/images/SS.png differ diff --git a/view/molistar/activity/ssGuild/images/boxBg.png b/view/molistar/activity/ssGuild/images/boxBg.png index 09bc59c..938e634 100644 Binary files a/view/molistar/activity/ssGuild/images/boxBg.png and b/view/molistar/activity/ssGuild/images/boxBg.png differ diff --git a/view/molistar/activity/ssGuild/images/cloud.png b/view/molistar/activity/ssGuild/images/cloud.png index efdb813..3ce0256 100644 Binary files a/view/molistar/activity/ssGuild/images/cloud.png and b/view/molistar/activity/ssGuild/images/cloud.png differ diff --git a/view/molistar/activity/ssGuild/images/header-ar.png b/view/molistar/activity/ssGuild/images/header-ar.png new file mode 100644 index 0000000..4809083 Binary files /dev/null and b/view/molistar/activity/ssGuild/images/header-ar.png differ diff --git a/view/molistar/activity/ssGuild/images/header-en.png b/view/molistar/activity/ssGuild/images/header-en.png new file mode 100644 index 0000000..c10fbb4 Binary files /dev/null and b/view/molistar/activity/ssGuild/images/header-en.png differ diff --git a/view/molistar/activity/ssGuild/images/header.png b/view/molistar/activity/ssGuild/images/header.png index bdff00b..c10fbb4 100644 Binary files a/view/molistar/activity/ssGuild/images/header.png and b/view/molistar/activity/ssGuild/images/header.png differ diff --git a/view/molistar/activity/ssGuild/images/liBg.png b/view/molistar/activity/ssGuild/images/liBg.png index 30cb00f..dce1c4b 100644 Binary files a/view/molistar/activity/ssGuild/images/liBg.png and b/view/molistar/activity/ssGuild/images/liBg.png differ diff --git a/view/molistar/activity/ssGuild/images/myBg.png b/view/molistar/activity/ssGuild/images/myBg.png index 86b7ebd..8c4e2e1 100644 Binary files a/view/molistar/activity/ssGuild/images/myBg.png and b/view/molistar/activity/ssGuild/images/myBg.png differ diff --git a/view/molistar/activity/ssGuild/images/null.png b/view/molistar/activity/ssGuild/images/null.png index 7c2c4ae..ada4e31 100644 Binary files a/view/molistar/activity/ssGuild/images/null.png and b/view/molistar/activity/ssGuild/images/null.png differ diff --git a/view/molistar/activity/ssGuild/images/page1Rule-ar.png b/view/molistar/activity/ssGuild/images/page1Rule-ar.png new file mode 100644 index 0000000..d5b15ab Binary files /dev/null and b/view/molistar/activity/ssGuild/images/page1Rule-ar.png differ diff --git a/view/molistar/activity/ssGuild/images/page1Rule-en.png b/view/molistar/activity/ssGuild/images/page1Rule-en.png new file mode 100644 index 0000000..ac33d4a Binary files /dev/null and b/view/molistar/activity/ssGuild/images/page1Rule-en.png differ diff --git a/view/molistar/activity/ssGuild/images/page1Rule.png b/view/molistar/activity/ssGuild/images/page1Rule.png index d482886..ac33d4a 100644 Binary files a/view/molistar/activity/ssGuild/images/page1Rule.png and b/view/molistar/activity/ssGuild/images/page1Rule.png differ diff --git a/view/molistar/activity/ssGuild/images/page2Bg.png b/view/molistar/activity/ssGuild/images/page2Bg.png index b3b8854..a5b332d 100644 Binary files a/view/molistar/activity/ssGuild/images/page2Bg.png and b/view/molistar/activity/ssGuild/images/page2Bg.png differ diff --git a/view/molistar/activity/ssGuild/images/page2Rule-ar.png b/view/molistar/activity/ssGuild/images/page2Rule-ar.png new file mode 100644 index 0000000..e1888a6 Binary files /dev/null and b/view/molistar/activity/ssGuild/images/page2Rule-ar.png differ diff --git a/view/molistar/activity/ssGuild/images/page2Rule-en.png b/view/molistar/activity/ssGuild/images/page2Rule-en.png new file mode 100644 index 0000000..354190e Binary files /dev/null and b/view/molistar/activity/ssGuild/images/page2Rule-en.png differ diff --git a/view/molistar/activity/ssGuild/images/page2Rule.png b/view/molistar/activity/ssGuild/images/page2Rule.png index 68cc3c3..354190e 100644 Binary files a/view/molistar/activity/ssGuild/images/page2Rule.png and b/view/molistar/activity/ssGuild/images/page2Rule.png differ diff --git a/view/molistar/activity/ssGuild/images/page2Ts.png b/view/molistar/activity/ssGuild/images/page2Ts.png index 1dbca04..f5bf54a 100644 Binary files a/view/molistar/activity/ssGuild/images/page2Ts.png and b/view/molistar/activity/ssGuild/images/page2Ts.png differ diff --git a/view/molistar/activity/ssGuild/images/tab.png b/view/molistar/activity/ssGuild/images/tab.png index 9dfc76a..10d8a7c 100644 Binary files a/view/molistar/activity/ssGuild/images/tab.png and b/view/molistar/activity/ssGuild/images/tab.png differ diff --git a/view/molistar/activity/ssGuild/images/tabAct.png b/view/molistar/activity/ssGuild/images/tabAct.png index ce8de41..6f85e18 100644 Binary files a/view/molistar/activity/ssGuild/images/tabAct.png and b/view/molistar/activity/ssGuild/images/tabAct.png differ diff --git a/view/molistar/activity/ssGuild/images/timeBg.png b/view/molistar/activity/ssGuild/images/timeBg.png index d25813b..20e3c8b 100644 Binary files a/view/molistar/activity/ssGuild/images/timeBg.png and b/view/molistar/activity/ssGuild/images/timeBg.png differ diff --git a/view/molistar/activity/ssGuild/images/top1.png b/view/molistar/activity/ssGuild/images/top1.png index 179bfef..6adfde4 100644 Binary files a/view/molistar/activity/ssGuild/images/top1.png and b/view/molistar/activity/ssGuild/images/top1.png differ diff --git a/view/molistar/activity/ssGuild/images/top23.png b/view/molistar/activity/ssGuild/images/top23.png index b387850..81579ad 100644 Binary files a/view/molistar/activity/ssGuild/images/top23.png and b/view/molistar/activity/ssGuild/images/top23.png differ diff --git a/view/molistar/activity/ssGuild/images/ts.png b/view/molistar/activity/ssGuild/images/ts.png index bc02ef9..452d64a 100644 Binary files a/view/molistar/activity/ssGuild/images/ts.png and b/view/molistar/activity/ssGuild/images/ts.png differ diff --git a/view/molistar/activity/ssGuild/images/tsBig.png b/view/molistar/activity/ssGuild/images/tsBig.png index 6462cde..b864d4e 100644 Binary files a/view/molistar/activity/ssGuild/images/tsBig.png and b/view/molistar/activity/ssGuild/images/tsBig.png differ diff --git a/view/molistar/activity/ssGuild/index.html b/view/molistar/activity/ssGuild/index.html index d0ec1ca..0624e23 100644 --- a/view/molistar/activity/ssGuild/index.html +++ b/view/molistar/activity/ssGuild/index.html @@ -4,7 +4,7 @@ - SS Guild Conpetition + @@ -16,34 +16,34 @@
+ +
00 - Day +
00 - Hour +
00 - Min +
00 - Sec +
-
Each guild will compete for guild honors by completing specific tasks and challenges to - receive a specified ability value for hosting an event within 30 days to earn entries. These honors will be - displayed in the ranking list and on the anchor's homepage. +
-
Guild
-
Mine
+
+
@@ -53,28 +53,28 @@
-
虚位以待
-
ID:0
+
+
-
虚位以待
-
ID:0
+
+
-
虚位以待
-
ID:0
+
+
- +
04
-

虚位以待

- ID:0 +

+
@@ -103,17 +103,17 @@ -

Guild Nickname:名字

-

Guild ID:0

-

Anchor Nickname:名字

-

Anchor ID:0

-

My Diamond Flow:0

-

Available Reward Gold:0

+

名字

+

0

+

名字

+

0

+

0

+

0

- + -
This activity has nothing to do with apple
+
diff --git a/view/molistar/activity/ssGuild/js/index.js b/view/molistar/activity/ssGuild/js/index.js index 5b5aedd..18dc7a8 100644 --- a/view/molistar/activity/ssGuild/js/index.js +++ b/view/molistar/activity/ssGuild/js/index.js @@ -65,7 +65,24 @@ $(function () { function translateFun() { var langReplace = window.lang.replace; var localLang = window.lang; - // $('.text1').text(langReplace(localLang.demoModule.text1)); + $('.text1').text(langReplace(localLang.demoModule.text1)); + $('.text2').text(langReplace(localLang.demoModule.text2)); + $('.text3').text(langReplace(localLang.demoModule.text3)); + $('.text4').text(langReplace(localLang.demoModule.text4)); + $('.text5').text(langReplace(localLang.demoModule.text5)); + $('.text6').text(langReplace(localLang.demoModule.text6)); + $('.text7').text(langReplace(localLang.demoModule.text7)); + $('.text8').text(langReplace(localLang.demoModule.text8)); + $('.text9').text(langReplace(localLang.demoModule.text9)); + $('.text10').text(langReplace(localLang.demoModule.text10)); + $('.text11').text(langReplace(localLang.demoModule.text11)); + $('.text12').text(langReplace(localLang.demoModule.text12)); + $('.text13').text(langReplace(localLang.demoModule.text13)); + $('.text14').text(langReplace(localLang.demoModule.text14)); + $('.text15').text(langReplace(localLang.demoModule.text15)); + $('.text16').text(langReplace(localLang.demoModule.text16)); + $('.img1').attr('src', langReplace(localLang.demoModule.img1)); + $('.img2').attr('src', langReplace(localLang.demoModule.img2)); } // 配置接口 function getConfig() { @@ -76,6 +93,79 @@ function getConfig() { data: { uid: pubInfo.uid }, success(res) { if (res.code === 200) { + // 倒计时 + countup(res.data.monthEndTime - res.timestamp); + // 处理时间 + $('.header .actTime b').text(`${res.data.startDate}-${res.data.startDate}`); + // 渲染排名 + var listTo3 = res.data.rankList.slice(0, 3); + var notListTo3 = res.data.rankList.slice(3); + if (listTo3.length < 3) { + let arr = new Array(3 - listTo3.length).fill({ + avatar: './images/null.png', + guildName: '虚位以待', + ownerErbanNo: '0', + markScore: null + }) + listTo3.push(...arr) + } + // 前三 + listTo3.forEach((res, i) => { + $(`.page1 .cloud .no${i + 1} .tx`).attr('src', res.avatar); + if (res.markScore == null) { + $(`.page1 .cloud .no${i + 1} .grade`).hide(); + } else { + $(`.page1 .cloud .no${i + 1} .grade`).attr('src', `./images/${res.markScore}.png`); + } + $(`.page1 .cloud .no${i + 1} .name`).text(res.guildName); + $(`.page1 .cloud .no${i + 1} .id`).text(res.ownerErbanNo == 0 ? '' : 'ID:' + res.ownerErbanNo); + }) + // 非前三 + var str = ''; + notListTo3.forEach(res => { + str += ` +
  • +
    ${res.rank}
    + +
    +

    ${res.guildName}

    + ID:${res.ownerErbanNo} +
    + +
    • + ` + }) + $('.page1 ul').append(str); + // 处理自己 + var me = res.data.selfRank; + $('.page1 .my .num').text(me.rank == 0 ? '30+' : me.rank); + $('.page1 .my .tx').attr('src', me.avatar); + if (me.ssLevel == 0) { + $('.page1 .my .grade').hide(); + } else { + $('.page1 .my .grade').attr('src', `./images/${me.markScore}.png`); + } + $('.page1 .my .user p').text(me.guildName); + $('.page1 .my .user b').text(me.guildName.ownerErbanNo); + // 判断是否是主播 + if (res.data.selfRank) { + var memberVo = res.data.memberVo; + $('.page2 .my .tx').text('src', memberVo.avatar); + if (memberVo.ssLevel == 0) { + $('.page2 .my .live').hide(); + } else { + $('.page2 .my .live').text('src', `./images/${memberVo.avatar}.png`); + } + $('.page2 .my .p1 b').text(memberVo.guildName); + $('.page2 .my .p2 b').text(memberVo.ownerErbanNo); + $('.page2 .my .p3 b').text(memberVo.nick); + $('.page2 .my .p4 b').text(memberVo.erbanNo); + $('.page2 .my .p5 b').text(memberVo.diamondNum); + $('.page2 .my .p6 b').text(memberVo.goldNum); + } else { + $('.header .tab').hide(); + $('.page1 .cloud').css('margin', '-19.2rem auto -2.6rem'); + } } else { toastMsg(res.message) } @@ -87,3 +177,49 @@ function getConfig() { } }) } +// 切换tab +$('.header .tab div').click(function () { + var i = $(this).index() + 1; + $(this).addClass('act').siblings().removeClass('act') + $('.page1,.page2').hide(); + $(`.page${i}`).show(); +}) +// 倒計時 +function countup(leftTime) { + clearTimeout(countupTime) + //獲取當前時間 + // var now = nowTime; + var d = 0; + var h = 0; + var m = 0; + var s = 0; + //定義變數 d,h,m,s保存倒計時的時間 + var d, h, m, s; + //遞歸每秒調⽤countTime⽅法，顯⽰動態時間效果 + if (leftTime > 0) { + d = getzf(Math.floor(leftTime / 1000 / 60 / 60 / 24)); + h = getzf(Math.floor(leftTime / 1000 / 60 / 60 % 24)); + m = getzf(Math.floor(leftTime / 1000 / 60 % 60)); + s = getzf(Math.floor(leftTime / 1000 % 60)); + //將倒計時賦值到div中 + $('.time .day b').text(d); + $('.time .hour b').text(h); + $('.time .min b').text(m); + $('.time .sec b').text(s); + } else { + location.reload(); + } + if (leftTime > 0) { + leftTime = leftTime - 1000; + } + countupTime = setTimeout(function () { + countup(leftTime); + }, 1000); +} +//补0操作 +function getzf(num) { + if (parseInt(num) < 10) { + num = '0' + num; + } + return num; +} \ No newline at end of file diff --git a/view/molistar/activity/ssGuild/local/ar.js b/view/molistar/activity/ssGuild/local/ar.js index 0f81220..518b06a 100644 --- a/view/molistar/activity/ssGuild/local/ar.js +++ b/view/molistar/activity/ssGuild/local/ar.js @@ -5,6 +5,23 @@ langAr = { layerIndex1: `جار التحميل...`, layerIndex2: `نجاح`, layerIndex3: `خطأ في الشبكة`, - + text1: `مسابقة نقابة SS`, + text2: `وقت النشاط:`, + text3: `يوم`, + text4: `ساعة`, + text5: `دقيقة`, + text6: `ثانية`, + text7: `ستتنافس كل نقابة على شرف النقابة من خلال إتمام مهام وتحديات محددة للحصول على قيمة قدرة معينة لاستضافة حدث خلال 30 يومًا لكسب المشاركات. سيتم عرض هذه الأوسمة في قائمة الترتيب وعلى الصفحة الرئيسية للمضيف.`, + text8: `نقابة`, + text9: `خاصتي`, + text10: `لقب النقابة:`, + text11: `معرف النقابة:`, + text12: `لقب المضيف:`, + text13: `معرف المضيف:`, + text14: `تدفق الماس الخاص بي:`, + text15: `ذهب المكافآت المتاح:`, + text16: `هذا النشاط ليس له علاقة بالتفاح`, + img1: `./images/page1Rule-ar.png`, + img2: `./images/page2Rule-ar.png`, } -} \ No newline at end of file +} diff --git a/view/molistar/activity/ssGuild/local/en.js b/view/molistar/activity/ssGuild/local/en.js index 69b40d8..58b7af3 100644 --- a/view/molistar/activity/ssGuild/local/en.js +++ b/view/molistar/activity/ssGuild/local/en.js @@ -3,6 +3,24 @@ langEn = { layerIndex1: `Loading...`, layerIndex2: `Success`, layerIndex3: `Network error`, - + text1: `SS Guild Conpetition`, + text2: `Activity Time:`, + text3: `Day`, + text4: `Hour`, + text5: `Min`, + text6: `Sec`, + text7: `Each guild will compete for guild honors by completing specific tasks and challenges to receive a specified ability value for hosting an event within 30 days to earn entries. These honors will be + displayed in the ranking list and on the anchor's homepage.`, + text8: `Guild`, + text9: `Mine`, + text10: `Guild Nick:`, + text11: `Guild ID:`, + text12: `Anchor Nick:`, + text13: `Anchor ID:`, + text14: `My Diamond Flow:`, + text15: `Available Reward Gold:`, + text16: `This activity has nothing to do with apple`, + img1: `./images/page1Rule-en.png`, + img2: `./images/page2Rule-en.png`, } } diff --git a/view/molistar/activity/ssGuild/local/zh.js b/view/molistar/activity/ssGuild/local/zh.js index f2c2a5a..fa6e5f3 100644 --- a/view/molistar/activity/ssGuild/local/zh.js +++ b/view/molistar/activity/ssGuild/local/zh.js @@ -5,6 +5,23 @@ langZh = { layerIndex1: `加載中...`, layerIndex2: `成功`, layerIndex3: `網絡錯誤`, - + text1: `SS公会比赛`, + text2: `活动时间：`, + text3: `天`, + text4: `小时`, + text5: `分钟`, + text6: `秒`, + text7: `每个公会将通过完成特定任务和挑战来争夺公会荣誉，以获得在30天内举办活动的指定能力值，从而获得参赛资格。这些荣誉将显示在排名列表和主播的主页上。`, + text8: `公会`, + text9: `我的`, + text10: `公会昵称：`, + text11: `公会ID：`, + text12: `主播昵称：`, + text13: `主播ID：`, + text14: `我的钻石流量：`, + text15: `可用奖励金币：`, + text16: `此活动与苹果无关`, + img1: `./images/page1Rule.png`, + img2: `./images/page2Rule.png`, } } \ No newline at end of file