修复bug

2025-02-25 13:35:21 +08:00
parent 1f88c080d0
commit 0ecd77a415
4 changed files with 54 additions and 14 deletions
--- a/view/molistar/activity/ramadan/css/index.css
+++ b/view/molistar/activity/ramadan/css/index.css
@@ -70,12 +70,17 @@ body {
  margin: 0.13333rem auto 0;
  position: relative;
  box-sizing: border-box;
+  direction: ltr;
 }

 .header .danmu #my_container {
  width: 100%;
  height: 100%;
  box-sizing: border-box;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
 }

 .header .danmu #my_container .my_container_in {
@@ -1698,7 +1703,6 @@ body {
  margin: -0.4rem auto 0.57333rem;
  display: flex;
  justify-content: space-between;
-  display: none;
 }

 .page2 .list .c .page3_in1 .timeOutBox div {
@@ -1758,6 +1762,7 @@ body {
  background-size: 100% 100%;
  margin: 0 auto 0.41333rem;
  position: relative;
+  display: none;
 }

 .page2 .list .c .page3_in1 .yesterdayCoinsPool .title {
@@ -2140,11 +2145,14 @@ body {

 .page2 .list .c .page3_in1 ul li .score {
  float: right;
+  max-width: 1.6rem;
  height: 1.6rem;
-  line-height: 1.6rem;
+  line-height: 0.46667rem;
+  text-align: right;
  color: #FFED26;
  font-size: 0.37333rem;
  font-weight: 400;
+  margin-top: 0.26667rem;
 }

 .page2 .list .c .page3_in1 ul li .score img {
@@ -2229,10 +2237,12 @@ body {
 .page2 .my .score {
  float: right;
  height: 1.73333rem;
-  line-height: 1.73333rem;
+  line-height: 0.46667rem;
+  text-align: right;
  color: #FFED26;
  font-size: 0.37333rem;
  font-weight: 400;
+  margin-top: 0.33333rem;
 }

 .page2 .my .score img {
@@ -2345,6 +2355,10 @@ body {
  float: left;
 }

+.arabic .page1 .c .page1_2 .calendar .calendar_in {
+  justify-content: flex-end;
+}
+
 .Turkiye .header {
  background: url(../images/header-tr.png) no-repeat;
  background-size: 100% 100%;
--- a/view/molistar/activity/ramadan/css/index.scss
+++ b/view/molistar/activity/ramadan/css/index.scss
@@ -73,12 +73,17 @@ body {
        margin: px2rem(10) auto 0;
        position: relative;
        box-sizing: border-box;
+        direction: ltr;
        // background: pink;

        #my_container {
            width: 100%;
            height: 100%;
            box-sizing: border-box;
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            transform: translate(-50%,-50%);

            .my_container_in {
                max-width: 7.3rem;
@@ -1730,7 +1735,7 @@ body {
                    margin: px2rem(-30) auto px2rem(43);
                    display: flex;
                    justify-content: space-between;
-                    display: none;
+                    // display: none;

                    div {
                        width: px2rem(90);
@@ -1790,6 +1795,7 @@ body {
                    background-size: 100% 100%;
                    margin: 0 auto px2rem(31);
                    position: relative;
+                    display: none;

                    .title {
                        width: px2rem(400);
@@ -2170,11 +2176,14 @@ body {

                        .score {
                            float: right;
+                            max-width: 1.6rem;
                            height: px2rem(120);
-                            line-height: px2rem(120);
+                            line-height: px2rem(35);
+                            text-align: right;
                            color: #FFED26;
                            font-size: px2rem(28);
                            font-weight: 400;
+                            margin-top: px2rem(20);

                            img {
                                display: inline-block;
@@ -2264,10 +2273,12 @@ body {
        .score {
            float: right;
            height: px2rem(130);
-            line-height: px2rem(130);
+            line-height: px2rem(35);
+            text-align: right;
            color: #FFED26;
            font-size: px2rem(28);
            font-weight: 400;
+            margin-top: px2rem(25);

            img {
                display: inline-block;
@@ -2391,6 +2402,9 @@ body {
            float: left;
        }
    }
+    .page1 .c .page1_2 .calendar .calendar_in{
+        justify-content: flex-end;
+    }
 }

 .Turkiye {
--- a/view/molistar/activity/ramadan/index.html
+++ b/view/molistar/activity/ramadan/index.html
@@ -20,7 +20,7 @@
        <div class="time text2"></div>

        <!-- 弹幕 -->
-        <div class="danmu">
+        <div class="danmu" >
            <div id="my_container">
                <!-- <div class="my_container_in">
                    <img src="./images/logo.png" alt="" class="tx">
@@ -377,8 +377,8 @@
            <div class="c">
                <div class="page3_in1">
                    <div class="page3TabBox">
-                        <div type="1" class="act text22"></div>
-                        <div type="0" class="text23"></div>
+                        <div type="1" class=" text22"></div>
+                        <div type="0" class="act text23"></div>
                        <div type="2" class="text24"></div>
                    </div>
                    <div class="timeOutBox">
--- a/view/molistar/activity/ramadan/js/index.js
+++ b/view/molistar/activity/ramadan/js/index.js
@@ -64,6 +64,7 @@ const setDanmuData = () => {
 const renderDM = (item) => {
    danmaku.resize();
    danmaku.emit({
+        mode: window.lang.code == 'ar' ? 'ltr' : 'rtl',
        render: function () {
            var $div = document.createElement('div');
            $div.innerHTML = `
@@ -80,7 +81,7 @@ var maxPage = 0;
 var arr = [];
 var lists = [];
 var list = [];
-var listType = 1;
+var listType = 0;
 // 初始化函數
 $(function () {
    getInfoFromClient();
@@ -520,7 +521,9 @@ function ramadanRank() {
                $('.page2 .todayCoinsPool .num b').text(res.data.poolGoldNum);
                var val = res.data.activityH5RankVo
                if (listType == 1) {
-                    $('.page2 .list .c .page3_in1 .yesterdayCoinsPool .num b').text(unitProcessingAr(val.totalGoldNum, 2));
+                    console.log(val);
+
+                    $('.page2 .list .c .page3_in1 .yesterdayCoinsPool .num b').text(unitProcessingAr(val.poolGoldNum, 2));
                } else {
                    var endtime = new Date(res.data.activityH5RankVo.endTimeStr.replace(/\-/g, '/')).getTime();
                    countup(endtime - res.timestamp);
@@ -535,7 +538,7 @@ function ramadanRank() {
                        erbanNo: "",
                        diffExp: '',
                        userLevelVo: {
-                            experUrl: ''
+                            experUrl: null
                        }
                    })
                    listTo3.push(...arr)
@@ -546,6 +549,15 @@ function ramadanRank() {
                    $(`.page2 .list .c .page3_in1 .no${i + 1} .name `).html(`<b>${res.name.length > 4 ? res.name.slice(0, 4) + '...' : res.name}</b> <img src="${res.userLevelVo.experUrl}" alt="">`);
                    $(`.page2 .list .c .page3_in1 .no${i + 1} .id`).text("ID: " + res.erbanNo);
                    $(`.page2 .list .c .page3_in1 .no${i + 1} .score b`).text(unitProcessingAr(res.diffExp, 1));
+                    if (res.userLevelVo.experUrl == null) {
+                        $(`.page2 .list .c .page3_in1 .no23 .no${i + 1} .name img`).hide()
+                        $(`.page2 .list .c .page3_in1 .no23 .no${i + 1} .score`).hide()
+                        $(`.page2 .list .c .page3_in1 .no23 .no${i + 1} .id`).hide()
+                    } else {
+                        $(`.page2 .list .c .page3_in1 .no23 .no${i + 1} .name img`).show()
+                        $(`.page2 .list .c .page3_in1 .no23 .no${i + 1} .score`).show()
+                        $(`.page2 .list .c .page3_in1 .no23 .no${i + 1} .id`).show()
+                    }
                })
                // 处理非前三
                var str = '';
@@ -563,7 +575,7 @@ function ramadanRank() {
                                <span>ID: ${res.erbanNo}</span>
                            </div>
                            <div class="score">
-                                <span class="text30">${langReplace(localLang.demoModule.text30)}${unitProcessingAr(res.diffExp, 1)}</span>
+                                <span class="text30">${langReplace(localLang.demoModule.text30)}<br/>${unitProcessingAr(res.diffExp, 1)}</span>
                            </div>
                        </li>
                    `;
@@ -580,7 +592,7 @@ function ramadanRank() {
                $('.page2 .my .num').text(my.rank == 0 ? langReplace(localLang.demoModule.text69) : my.rank);
                $('.page2 .my .tx').attr('src', my.avatar);
                $('.page2 .my .user').html(`<p><b>${my.name.length > 6 ? my.name.slice(0, 4) + '...' : my.name}</b> <img src="${my.userLevelVo.experUrl}" alt=""><span>ID:${my.erbanNo}</span></p>`);
-                $('.page2 .my .score').html(`<span class="text30">${langReplace(localLang.demoModule.text30)}</span>${unitProcessingAr(my.diffExp, 1)}`)
+                $('.page2 .my .score').html(`<span class="text30">${langReplace(localLang.demoModule.text30)}</span><br/>${unitProcessingAr(my.diffExp, 1)}`)
            } else {
                toastMsg(res.message)
            }