修复ui和bug

view/molistar/modules/guildAr/css/adminSet.css

@@ -116,12 +116,13 @@ ul li .user p {
   font-weight: bold;
   display: inline-block;
   margin-right: 0.10667rem;
-  margin-top: 0.74667rem;
   margin-bottom: 0.16rem;
   width: 2.7rem;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
+  box-sizing: border-box;
+  padding-top: 0.66667rem;
 }
 
 ul li .user b {

view/molistar/modules/guildAr/css/adminSet.scss

@@ -117,12 +117,13 @@ ul {
                 font-weight: bold;
                 display: inline-block;
                 margin-right: px2rem(8);
-                margin-top: px2rem(56);
                 margin-bottom: px2rem(12);
                 width: 2.7rem;
                 overflow: hidden;
                 white-space: nowrap;
                 text-overflow: ellipsis;
+                box-sizing: border-box;
+                padding-top: px2rem(50);
             }
 
             b {

view/molistar/modules/guildAr/css/adminSet2.css

@@ -95,12 +95,13 @@ ul li .user p {
   font-weight: bold;
   display: inline-block;
   margin-right: 0.10667rem;
-  margin-top: 0.74667rem;
   margin-bottom: 0.16rem;
   width: 2.7rem;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
+  box-sizing: border-box;
+  padding-top: 0.66667rem;
 }
 
 ul li .user b {
@@ -153,6 +154,7 @@ ul li .chairman {
   left: 0.16rem;
   top: 0.94667rem;
   background: linear-gradient(90deg, #FFEB67, #FFFCE7);
+  display: none;
 }
 
 ul li .administrator {
@@ -168,6 +170,7 @@ ul li .administrator {
   left: 0.16rem;
   top: 0.94667rem;
   background: linear-gradient(-90deg, #FBE1FF, #F090FF);
+  display: none;
 }
 
 ul .null {

view/molistar/modules/guildAr/css/adminSet2.scss

@@ -96,12 +96,13 @@ ul {
                 font-weight: bold;
                 display: inline-block;
                 margin-right: px2rem(8);
-                margin-top: px2rem(56);
                 margin-bottom: px2rem(12);
                 width: 2.7rem;
                 overflow: hidden;
                 white-space: nowrap;
                 text-overflow: ellipsis;
+                box-sizing: border-box;
+                padding-top: px2rem(50);
             }
 
             b {
@@ -155,6 +156,7 @@ ul {
             left: px2rem(12);
             top: px2rem(71);
             background: linear-gradient(90deg, #FFEB67, #FFFCE7);
+            display: none;
         }
 
         .administrator {
@@ -170,6 +172,7 @@ ul {
             left: px2rem(12);
             top: px2rem(71);
             background: linear-gradient(-90deg, #FBE1FF, #F090FF);
+            display: none;
         }
     }
 

view/molistar/modules/guildAr/css/guild.css

@@ -120,9 +120,10 @@ ul li .user p {
   text-overflow: ellipsis;
   color: #515665;
   font-size: 0.32rem;
-  margin-top: 0.70667rem;
   margin-bottom: 0.38667rem;
   font-weight: bold;
+  box-sizing: border-box;
+  padding-top: 0.70667rem;
 }
 
 ul li .user b {

view/molistar/modules/guildAr/css/guild.scss

@@ -121,9 +121,10 @@ ul {
                 text-overflow: ellipsis;
                 color: #515665;
                 font-size: px2rem(24);
-                margin-top: px2rem(53);
                 margin-bottom: px2rem(29);
                 font-weight: bold;
+                box-sizing: border-box;
+                padding-top: px2rem(53);
             }
 
             b {

view/molistar/modules/guildAr/css/guildInfoSet.css

@@ -77,6 +77,7 @@ body {
   top: 0;
   left: 2.53333rem;
   z-index: 1;
+  border-radius: 0.13333rem;
 }
 
 .bg .upload {

view/molistar/modules/guildAr/css/guildInfoSet.scss

@@ -80,6 +80,7 @@ body {
         top: 0;
         left: px2rem(190);
         z-index: 1;
+        border-radius: px2rem(10);
     }
 
     .upload {

view/molistar/modules/guildAr/css/index.css

@@ -37,7 +37,7 @@ body {
 }
 
 .header .tx {
-  width: 2.53333rem;
+  width: 2.64rem;
   height: 2.53333rem;
   position: absolute;
   left: 50%;
@@ -53,6 +53,7 @@ body {
   top: 1.73333rem;
   left: 50%;
   transform: translateX(-50%);
+  z-index: 2;
 }
 
 .header .nick {
@@ -179,7 +180,7 @@ body {
 
 .guildList {
   width: 9.25333rem;
-  height: 9.97333rem;
+  height: 13.33333rem;
   border-radius: 0.26667rem;
   margin: -1.66667rem auto 0rem;
   position: relative;
@@ -267,6 +268,8 @@ body {
   overflow: hidden;
   margin-bottom: 0.44rem;
   position: relative;
+  box-sizing: border-box;
+  padding-left: 0.13333rem;
 }
 
 .guildList ul li .tx {
@@ -290,12 +293,13 @@ body {
   font-weight: bold;
   display: inline-block;
   margin-right: 0.10667rem;
-  margin-top: 0.10667rem;
   margin-bottom: 0.18667rem;
   width: 2.7rem;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
+  box-sizing: border-box;
+  padding-top: 0.10667rem;
 }
 
 .guildList ul li .user b {
@@ -344,7 +348,7 @@ body {
   font-size: 0.29333rem;
   font-weight: 400;
   position: absolute;
-  left: 0.16rem;
+  left: 0.26667rem;
   top: 0.94667rem;
   background: linear-gradient(90deg, #FFEB67, #FFFCE7);
   display: none;
@@ -360,7 +364,7 @@ body {
   font-size: 0.29333rem;
   font-weight: 400;
   position: absolute;
-  left: 0.16rem;
+  left: 0.26667rem;
   top: 0.94667rem;
   background: linear-gradient(-90deg, #FBE1FF, #F090FF);
   display: none;

view/molistar/modules/guildAr/css/index.scss

@@ -40,7 +40,7 @@ body {
     margin: 0 auto px2rem(0);
 
     .tx {
-        width: px2rem(190);
+        width: px2rem(198);
         height: px2rem(190);
         position: absolute;
         left: 50%;
@@ -56,6 +56,7 @@ body {
         top: px2rem(130);
         left: 50%;
         transform: translateX(-50%);
+        z-index: 2;
     }
 
     .nick {
@@ -183,7 +184,7 @@ body {
 
 .guildList {
     width: px2rem(694);
-    height: px2rem(748);
+    height: px2rem(1000);
     border-radius: px2rem(20);
     margin: px2rem(-125) auto px2rem(0);
     position: relative;
@@ -198,6 +199,7 @@ body {
         line-height: px2rem(30);
         margin-top: px2rem(31);
         position: relative;
+        // margin-left: px2rem(-13);
 
         b {
             float: left;
@@ -269,6 +271,8 @@ body {
             overflow: hidden;
             margin-bottom: px2rem(33);
             position: relative;
+            box-sizing: border-box;
+            padding-left: px2rem(10);
 
             .tx {
                 width: px2rem(80);
@@ -290,12 +294,13 @@ body {
                     font-weight: bold;
                     display: inline-block;
                     margin-right: px2rem(8);
-                    margin-top: px2rem(8);
                     margin-bottom: px2rem(14);
                     width: 2.7rem;
                     overflow: hidden;
                     white-space: nowrap;
                     text-overflow: ellipsis;
+                    box-sizing: border-box;
+                    padding-top: px2rem(8);
                 }
 
                 b {
@@ -345,7 +350,7 @@ body {
                 font-size: px2rem(22);
                 font-weight: 400;
                 position: absolute;
-                left: px2rem(12);
+                left: px2rem(20);
                 top: px2rem(71);
                 background: linear-gradient(90deg, #FFEB67, #FFFCE7);
                 display: none;
@@ -361,7 +366,7 @@ body {
                 font-size: px2rem(22);
                 font-weight: 400;
                 position: absolute;
-                left: px2rem(12);
+                left: px2rem(20);
                 top: px2rem(71);
                 background: linear-gradient(-90deg, #FBE1FF, #F090FF);
                 display: none;

view/molistar/modules/guildAr/css/memberFlow.css

@@ -62,7 +62,7 @@ body {
 .timeBox .line {
   width: 0.02667rem;
   height: 1.90667rem;
-  background: #A4ABB2;
+  background: #D7DCE6;
   position: absolute;
   left: 2.92rem;
   top: 50%;
@@ -90,18 +90,19 @@ body {
   color: #848D9C;
   font-size: 0.37333rem;
   font-weight: bold;
-  text-align: center;
 }
 
 .timeBox .startTime b {
   margin-right: 0.1rem;
+  text-indent: 0.45rem;
+  display: inline-block;
 }
 
 .timeBox .startTime img {
-  width: 0.46667rem;
+  width: 0.32rem;
-  height: 0.6rem;
+  height: 0.21333rem;
   display: inline-block;
-  margin-top: -0.1rem;
+  margin-top: 0.1rem;
 }
 
 .timeBox .endTime {
@@ -112,18 +113,19 @@ body {
   color: #848D9C;
   font-size: 0.37333rem;
   font-weight: bold;
-  text-align: center;
 }
 
 .timeBox .endTime b {
   margin-right: 0.1rem;
+  text-indent: 0.45rem;
+  display: inline-block;
 }
 
 .timeBox .endTime img {
-  width: 0.46667rem;
+  width: 0.32rem;
-  height: 0.6rem;
+  height: 0.21333rem;
   display: inline-block;
-  margin-top: -0.1rem;
+  margin-top: 0.1rem;
 }
 
 .timeBox .right {
@@ -201,7 +203,7 @@ body {
   width: 8.76rem;
   height: 2.01333rem;
   margin: 0 auto 0;
-  border-bottom: 0.02667rem solid #B0BACD;
+  border-bottom: 0.02667rem solid #D7DCE6;
   display: flex;
   justify-content: space-between;
 }
@@ -218,6 +220,7 @@ body {
   color: #848D9C;
   font-size: 0.32rem;
   font-weight: 500;
+  white-space: nowrap;
 }
 
 .list .other div img {

view/molistar/modules/guildAr/css/memberFlow.scss

@@ -65,7 +65,7 @@ body {
     .line {
         width: px2rem(2);
         height: px2rem(143);
-        background: #A4ABB2;
+        background: #D7DCE6;
         position: absolute;
         left: px2rem(219);
         top: 50%;
@@ -93,17 +93,19 @@ body {
         color: #848D9C;
         font-size: px2rem(28);
         font-weight: bold;
-        text-align: center;
+        // text-align: center;
 
         b {
             margin-right: 0.1rem;
+            text-indent: 0.45rem;
+            display: inline-block;
         }
 
         img {
-            width: px2rem(35);
+            width: px2rem(24);
-            height: px2rem(45);
+            height: px2rem(16);
             display: inline-block;
-            margin-top: -0.1rem;
+            margin-top: 0.1rem;
         }
     }
 
@@ -115,17 +117,19 @@ body {
         color: #848D9C;
         font-size: px2rem(28);
         font-weight: bold;
-        text-align: center;
+        // text-align: center;
 
         b {
             margin-right: 0.1rem;
+            text-indent: 0.45rem;
+            display: inline-block;
         }
 
         img {
-            width: px2rem(35);
+            width: px2rem(24);
-            height: px2rem(45);
+            height: px2rem(16);
             display: inline-block;
-            margin-top: -0.1rem;
+            margin-top: 0.1rem;
         }
     }
 
@@ -204,7 +208,7 @@ body {
         width: px2rem(657);
         height: px2rem(151);
         margin: 0 auto 0;
-        border-bottom: px2rem(2) solid #B0BACD;
+        border-bottom: px2rem(2) solid #D7DCE6;
         display: flex;
         justify-content: space-between;
 
@@ -220,6 +224,7 @@ body {
             color: #848D9C;
             font-size: px2rem(24);
             font-weight: 500;
+            white-space: nowrap;
 
             img {
                 display: block;

view/molistar/modules/guildAr/css/memberFlow2.css

@@ -62,7 +62,7 @@ body {
 .timeBox .line {
   width: 0.02667rem;
   height: 1.90667rem;
-  background: #A4ABB2;
+  background: #D7DCE6;
   position: absolute;
   left: 2.92rem;
   top: 50%;
@@ -90,18 +90,19 @@ body {
   color: #848D9C;
   font-size: 0.37333rem;
   font-weight: bold;
-  text-align: center;
 }
 
 .timeBox .startTime b {
   margin-right: 0.1rem;
+  text-indent: 0.45rem;
+  display: inline-block;
 }
 
 .timeBox .startTime img {
-  width: 0.46667rem;
+  width: 0.32rem;
-  height: 0.6rem;
+  height: 0.21333rem;
   display: inline-block;
-  margin-top: -0.1rem;
+  margin-top: 0.1rem;
 }
 
 .timeBox .endTime {
@@ -112,18 +113,19 @@ body {
   color: #848D9C;
   font-size: 0.37333rem;
   font-weight: bold;
-  text-align: center;
 }
 
 .timeBox .endTime b {
   margin-right: 0.1rem;
+  text-indent: 0.45rem;
+  display: inline-block;
 }
 
 .timeBox .endTime img {
-  width: 0.46667rem;
+  width: 0.32rem;
-  height: 0.6rem;
+  height: 0.21333rem;
   display: inline-block;
-  margin-top: -0.1rem;
+  margin-top: 0.1rem;
 }
 
 .timeBox .right {
@@ -140,6 +142,7 @@ body {
   width: 50%;
   text-align: center;
   overflow: hidden;
+  position: relative;
 }
 
 .timeBox .right div p {
@@ -155,6 +158,10 @@ body {
   color: #848D9C;
   font-size: 0.37333rem;
   font-weight: bold;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: 0.6rem;
 }
 
 .timeBox .right .goToExchangeGold {
@@ -209,7 +216,7 @@ body {
   width: 8.76rem;
   height: 2.01333rem;
   margin: 0 auto 0;
-  border-bottom: 0.02667rem solid #B0BACD;
+  border-bottom: 0.02667rem solid #D7DCE6;
   display: flex;
   justify-content: space-between;
 }
@@ -226,6 +233,7 @@ body {
   color: #848D9C;
   font-size: 0.32rem;
   font-weight: 500;
+  white-space: nowrap;
 }
 
 .list .other div img {

view/molistar/modules/guildAr/css/memberFlow2.scss

@@ -67,7 +67,7 @@ body {
     .line {
         width: px2rem(2);
         height: px2rem(143);
-        background: #A4ABB2;
+        background: #D7DCE6;
         position: absolute;
         left: px2rem(219);
         top: 50%;
@@ -95,17 +95,19 @@ body {
         color: #848D9C;
         font-size: px2rem(28);
         font-weight: bold;
-        text-align: center;
+        // text-align: center;
 
         b {
             margin-right: 0.1rem;
+            text-indent: 0.45rem;
+            display: inline-block;
         }
 
         img {
-            width: px2rem(35);
+            width: px2rem(24);
-            height: px2rem(45);
+            height: px2rem(16);
             display: inline-block;
-            margin-top: -0.1rem;
+            margin-top: 0.1rem;
         }
     }
 
@@ -117,17 +119,19 @@ body {
         color: #848D9C;
         font-size: px2rem(28);
         font-weight: bold;
-        text-align: center;
+        // text-align: center;
 
         b {
             margin-right: 0.1rem;
+            text-indent: 0.45rem;
+            display: inline-block;
         }
 
         img {
-            width: px2rem(35);
+            width: px2rem(24);
-            height: px2rem(45);
+            height: px2rem(16);
             display: inline-block;
-            margin-top: -0.1rem;
+            margin-top: 0.1rem;
         }
     }
 
@@ -144,6 +148,7 @@ body {
             width: 50%;
             text-align: center;
             overflow: hidden;
+            position: relative;
 
             p {
                 color: #A4ABB2;
@@ -158,6 +163,10 @@ body {
                 color: #848D9C;
                 font-size: px2rem(28);
                 font-weight: bold;
+                position: absolute;
+                left: 50%;
+                transform: translateX(-50%);
+                bottom: px2rem(45);
             }
         }
 
@@ -214,7 +223,7 @@ body {
         width: px2rem(657);
         height: px2rem(151);
         margin: 0 auto 0;
-        border-bottom: px2rem(2) solid #B0BACD;
+        border-bottom: px2rem(2) solid #D7DCE6;
         display: flex;
         justify-content: space-between;
 
@@ -230,6 +239,7 @@ body {
             color: #848D9C;
             font-size: px2rem(24);
             font-weight: 500;
+            white-space: nowrap;
 
             img {
                 display: block;

view/molistar/modules/guildAr/css/search.css

@@ -116,12 +116,13 @@ ul li .user p {
   font-weight: bold;
   display: inline-block;
   margin-right: 0.10667rem;
-  margin-top: 0.74667rem;
   margin-bottom: 0.16rem;
   width: 2.7rem;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
+  box-sizing: border-box;
+  padding-top: 0.74667rem;
 }
 
 ul li .user b {

view/molistar/modules/guildAr/css/search.scss

@@ -117,12 +117,14 @@ ul {
                 font-weight: bold;
                 display: inline-block;
                 margin-right: px2rem(8);
-                margin-top: px2rem(56);
+                // margin-top: px2rem(56);
                 margin-bottom: px2rem(12);
                 width: 2.7rem;
                 overflow: hidden;
                 white-space: nowrap;
                 text-overflow: ellipsis;
+                box-sizing: border-box;
+                padding-top: px2rem(56);
             }
 
             b {

view/molistar/modules/guildAr/js/Invite.js

@@ -40,7 +40,7 @@ $(function () {
         };
         // 頂部返回事件
         $('.back .backs').click(() => {
-            window.history.go(-1);
+            window.location.href = document.referrer;
         })
     }, 100)
 })

view/molistar/modules/guildAr/js/adminSet.js

@@ -41,7 +41,7 @@ $(function () {
         };
         // 頂部返回事件
         $('.back .backs').click(() => {
-            window.history.go(-1);
+            window.location.href = document.referrer;
         })
     }, 100)
 })

view/molistar/modules/guildAr/js/adminSet2.js

@@ -41,7 +41,7 @@ $(function () {
         };
         // 頂部返回事件
         $('.back .backs').click(() => {
-            window.history.go(-1);
+            window.location.href = "./index.html";
         })
         listManager();
     }, 100)
@@ -66,8 +66,8 @@ function listManager() {
                     res.data.forEach(res => {
                         str += `
                             <li>
-                                <div class="chairman" ${res.roleType == 3 ? 'style="display:block"' : ''}>الوكيل</div>
+                                <div class="chairman" ${res.roleType == 3 ? 'style="display:none"' : ''}>الوكيل</div>
-                                <div class="administrator" ${res.roleType == 2 ? 'style="display:block"' : ''}>المشرف</div>
+                                <div class="administrator" ${res.roleType == 2 ? 'style="display:none"' : ''}>المشرف</div>
                                 <img src="${res.avatar}" alt="" class="tx">
                                 <div class="user">
                                     <p>${res.nick}</p>

view/molistar/modules/guildAr/js/guildInfoSet.js

@@ -40,7 +40,7 @@ $(function () {
         };
         // 頂部返回事件
         $('.back img').click(() => {
-            window.history.go(-1);
+            window.location.href = document.referrer;
         })
         pubInfo['Accept-Language'] = 'ar'
     }, 100)

view/molistar/modules/guildAr/js/index.js

@@ -79,10 +79,6 @@ function guildFun(type) {
     else {
     }
 }
-// 邀请成员按钮
-$('.header .inveMember').click(function () {
-    window.location.href = './invite.html'
-})
 // 配置接口
 function get() {
     showLoading()
@@ -99,10 +95,10 @@ function get() {
                 $('.header .nick').text(res.data.owner.nick);
                 $('.header .id').text('ID：' + res.data.owner.erbanNo);
                 $('.header').css({ "background": `url(${res.data.backgroundUrl}) no-repeat`, "background-size": "100% 100%" });
-                $('.header .guildNick').text('نقابة:' + res.data.name);
+                $('.header .guildNick').text('اسم النقابة:' + res.data.name);
                 // 处理成员
                 var str = '';
-                $('.guildList .top i').text(res.data.members.length);
+                $('.guildList .top i').text(`(${res.data.members.length})`);
                 $('.guildList ul li').remove();
                 res.data.members.forEach((res, i) => {
                     str += `
@@ -242,5 +238,5 @@ $('.header .memberFlowMy').click(function (params) {
 })
 // 查看成员流水
 $('.header .inveMember').click(function (params) {
-    window.location.href = `./Invite.html`
+    window.location.href = `./invite.html`
 })

view/molistar/modules/guildAr/js/memberFlow.js

@@ -29,6 +29,7 @@ const toastMsg = (content = '操作完成', time = 2) => {
 var times = new Date().getTime() - 86400000;
 var startDates;
 var endDates;
+var timestamp;
 // 初始化函數
 $(function () {
     getInfoFromClient();
@@ -43,7 +44,7 @@ $(function () {
         };
         // 頂部返回事件
         $('.back .backs').click(() => {
-            window.history.go(-1);
+            window.location.href = './index.html';
         })
         //初始化时间插件
         this.initTime()
@@ -89,8 +90,8 @@ function memberIncome(startDate, endDate) {
                         </li>
                     `
                 } else {
-                    $('.timeBox .right div b').text(res.data.totalDiamondRemain);
+                    $('.timeBox .right .div1 b').text(res.data.totalGoldIncome);
-                    $('.timeBox .right div b').text(res.data.totalGoldIncome);
+                    $('.timeBox .right .div2 b').text(res.data.totalDiamondRemain);
                     res.data.memberIncomeList.forEach(val => {
                         str += `
                             <li class="other">
@@ -99,17 +100,19 @@ function memberIncome(startDate, endDate) {
                                     <p class="nick">${val.member.nick}</p>
                                     <b class="id">ID:${val.member.erbanNo}</b>
                                 </div>
-                                <div>${val.micRemainTime}min</div>
+                                <div>${val.micRemainTime}</div>
                                 <div>${val.goldIncome}</div>
-                                <div>${val.res.data.diamondRemain}</div>
+                                <div>${val.diamondRemain}</div>
                                 <div>${val.sendGiftUserNum}</div>
                             </li>
                     `
                     })
                 }
                 $('.list').append(str);
+                timestamp = res.timestamp;
             } else {
                 toastMsg(res.message)
+                timestamp = res.timestamp;
             }
             hideLoading(layerIndex)
         },
@@ -121,5 +124,15 @@ function memberIncome(startDate, endDate) {
 }
 // 查询按钮
 $('.back .text').click(function () {
-    memberIncome(startDates, endDates)
+    if ((Date.parse(endDates)) >= timestamp) {
+        toastMsg('وقت الانتهاء يجب أن يكون قبل اليوم السابق كحد أقصى.')
+    } else if (endDates == dateFormat(timestamp, 'yyyy-MM-dd')) {
+        toastMsg('وقت الانتهاء يجب أن يكون قبل اليوم السابق كحد أقصى.')
+    } else if (Date.parse(startDates) > Date.parse(endDates)) {
+        toastMsg(`لا يمكن أن يكون وقت البدء أقل من وقت الانتهاء.`)
+    } else if ((Date.parse(endDates) - Date.parse(startDates)) > (30 * 24 * 60 * 60 * 1000)) {
+        toastMsg('المدة الزمنية يجب أن تكون داخل الثلاثين يومًا.')
+    } else {
+        memberIncome(startDates, endDates)
+    }
 })

view/molistar/modules/guildAr/js/memberFlow2.js

@@ -29,6 +29,7 @@ const toastMsg = (content = '操作完成', time = 2) => {
 var times = new Date().getTime() - 86400000;
 var startDates;
 var endDates;
+var timestamp;
 // 初始化函數
 $(function () {
     getInfoFromClient();
@@ -43,7 +44,7 @@ $(function () {
         };
         // 頂部返回事件
         $('.back .backs').click(() => {
-            window.history.go(-1);
+            window.location.href = './index.html';
         })
         //初始化时间插件
         this.initTime()
@@ -89,13 +90,13 @@ function memberIncome(startDate, endDate) {
                         </li>
                     `
                 } else {
-                    $('.timeBox .right div b').text(res.data.totalDiamondRemain);
+                    $('.timeBox .right .div1 b').text(res.data.totalGoldIncome);
-                    $('.timeBox .right div b').text(res.data.totalGoldIncome);
+                    $('.timeBox .right .div2 b').text(res.data.totalDiamondRemain);
                     res.data.incomeList.forEach(val => {
                         str += `
                             <li class="other">
                                 <div>${dateFormat(val.date, 'yyyy-MM-dd')}</div>
-                                <div>${val.micRemainTime}min</div>
+                                <div>${val.micRemainTime}</div>
                                 <div>${val.goldIncome}</div>
                                 <div>${val.diamondRemain}</div>
                                 <div>${val.sendGiftUserNum}</div>
@@ -104,8 +105,10 @@ function memberIncome(startDate, endDate) {
                     })
                 }
                 $('.list').append(str);
+                timestamp = res.timestamp;
             } else {
                 toastMsg(res.message)
+                timestamp = res.timestamp;
             }
             hideLoading(layerIndex)
         },
@@ -118,12 +121,22 @@ function memberIncome(startDate, endDate) {
 // 跳转客户端兑换金币页面
 $('.timeBox .right .goToExchangeGold').click(function () {
     if (browser.android) {
-        window.androidJsObj.goToExchangeGold(false)
+        window.androidJsObj.goToExchangeGold()
     } else {
         window.webkit.messageHandlers.goToExchangeGold.postMessage(0)
     }
 })
 // 查询按钮
 $('.back .text').click(function () {
-    memberIncome(startDates, endDates)
+    if ((Date.parse(endDates)) >= timestamp) {
+        toastMsg('وقت الانتهاء يجب أن يكون قبل اليوم السابق كحد أقصى.')
+    } else if (endDates == dateFormat(timestamp, 'yyyy-MM-dd')) {
+        toastMsg('وقت الانتهاء يجب أن يكون قبل اليوم السابق كحد أقصى.')
+    } else if (Date.parse(startDates) > Date.parse(endDates)) {
+        toastMsg(`لا يمكن أن يكون وقت البدء أقل من وقت الانتهاء.`)
+    } else if ((Date.parse(endDates) - Date.parse(startDates)) > (30 * 24 * 60 * 60 * 1000)) {
+        toastMsg('المدة الزمنية يجب أن تكون داخل الثلاثين يومًا.')
+    } else {
+        memberIncome(startDates, endDates)
+    }
 })

view/molistar/modules/guildAr/js/search.js

@@ -40,19 +40,20 @@ $(function () {
         };
         // 頂部返回事件
         $('.back .backs').click(() => {
-            window.history.go(-1);
+            window.location.href = document.referrer;
         })
     }, 100)
 })
 // 配置接口
 function searchFamily(erbanNo) {
+    $('ul li').remove();
     showLoading()
     networkRequest({
         type: 'get',
         url: urlPrefix + '/family/searchFamily',
         data: { erbanNo },
         success(res) {
-            if (res.code === 200) {
+            if (res.code == 200) {
                 var str = '';
                 str += `
                     <li>
@@ -64,7 +65,9 @@ function searchFamily(erbanNo) {
                         <div familyId=${res.data.familyId} class="but">طلب إضافة </div>
                     </li> 
                 `
+                $('ul').append(str);
             } else if (res.code == 1404) {
+                var str = '';
                 str += `
                     <li class="null">
                         <img src="./images/null.png" alt="">

view/molistar/modules/guildAr/memberFlow.html

@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>أجمالي دخل الأعضاء</title>
+    <title>إجمالي دخل الأعضاء</title>
     <!-- 成员收入统计 -->
     <link rel="stylesheet" href="../../common/css/reset.css">
     <link rel="stylesheet" href="./css/mobile.css">
@@ -15,7 +15,7 @@
     <!-- 顶部 -->
     <div class="back">
         <img src="./images/travel/backB.png" alt="" class="backs">
-        <div class="title">أجمالي دخل الأعضاء</div>
+        <div class="title">إجمالي دخل الأعضاء</div>
         <div class="text">استعلام</div>
     </div>
     <!-- 时间选择器筛选 -->
@@ -30,7 +30,7 @@
                 <p>الدخل الإجمالي للعملات الذهبية</p>
                 <b>0</b>
             </div>
-            <div>
+            <div class="div2">
                 <!-- 钻石总收入 -->
                 <p>الدخل الإجمالي للماس</p>
                 <b>0</b>
@@ -41,7 +41,7 @@
     <ul class="list">
         <li class="top">
             <!-- 成员信息 -->
-            <div>رسائل الأعضاء</div>
+            <div>معلومات الأعضاء</div>
             <!-- 开播时长 -->
             <div>وقت البث</div>
             <!-- 金币收入 -->

view/molistar/modules/guildAr/memberFlow2.html

@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>دخل الشخصي</title>
+    <title>الدخل الشخصي</title>
     <!-- 个人收入统计 -->
     <link rel="stylesheet" href="../../common/css/reset.css">
     <link rel="stylesheet" href="./css/mobile.css">
@@ -15,7 +15,7 @@
     <!-- 顶部 -->
     <div class="back">
         <img src="./images/travel/backB.png" alt="" class="backs">
-        <div class="title">دخل الشخصي</div>
+        <div class="title">الدخل الشخصي</div>
         <div class="text">استعلام</div>
     </div>
     <!-- 时间选择器筛选 -->
@@ -30,19 +30,19 @@
                 <p>الدخل الإجمالي للعملات الذهبية</p>
                 <b>0</b>
             </div>
-            <div>
+            <div class="div2">
                 <!-- 钻石总收入 -->
                 <p>الدخل الإجمالي للماس</p>
                 <b>0</b>
             </div>
-            <div class="goToExchangeGold">استبدال </div>
+            <div class="goToExchangeGold">استبدال >></div>
         </div>
     </div>
     <!-- 数据内容 -->
     <ul class="list">
         <li class="top">
             <!-- 日期 -->
-            <div>تاريخ</div>
+            <div>التاريخ</div>
             <!-- 开播时长 -->
             <div>وقت البث</div>
             <!-- 金币收入 -->

view/molistar/modules/rule/js/luckyGiftRule.js

@@ -1,9 +1,11 @@
 let locateObj = getQueryString()
 let urlPrefix = getUrlPrefix()
 let luckyBagPoolInfoMaps;
+var langReplace;
+var localLang;
 // 封装layer消息提醒框
 let layerIndex
-const showLoading = (content = '加載中...') => {
+const showLoading = (content = '(*＾-＾*)') => {
     layer.open({
         type: 2,
         shadeClose: false,
@@ -16,7 +18,7 @@ const showLoading = (content = '加載中...') => {
 const hideLoading = (index) => {
     layer.close(index)
 }
-const toastMsg = (content = '操作完成', time = 2) => {
+const toastMsg = (content = '︶︵︶', time = 2) => {
     layer.open({
         content,
         time,
@@ -38,7 +40,7 @@ const getList = () => {
             }
         },
         error () {
-            toastMsg('網絡錯誤')
+            toastMsg(langReplace(localLang.demoModule.luckyGiftRuleErr))
         }
     })
 }
@@ -48,11 +50,22 @@ $(function () {
         new VConsole();
     }
     getInfoFromClient()
+    fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言
     setTimeout(function () {
         fuzzyMatchUpdateQueryStringParameterFun();
+        langReplace = window.lang.replace;
+        localLang = window.lang;
+        translateFun();
         getList()
     },50)
 })
+function translateFun() {
+    var langReplace = window.lang.replace;
+    var localLang = window.lang;
+    $('#luckyGiftRuleTitle').text(langReplace(localLang.demoModule.luckyGiftRuleTitle))
+    $('#luckyGiftRuleText1').text(langReplace(localLang.demoModule.luckyGiftRuleText1))
+    $('#luckyGiftRuleText2').text(langReplace(localLang.demoModule.luckyGiftRuleText2))
+}
 function bodyList (id) {
     $('.wrap .gift_item_contain li').remove();
     console.log(luckyBagPoolInfoMaps[id]);

view/molistar/modules/rule/local/ar.js

@@ -1,7 +1,7 @@
 // 英文
-langAr  = {
+langAr = {
     // 模块
-    
+
     demoModule: {
         // ==========================================sdk==================================
         sdk_title: `Third-party SDK Directory`,
@@ -1534,7 +1534,7 @@ langAr  = {
 			</li>
 		</ul>
 	</div>`,
-    
+
         // ==========================================平台社区规范==================================
         community_title: `MoliStarApp Community Guidelines`,
         community_body: ` Principles <br><br>
@@ -1769,7 +1769,12 @@ langAr  = {
         Complaints can be sent to MoliStar666@gmail.com.<br><br>`,
 
         //==========================================贵族规则==================================
-        introduction_title:`VIP قواعد`,
+        introduction_title: `VIP قواعد`,
-        introduction_title_img:'./images/patrician-ar.png',
+        introduction_title_img: './images/patrician-ar.png',
+        // 幸运礼物
+        luckyGiftRuleTitle: 'قواعد الهدايا الحظ',
+        luckyGiftRuleErr: 'خطأ في الشبكة',
+        luckyGiftRuleText1: 'أرسل هدايا حظ مختلفة لفرصة الفوز بجوائز عالية القيمة.',
+        luckyGiftRuleText2: 'حقيبة الحظ',
     }
 }

view/molistar/modules/rule/local/en.js

@@ -1769,7 +1769,12 @@ langEn = {
         Complaints can be sent to MoliStar666@gmail.com.<br><br>`,
 
         //==========================================贵族规则==================================
-        introduction_title:'VIP rules',
+        introduction_title: 'VIP rules',
-        introduction_title_img:'./images/patrician-en.png',
+        introduction_title_img: './images/patrician-en.png',
+        // 幸运礼物
+        luckyGiftRuleTitle: 'Lucky Gift Rules',
+        luckyGiftRuleErr: 'Network Error',
+        luckyGiftRuleText1: 'Send different lucky gifts for a chance to win high-value prizes.',
+        luckyGiftRuleText2: 'Lucky Bag',
     }
 }

view/molistar/modules/rule/local/zh.js

@@ -1771,5 +1771,10 @@ langZh = {
         //==========================================贵族规则==================================
         introduction_title: '貴族規則',
         introduction_title_img: './images/patrician.png',
+        // 幸运礼物
+        luckyGiftRuleTitle:'幸運禮物玩法說明',
+        luckyGiftRuleErr:'網絡錯誤',
+        luckyGiftRuleText1:'送出不同的幸運禮物，有機會獲得以下高價禮物',
+        luckyGiftRuleText2:'幸運福袋',
     }
 }

view/molistar/modules/rule/luckyGiftRule.html

@@ -6,7 +6,8 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport"
         content="width=device-width, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
-    <title>幸运礼物玩法说明</title>
+    <title id="luckyGiftRuleTitle"></title>
+    <!-- 幸运礼物玩法说明 -->
     <link rel="stylesheet" href="../../common/css/reset.css">
     <link rel="stylesheet" href="./style/luckyGiftRule.css">
     <style>
@@ -19,7 +20,7 @@
 <body>
     <div class="wrap">
         <div class="fixed_wrap" style="background: #F4F4FA;">
-            <div class="tip">送出不同的幸运礼物，有机会获得以下高价礼物</div>
+            <div class="tip" id="luckyGiftRuleText1"></div>
             <div class="gift_list_contain">
                 <ul class="gift_list">
                     <!-- <li class="active" id="1">
@@ -50,7 +51,7 @@
             </div>
         </div>
         <div class="box">
-            <p class="select_gift_name">幸运福袋</p>
+            <p class="select_gift_name" id="luckyGiftRuleText2"></p>
             <ul class="gift_item_contain" style="background: #fff;margin-top: 0.4rem;height: 5rem;overflow: auto;">
 
                 <!-- <li>

view/molistar/modules/rule/style/luckyGiftRule.css

@@ -6,108 +6,125 @@
   width: 100%;
   background-color: #fff;
 }
+
 .wrap .fixed_wrap .tip {
   text-align: center;
   font-size: 0.32rem;
   color: #666;
   margin-top: 0.64rem;
-  margin-bottom: 0.4533333333rem;
+  margin-bottom: 0.45333rem;
 }
+
 .wrap .fixed_wrap .gift_list_contain {
   overflow-x: scroll;
-  margin-bottom: 0.5333333333rem;
+  margin-bottom: 0.53333rem;
 }
+
 .wrap .fixed_wrap .gift_list_contain .gift_list {
   width: max-content;
-  padding: 0 0.3733333333rem;
+  padding: 0 0.37333rem;
   box-sizing: border-box;
 }
+
 .wrap .fixed_wrap .gift_list_contain .gift_list::after {
-  content: "";
+  content: '';
   display: block;
   clear: both;
 }
+
 .wrap .fixed_wrap .gift_list_contain .gift_list li {
   float: left;
   display: flex;
   flex-direction: column;
   align-items: center;
-  width: 2.2933333333rem;
+  width: 2.29333rem;
   height: 2.88rem;
   margin-left: 0.32rem;
   font-size: 0.32rem;
   text-align: center;
   background: #fff;
 }
+
 .wrap .fixed_wrap .gift_list_contain .gift_list li img {
   width: 1.6rem;
   height: 1.6rem;
   margin-top: 0.32rem;
-  margin-bottom: 0.1333333333rem;
+  margin-bottom: 0.13333rem;
 }
+
 .wrap .fixed_wrap .gift_list_contain .gift_list li.active {
   background: url("../images/2.png") no-repeat 0 0/100% 100%;
   color: #FFB606;
-  width: 2.2933333333rem;
+  width: 2.29333rem;
-  height: 3.0666666667rem;
+  height: 3.06667rem;
 }
+
 .wrap .box {
   background: #fff;
   width: 90%;
   box-sizing: border-box;
-  padding: 0.2666666667rem;
+  padding: 0.26667rem;
   border-radius: 0.2rem;
-  margin: 5.1rem auto 1.0666666667rem;
+  margin: 5.1rem auto 1.06667rem;
 }
+
 .wrap .select_gift_name {
   position: relative;
-  height: 0.5333333333rem;
+  height: 0.53333rem;
-  line-height: 0.5333333333rem;
+  line-height: 0.53333rem;
   font-weight: bold;
-  font-size: 0.3733333333rem;
+  font-size: 0.37333rem;
   color: #333;
   background: #fff;
   margin-left: 0.5rem;
 }
+
 .wrap .select_gift_name::after {
-  content: "";
+  content: '';
   position: absolute;
-  left: -0.3733333333rem;
+  left: -0.37333rem;
   height: inherit;
-  width: 0.1066666667rem;
+  width: 0.10667rem;
   background-color: #FFBC51;
-  border-radius: 0.0533333333rem;
+  border-radius: 0.05333rem;
 }
+
 .wrap .gift_item_contain li {
   display: flex;
   align-items: center;
-  margin-bottom: 0.4266666667rem;
+  margin-bottom: 0.42667rem;
   padding: 0 0.72rem;
   box-sizing: border-box;
 }
+
 .wrap .gift_item_contain li .gift_item_pic {
   width: 1.28rem;
   height: 1.28rem;
-  margin-right: 0.3466666667rem;
+  margin-right: 0.34667rem;
 }
+
 .wrap .gift_item_contain li .gift_item_name {
-  width: 2.6666666667rem;
+  width: 2.66667rem;
   text-align: left;
-  font-size: 0.3466666667rem;
+  font-size: 0.34667rem;
   color: #333;
 }
+
 .wrap .gift_item_contain li .gift_item_price {
   flex: 1;
 }
+
 .wrap .gift_item_contain li .gift_item_price img {
-  width: 0.3466666667rem;
+  width: 0.34667rem;
-  height: 0.2666666667rem;
+  height: 0.26667rem;
   margin-right: 0.08rem;
 }
+
 .wrap .gift_item_contain li .gift_item_price span {
   font-size: 0.32rem;
   color: #333;
 }
+
 .wrap .gift_item_contain li .ratio {
   font-size: 0.32rem;
   color: #666;
@@ -117,4 +134,6 @@
   display: none;
 }
 
-/*# sourceMappingURL=luckyGiftRule.css.map */
+.arabic .wrap .select_gift_name::after {
+  right: -0.18rem;
+}

view/molistar/modules/rule/style/luckyGiftRule.scss

@@ -13,19 +13,19 @@
 
         .tip {
             text-align: center;
-            font-size: px2rem(24, );
+            font-size: px2rem(24);
             color: #666;
-            margin-top: px2rem(48, );
+            margin-top: px2rem(48);
-            margin-bottom: px2rem(34, );
+            margin-bottom: px2rem(34);
         }
 
         .gift_list_contain {
             overflow-x: scroll;
-            margin-bottom: px2rem(40, );
+            margin-bottom: px2rem(40);
 
             .gift_list {
                 width: max-content;
-                padding: 0 px2rem(28, );
+                padding: 0 px2rem(28);
                 box-sizing: border-box;
 
                 &::after {
@@ -39,25 +39,25 @@
                     display: flex;
                     flex-direction: column;
                     align-items: center;
-                    width: px2rem(172, );
+                    width: px2rem(172);
-                    height: px2rem(216, );
+                    height: px2rem(216);
-                    margin-left: px2rem(24, );
+                    margin-left: px2rem(24);
-                    font-size: px2rem(24, );
+                    font-size: px2rem(24);
                     text-align: center;
                     background: #fff;
 
                     img {
-                        width: px2rem(120, );
+                        width: px2rem(120);
-                        height: px2rem(120, );
+                        height: px2rem(120);
-                        margin-top: px2rem(24, );
+                        margin-top: px2rem(24);
-                        margin-bottom: px2rem(10, );
+                        margin-bottom: px2rem(10);
                     }
 
                     &.active {
                         background: url('../images/2.png') no-repeat 0 0/100% 100%;
                         color: #FFB606;
-                        width: px2rem(172, );
+                        width: px2rem(172);
-                        height: px2rem(230, );
+                        height: px2rem(230);
                     }
                 }
             }
@@ -68,17 +68,17 @@
         background: #fff;
         width: 90%;
         box-sizing: border-box;
-        padding: px2rem(20, );
+        padding: px2rem(20);
-        border-radius: px2rem(15, );
+        border-radius: px2rem(15);
-        margin: 5.1rem auto px2rem(80, );
+        margin: 5.1rem auto px2rem(80);
     }
 
     .select_gift_name {
         position: relative;
-        height: px2rem(40, );
+        height: px2rem(40);
-        line-height: px2rem(40, );
+        line-height: px2rem(40);
         font-weight: bold;
-        font-size: px2rem(28, );
+        font-size: px2rem(28);
         color: #333;
         background: #fff;
         margin-left: 0.5rem;
@@ -86,11 +86,11 @@
         &::after {
             content: '';
             position: absolute;
-            left: px2rem(-28, );
+            left: px2rem(-28);
             height: inherit;
-            width: px2rem(8, );
+            width: px2rem(8);
             background-color: #FFBC51;
-            border-radius: px2rem(4, );
+            border-radius: px2rem(4);
         }
     }
 
@@ -98,20 +98,20 @@
         li {
             display: flex;
             align-items: center;
-            margin-bottom: px2rem(32, );
+            margin-bottom: px2rem(32);
-            padding: 0 px2rem(54, );
+            padding: 0 px2rem(54);
             box-sizing: border-box;
 
             .gift_item_pic {
-                width: px2rem(96, );
+                width: px2rem(96);
-                height: px2rem(96, );
+                height: px2rem(96);
-                margin-right: px2rem(26, );
+                margin-right: px2rem(26);
             }
 
             .gift_item_name {
-                width: px2rem(200, );
+                width: px2rem(200);
                 text-align: left;
-                font-size: px2rem(26, );
+                font-size: px2rem(26);
                 color: #333;
             }
 
@@ -119,19 +119,19 @@
                 flex: 1;
 
                 img {
-                    width: px2rem(26, );
+                    width: px2rem(26);
-                    height: px2rem(20, );
+                    height: px2rem(20);
-                    margin-right: px2rem(6, );
+                    margin-right: px2rem(6);
                 }
 
                 span {
-                    font-size: px2rem(24, );
+                    font-size: px2rem(24);
                     color: #333;
                 }
             }
 
             .ratio {
-                font-size: px2rem(24, );
+                font-size: px2rem(24);
                 color: #666;
             }
         }
@@ -140,4 +140,9 @@
 
 ::-webkit-scrollbar {
     display: none;
+}
+.arabic{
+    .wrap .select_gift_name::after{
+        right: -0.18rem;
+    }
 }

view/molistar/modules/weekStar/js/newWeekStar.js

@@ -4,12 +4,14 @@ var info = {};
 if (EnvCheck() === 'test') new VConsole
 // 封装layer消息提醒框
 let layerIndex
+var langReplace;
+var localLang;
 const showLoading = (content = '加載中...') => {
     layer.open({
         type: 2,
         shadeClose: false,
         content,
-        success (e) {
+        success(e) {
             layerIndex = $(e).attr('index')
         }
     })
@@ -35,12 +37,28 @@ var notTopThree = [];//非前三排名数组
 var lock = true;
 $(function () {
     getInfoFromClient()
+    fuzzyMatchUpdateQueryStringParameterFun();
     setTimeout(function () {
         fuzzyMatchUpdateQueryStringParameterFun();
+        langReplace = window.lang.replace;
+        localLang = window.lang;
+        translateFun();
         getWeekStarAward(rankType, rankTypeWeek);
     }, 50)
 })
-function getWeekStarAward (rankType, rankTypeWeek) {
+function translateFun() {
+    var langReplace = window.lang.replace;
+    var localLang = window.lang;
+    $('#title').html(langReplace(localLang.demoModule.title));
+    $('#text2').html(langReplace(localLang.demoModule.text2));
+    $('.header').attr('style', langReplace(localLang.demoModule.img));
+    $('.header a img').attr('src', langReplace(localLang.demoModule.img2));
+    $(`.tab1`).attr('style', langReplace(localLang.demoModule.img3));
+    $(`.tab2`).attr('style', langReplace(localLang.demoModule.img4));
+    $(`.box .sTab`).attr('style', langReplace(localLang.demoModule.img5));
+    $(`.box .sTab_active`).attr('style', langReplace(localLang.demoModule.img6));
+}
+function getWeekStarAward(rankType, rankTypeWeek) {
     showLoading();
     networkRequest({
         type: 'GET',
@@ -49,7 +67,7 @@ function getWeekStarAward (rankType, rankTypeWeek) {
             rankType,
             uid: pubInfo.uid
         },
-        success (res) {
+        success(res) {
             if (res.code === 200) {
                 // 处理倒计时
                 endTime2 = res.data.endTime;
@@ -144,7 +162,7 @@ function getWeekStarAward (rankType, rankTypeWeek) {
                 toastMsg(res.message);
             }
         },
-        error () {
+        error() {
             hideLoading(layerIndex);
             toastMsg('網絡錯誤');
         }
@@ -156,10 +174,12 @@ $('.tabAbox div').click(function () {
     if (i == 0) {
         rankTypeWeek = 1;
         $('.tabAbox').removeClass('tab2').addClass('tab1');
+        $('.tabAbox').attr('style', langReplace(localLang.demoModule.img3));
         getWeekStarAward(rankType, rankTypeWeek);
     } else {
         rankTypeWeek = 2;
         $('.tabAbox').removeClass('tab1').addClass('tab2');
+        $('.tabAbox').attr('style', langReplace(localLang.demoModule.img4));
         getWeekStarAward(rankType, rankTypeWeek);
     }
 
@@ -170,22 +190,22 @@ $('.sTab div').click(function () {
     var i = $(this).index();
     if (i == 0) {
         rankType = 1;
-        $('.sTab').removeClass('sTab_active');
+        $('.box .sTab').attr('style', langReplace(localLang.demoModule.img5));
         getWeekStarAward(rankType, rankTypeWeek);
     } else {
         rankType = 2;
-        $('.sTab').addClass('sTab_active');
+        $('.box .sTab').attr('style', langReplace(localLang.demoModule.img6));
         getWeekStarAward(rankType, rankTypeWeek);
     }
 
 })
 // 处理前三函数
-function weekStarRankList (arr, index, type) {
+function weekStarRankList(arr, index, type) {
     var arrs = arr[index].slice(0, 3);
     if (arrs.length < 3) {
         let arr = new Array(3 - arrs.length).fill({
             avatar: './images/newimages/null.png',
-            nick: '虚位以待',
+            nick: langReplace(localLang.demoModule.text3),
             amount: ""
         })
         arrs.push(...arr)
@@ -195,9 +215,9 @@ function weekStarRankList (arr, index, type) {
         $(`.box .top_three .No${i + 1} .tx`).attr('uid', res.uid);
         $(`.box .top_three .No${i + 1} p`).text(res.nick);
         if (type == 1) {
-            $(`.box .top_three .No${i + 1} b`).text(`${res.amount == 0 ? '' : '魅力值:' + formatNumber(res.amount)}`);
+            $(`.box .top_three .No${i + 1} b`).text(`${res.amount == 0 ? '' : langReplace(localLang.demoModule.text4) + formatNumber(res.amount)}`);
         } else {
-            $(`.box .top_three .No${i + 1} b`).text(`${res.amount == 0 ? '' : '豪气值:' + formatNumber(res.amount)}`);
+            $(`.box .top_three .No${i + 1} b`).text(`${res.amount == 0 ? '' : langReplace(localLang.demoModule.text5) + formatNumber(res.amount)}`);
         }
     })
 
@@ -219,7 +239,7 @@ $('.top_three .tx').click(function () {
     }
 })
 // 处理前非三函数
-function notWeekStarRankList (arr, index, type) {
+function notWeekStarRankList(arr, index, type) {
     var arrs = arr[index].slice(3);
     var str = ``;
     arrs.forEach((res, i) => {
@@ -228,7 +248,7 @@ function notWeekStarRankList (arr, index, type) {
                     <span class="ranking">${i + 4}</span>
                     <img src="${res.avatar}" alt="">
                     <span class="nice">${res.nick}</span>
-                    <span class="num">${type == 1 ? res.amount == 0 ? '' : '魅力值:' + formatNumber(res.amount) : res.amount == 0 ? '' : '豪气值:' + formatNumber(res.amount)}</span>
+                    <span class="num">${type == 1 ? res.amount == 0 ? '' : `${langReplace(localLang.demoModule.text4)}` + formatNumber(res.amount) : res.amount == 0 ? '' : `${langReplace(localLang.demoModule.text5)}` + formatNumber(res.amount)}</span>
                 </li>
         `
     })
@@ -250,18 +270,18 @@ function notWeekStarRankList (arr, index, type) {
     })
 }
 // 处理自己排名数组
-function mineRankArrFun (arr, index, type) {
+function mineRankArrFun(arr, index, type) {
-    $('.myBox .ranking').text(arr[index].rank < 0 ? '未上榜' : arr[index].rank);
+    $('.myBox .ranking').text(arr[index].rank < 0 ? langReplace(localLang.demoModule.text7) : arr[index].rank);
     $('.myBox .nice').text(arr[index].nick);
     $('.myBox img').attr('src', arr[index].avatar);
     if (type == 1) {
-        $('.myBox .num').text(`魅力值:${formatNumber(arr[index].amount)}`);
+        $('.myBox .num').text(`${langReplace(localLang.demoModule.text4)}${formatNumber(arr[index].amount)}`);
     } else {
-        $('.myBox .num').text(`豪气值:${formatNumber(arr[index].amount)}`);
+        $('.myBox .num').text(`${langReplace(localLang.demoModule.text5)}${formatNumber(arr[index].amount)}`);
     }
 }
 // 处理以万为单位
-function formatNumber (num) {
+function formatNumber(num) {
     num = Number(num);
     if (num == 0 || num <= 10000) {
         return num;
@@ -269,10 +289,10 @@ function formatNumber (num) {
         if (num > 1 && num < 10000) {
             return num + '';
         } else {
-            return (num / 10000).toFixed(2) + '万';
+            return (num / 10000).toFixed(2) + langReplace(localLang.demoModule.text6);
         }
 }
-function countup () {
+function countup() {
     //获取当前时间
     var date = new Date();
     var now = date.getTime();
@@ -292,22 +312,22 @@ function countup () {
         m = getzf(Math.floor(leftTime / 1000 / 60 % 60));
         s = getzf(Math.floor(leftTime / 1000 % 60));
         //将倒计时赋值到div中
-        $('.time span').text(d + " 天 " + h + " : " + m + " : " + s);
+        $('.time span').text(d + langReplace(localLang.demoModule.text8) + h + " : " + m + " : " + s);
         //递归每秒调⽤countTime⽅法，显⽰动态时间效果
     } else {
-        $('.time span').text("00 天 00 : 00 : 00");
+        $('.time span').text(`00 ${langReplace(localLang.demoModule.text8)} 00 : 00 : 00`);
         return
     }
     setTimeout(countup, 1000);
 }
 //补0操作  
-function getzf (num) {
+function getzf(num) {
     if (parseInt(num) < 10) {
         num = '0' + num;
     }
     return num;
 }
-function checkTime (i) {
+function checkTime(i) {
     if (i < 10) {
         i = "0" + i;
     }

view/molistar/modules/weekStar/js/newWeekStar2.js

@@ -0,0 +1,22 @@
+let urlPrefix = getUrlPrefix();
+var browser = checkVersion();
+var info = {};
+if (EnvCheck() === 'test') new VConsole
+var langReplace;
+var localLang;
+$(function () {
+    getInfoFromClient()
+    fuzzyMatchUpdateQueryStringParameterFun();
+    setTimeout(function () {
+        fuzzyMatchUpdateQueryStringParameterFun();
+        langReplace = window.lang.replace;
+        localLang = window.lang;
+        translateFun();
+    }, 50)
+})
+function translateFun() {
+    var langReplace = window.lang.replace;
+    var localLang = window.lang;
+    $('#title2').html(langReplace(localLang.demoModule.title2));
+    $('.rule_content').attr('style', langReplace(localLang.demoModule.img7));
+}

view/molistar/modules/weekStar/local/ar.js

@@ -1,5 +1,23 @@
 // 阿拉伯
 langAr = {
     // 模块
-    demoModule: {}
+    demoModule: {
+        title: "ترتيب النجوم",
+        text2: "العد التنازلي:",
+        title2: "قواعد النشاط",
+        text3: "مكان شاغر",
+        text4: "قيمة السحر:",
+        text5: "قيمة البطولة:",
+        text6: "عشرة آلاف",
+        text7: "غير مصنف",
+        text8: "أيام",
+        img: "background: url(./images/newimages/header-ar.png) no-repeat;background-size: 100% 100%;",
+        img2: "./images/newimages/rule-ar.png",
+        img3: "background: url(./images/newimages/tab1_A-ar.png) no-repeat;background-size: 100% 100%;",
+        img4: "background: url(./images/newimages/tab2_B-ar.png) no-repeat;background-size: 100% 100%;",
+        img5: "background: url(./images/newimages/stab_B-ar.png) no-repeat;background-size: 100% 100%;",
+        img6: "background: url(./images/newimages/stab_A-ar.png) no-repeat;background-size: 100% 100%;",
+        img7: "background: url(./images/newimages/rule_content-ar.png) no-repeat;background-size: 100% 100%;"
+
+    }
 }

view/molistar/modules/weekStar/local/en.js

@@ -1,5 +1,23 @@
 // 英文
 langEn = {
     // 模块
-    demoModule: {}
+    demoModule: {
+        title: "Star Ranking",
+        text2: "Countdown:",
+        title2: "Activity Rules",
+        text3: "Vacancy",
+        text4: "Charm Value:",
+        text5: "Heroic Value:",
+        text6: "Ten Thousand",
+        text7: "Not Ranked",
+        text8: "Days",
+        img: "background: url(./images/newimages/header-en.png) no-repeat;background-size: 100% 100%;",
+        img2: "./images/newimages/rule-en.png",
+        img3: "background: url(./images/newimages/tab1_A-en.png) no-repeat;background-size: 100% 100%;",
+        img4: "background: url(./images/newimages/tab2_B-en.png) no-repeat;background-size: 100% 100%;",
+        img5: "background: url(./images/newimages/stab_A-en.png) no-repeat;background-size: 100% 100%;",
+        img6: "background: url(./images/newimages/stab_B-en.png) no-repeat;background-size: 100% 100%;",
+        img7: "background: url(./images/newimages/rule_content-en.png) no-repeat;background-size: 100% 100%;"
+
+    }
 }

view/molistar/modules/weekStar/local/zh.js

@@ -1,5 +1,22 @@
 // 中文
 langZh = {
     // 模块
-    demoModule: {}
+    demoModule: {
+        title: "周星榜",
+        text2: "倒计时：",
+        title2: "活動規則",
+        text3: "虛位以待",
+        text4: "魅力值:",
+        text5: "豪氣值:",
+        text6: "萬",
+        text7: "未上榜",
+        text8: "天",
+        img: `background: url(./images/newimages/header.png) no-repeat;background-size: 100% 100%;`,
+        img2: `./images/newimages/rule.png`,
+        img3: `background: url(./images/newimages/tab1_A.png) no-repeat;background-size: 100% 100%;`,
+        img4: `background: url(./images/newimages/tab2_B.png) no-repeat;background-size: 100% 100%;`,
+        img5: `background: url(./images/newimages/stab_A.png) no-repeat;background-size: 100% 100%;`,
+        img6: `background: url(./images/newimages/stab_B.png) no-repeat;background-size: 100% 100%;`,
+        img7: `background: url(./images/newimages/rule_content.png) no-repeat;background-size: 100% 100%;`,
+    }
 }

view/molistar/modules/weekStar/newDetail.html

@@ -5,7 +5,8 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>活動規則</title>
+    <title id="title2"></title>
+    <!-- 活動規則 -->
     <link rel="stylesheet" href="../../common/css/reset.css">
     <link rel="stylesheet" href="./css/newWeekStar.css">
     <script src="../../common/js/flexible.js"></script>
@@ -15,4 +16,13 @@
     <div class="rule_content"></div>
 </body>
 
-</html>
+</html>
+<script src="../../common/js/jquery-3.2.1.min.js"></script>
+<script src="../../common/js/common2.js"></script>
+<script src="../../common/js/layer.js"></script>
+<script src="../../common/js/vconsole.min.js"></script>
+<script src="./local/ar.js"></script>
+<script src="./local/en.js"></script>
+<script src="./local/zh.js"></script>
+<script src="./js/newWeekStar2.js"></script>
+<script src="../../common/local/langHandler.js"></script>

view/molistar/modules/weekStar/newWeekStar.html

@@ -5,7 +5,8 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>周星榜</title>
+    <title id="title"></title>
+    <!-- 周星榜 -->
     <link rel="stylesheet" href="../../common/css/reset.css">
     <link rel="stylesheet" href="./css/newWeekStar.css">
     <script src="../../common/js/flexible.js"></script>
@@ -25,7 +26,7 @@
     <div class="box">
         <!-- 时间 -->
         <div class="time">
-            倒计时：<span></span>
+            <b id="text2"></b><span></span>
         </div>
         <!-- 礼物名称列表 -->
         <div class="giftListBox">
@@ -94,7 +95,7 @@
 <script src="./local/ar.js"></script>
 <script src="./local/en.js"></script>
 <script src="./local/zh.js"></script>
-<script src="./js/newWeekStar.js?v=1.0"></script>
+<script src="./js/newWeekStar.js?v=1.1"></script>
 <script src="../../common/local/langHandler.js"></script>
 
 </html>