更改时间字段

view/molistar/activity/2024-invitationFission/css/index.css

@@ -32,7 +32,7 @@ body {
 
 .header {
   width: 10rem;
-  height: 10.02667rem;
+  height: 10.01333rem;
   background: url(../images/header.png) no-repeat;
   background-size: 100% 100%;
   margin: 0 auto 0;
@@ -43,9 +43,9 @@ body {
   position: absolute;
   left: 52%;
   transform: translateX(-50%);
-  top: 3.64rem;
-  height: 1.30667rem;
-  width: 6.48rem;
+  top: 3.76rem;
+  height: 1.70667rem;
+  width: 7.38667rem;
 }
 
 .header .rule_rule {
@@ -55,7 +55,7 @@ body {
   font-size: 0.34667rem;
   font-weight: bold;
   position: absolute;
-  top: 1rem;
+  top: 8.92rem;
   right: 0rem;
   color: #703900;
   box-sizing: border-box;
@@ -114,7 +114,7 @@ body {
   height: 4.98667rem;
   background: url(../images/myInfo.png) no-repeat;
   background-size: 100% 100%;
-  margin: 1.12rem auto 0.26667rem;
+  margin: 0.66667rem auto 0rem;
   position: relative;
 }
 
@@ -159,6 +159,7 @@ body {
   font-weight: 400;
   background: url(../images/myInfoBut.png) no-repeat;
   background-size: 100% 100%;
+  display: none;
 }
 
 .bg .myInfo .skip img {
@@ -170,7 +171,8 @@ body {
 
 .bg .myInfo .copy {
   position: absolute;
-  right: 0.66667rem;
+  left: 50%;
+  transform: translateX(-50%);
   bottom: 0.66667rem;
   width: 3.92rem;
   height: 0.90667rem;
@@ -194,7 +196,7 @@ body {
   width: 9.36rem;
   height: 1.01333rem;
   position: relative;
-  margin: 0 auto 0.26667rem;
+  margin: 0.7rem auto 0.26667rem;
   background: url(../images/myIncomeBg.png) no-repeat;
   background-size: 100% 100%;
 }
@@ -227,6 +229,19 @@ body {
   font-size: 0.48rem;
 }
 
+.bg .myIncome .text {
+  width: 2.4rem;
+  height: 0.65rem;
+  line-height: 0.65rem;
+  position: absolute;
+  left: 2.9rem;
+  top: 0.2rem;
+  text-align: center;
+  color: #312200;
+  font-size: 0.37333rem;
+  font-weight: 600;
+}
+
 .bg .ul_pub {
   width: 100%;
   height: 100vh;
@@ -359,6 +374,7 @@ body {
   display: flex;
   justify-content: space-between;
   margin: 0 auto 0rem;
+  white-space: nowrap;
 }
 
 .bg .ul_pub .incomeBox .sTab div {
@@ -387,13 +403,14 @@ body {
 .bg .ul_pub .incomeBox .tableTitle {
   width: 8.8rem;
   display: flex;
-  justify-content: space-between;
+  justify-content: space-around;
   margin-bottom: 0;
   position: absolute;
   top: 6.15rem;
   left: 50%;
   transform: translateX(-50%);
   z-index: 2;
+  white-space: nowrap;
 }
 
 .bg .ul_pub .incomeBox .tableTitle div {
@@ -408,8 +425,8 @@ body {
 
 .bg .ul_pub .incomeBox ul {
   width: 8.8rem;
-  height: 6rem;
-  margin: 0 auto 0;
+  height: 5.5rem;
+  margin: 0.8rem auto 0;
   overflow-y: scroll;
   position: relative;
 }
@@ -444,11 +461,7 @@ body {
   height: 0.66667rem;
   margin-bottom: 0.24rem;
   display: flex;
-  justify-content: space-between;
-}
-
-.bg .ul_pub .incomeBox ul li:nth-child(1) {
-  margin-top: 0.66667rem;
+  justify-content: space-around;
 }
 
 .bg .ul_pub .incomeBox ul li div {
@@ -482,7 +495,7 @@ body {
 
 .bg .rule {
   width: 9.74667rem;
-  height: 23.74667rem;
+  height: 18.8rem;
   margin: 0 auto 1.33333rem;
   position: relative;
   background: url(../images/ruleBoxBg.png) no-repeat;
@@ -704,7 +717,7 @@ body {
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
-  top: 14.56rem;
+  top: 9.56rem;
   z-index: 2;
 }
 
@@ -725,7 +738,7 @@ body {
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
-  top: 15.6rem;
+  top: 10.6rem;
   z-index: 2;
 }
 
@@ -746,7 +759,7 @@ body {
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
-  top: 16.4rem;
+  top: 11.4rem;
   z-index: 2;
 }
 
@@ -767,7 +780,7 @@ body {
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
-  top: 17.15rem;
+  top: 12.15rem;
   z-index: 2;
 }
 
@@ -788,7 +801,7 @@ body {
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
-  top: 19.8rem;
+  top: 14.8rem;
   z-index: 2;
 }
 
@@ -809,7 +822,7 @@ body {
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
-  top: 20.8rem;
+  top: 15.8rem;
   z-index: 2;
 }
 
@@ -830,7 +843,7 @@ body {
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
-  top: 21.7rem;
+  top: 16.7rem;
   z-index: 2;
 }
 
@@ -1042,3 +1055,11 @@ body {
   top: 50%;
   transform: translate(-50%, -50%);
 }
+
+.Turkiye .bg .ul_pub .incomeBox .sTab div {
+  font-size: 0.24rem;
+}
+
+.Turkiye .bg .ul_pub .incomeBox .tableTitle div {
+  font-size: 0.24rem;
+}

view/molistar/activity/2024-invitationFission/css/index.scss

@@ -38,7 +38,7 @@ body {
 
 .header {
     width: px2rem(750);
-    height: px2rem(752);
+    height: px2rem(751);
     background: url(../images/header.png) no-repeat;
     background-size: 100% 100%;
     margin: 0 auto 0;
@@ -48,9 +48,9 @@ body {
         position: absolute;
         left: 52%;
         transform: translateX(-50%);
-        top: px2rem(273);
-        height: px2rem(98);
-        width: px2rem(486);
+        top: px2rem(282);
+        height: px2rem(128);
+        width: px2rem(554);
     }
 
     .rule_rule {
@@ -60,7 +60,7 @@ body {
         font-size: px2rem(26);
         font-weight: bold;
         position: absolute;
-        top: 1rem;
+        top: 8.92rem;
         right: 0rem;
         color: #703900;
         box-sizing: border-box;
@@ -124,7 +124,7 @@ body {
         height: px2rem(374);
         background: url(../images/myInfo.png) no-repeat;
         background-size: 100% 100%;
-        margin: px2rem(84) auto px2rem(20);
+        margin: px2rem(50) auto px2rem(0);
         position: relative;
 
         .tx {
@@ -168,6 +168,7 @@ body {
             font-weight: 400;
             background: url(../images/myInfoBut.png) no-repeat;
             background-size: 100% 100%;
+            display: none;
 
             img {
                 display: inline-block;
@@ -179,7 +180,8 @@ body {
 
         .copy {
             position: absolute;
-            right: px2rem(50);
+            left: 50%;
+            transform: translateX(-50%);
             bottom: px2rem(50);
             width: px2rem(294);
             height: px2rem(68);
@@ -204,7 +206,7 @@ body {
         width: px2rem(702);
         height: px2rem(76);
         position: relative;
-        margin: 0 auto px2rem(20);
+        margin: 0.7rem auto px2rem(20);
         background: url(../images/myIncomeBg.png) no-repeat;
         background-size: 100% 100%;
 
@@ -235,6 +237,19 @@ body {
             color: #0C0538;
             font-size: px2rem(36);
         }
+
+        .text {
+            width: 2.4rem;
+            height: 0.65rem;
+            line-height: 0.65rem;
+            position: absolute;
+            left: 2.9rem;
+            top: 0.2rem;
+            text-align: center;
+            color: #312200;
+            font-size: px2rem(28);
+            font-weight: 600;
+        }
     }
 
     .ul_pub {
@@ -375,6 +390,7 @@ body {
                 display: flex;
                 justify-content: space-between;
                 margin: 0 auto px2rem(0);
+                white-space: nowrap;
 
                 div {
                     width: 50%;
@@ -403,13 +419,14 @@ body {
             .tableTitle {
                 width: px2rem(660);
                 display: flex;
-                justify-content: space-between;
+                justify-content: space-around;
                 margin-bottom: 0;
                 position: absolute;
                 top: 6.15rem;
                 left: 50%;
                 transform: translateX(-50%);
                 z-index: 2;
+                white-space: nowrap;
                 // background: #fff;
 
                 div {
@@ -425,8 +442,8 @@ body {
 
             ul {
                 width: px2rem(660);
-                height: 6rem;
-                margin: 0 auto 0;
+                height: 5.5rem;
+                margin: 0.8rem auto 0;
                 overflow-y: scroll;
                 position: relative;
 
@@ -460,10 +477,10 @@ body {
                     height: px2rem(50);
                     margin-bottom: px2rem(18);
                     display: flex;
-                    justify-content: space-between;
+                    justify-content: space-around;
 
                     &:nth-child(1) {
-                        margin-top: px2rem(50);
+                        // margin-top: px2rem(50);
                     }
 
                     div {
@@ -502,7 +519,7 @@ body {
 
     .rule {
         width: px2rem(731);
-        height: px2rem(1781);
+        height: px2rem(1410);
         // border-radius: px2rem(20);
         // border: px2rem(4) solid #FE7835;
         margin: 0 auto px2rem(100);
@@ -727,7 +744,7 @@ body {
                 position: absolute;
                 left: 50%;
                 transform: translateX(-50%);
-                top: 14.56rem;
+                top: 9.56rem;
                 z-index: 2;
 
                 div {
@@ -748,7 +765,7 @@ body {
                 position: absolute;
                 left: 50%;
                 transform: translateX(-50%);
-                top: 15.6rem;
+                top: 10.6rem;
                 z-index: 2;
 
                 div {
@@ -769,7 +786,7 @@ body {
                 position: absolute;
                 left: 50%;
                 transform: translateX(-50%);
-                top: 16.4rem;
+                top: 11.4rem;
                 z-index: 2;
 
                 div {
@@ -790,7 +807,7 @@ body {
                 position: absolute;
                 left: 50%;
                 transform: translateX(-50%);
-                top: 17.15rem;
+                top: 12.15rem;
                 z-index: 2;
 
                 div {
@@ -811,7 +828,7 @@ body {
                 position: absolute;
                 left: 50%;
                 transform: translateX(-50%);
-                top: 19.8rem;
+                top: 14.8rem;
                 z-index: 2;
 
                 div {
@@ -832,7 +849,7 @@ body {
                 position: absolute;
                 left: 50%;
                 transform: translateX(-50%);
-                top: 20.8rem;
+                top: 15.8rem;
                 z-index: 2;
 
                 div {
@@ -853,7 +870,7 @@ body {
                 position: absolute;
                 left: 50%;
                 transform: translateX(-50%);
-                top: 21.7rem;
+                top: 16.7rem;
                 z-index: 2;
 
                 div {
@@ -1040,30 +1057,47 @@ body {
         color: #89421A;
     }
 }
-.arabic{
-    .bg .ul_pub .incomeBox .sTab div{
+
+.arabic {
+    .bg .ul_pub .incomeBox .sTab div {
         font-size: px2rem(18);
     }
-    .header .rule_rule{
+
+    .header .rule_rule {
         font-size: px2rem(20);
         text-indent: -10px;
     }
-    .bg .rule .rule2 .table2_2{
+
+    .bg .rule .rule2 .table2_2 {
         width: 9rem;
     }
-    .bg .rule .rule2 .table1_3_div{
+
+    .bg .rule .rule2 .table1_3_div {
         font-size: px2rem(10);
     }
 }
-.toatstsEnd{
+
+.toatstsEnd {
     padding: px2rem(20) px2rem(30);
     text-align: center;
     color: #fff;
     font-size: px2rem(24);
     position: fixed;
     z-index: 99999;
-    background: rgba(0,0,0,.8);
+    background: rgba(0, 0, 0, .8);
     left: 50%;
     top: 50%;
-    transform: translate(-50%,-50%);
+    transform: translate(-50%, -50%);
+}
+
+.Turkiye {
+    .bg .ul_pub .incomeBox .sTab div {
+        font-size: px2rem(18);
+    }
+
+    .bg .ul_pub .incomeBox .tableTitle {
+        div {
+            font-size: px2rem(18);
+        }
+    }
 }

view/molistar/activity/2024-invitationFission/index.html

@@ -18,19 +18,19 @@
     </div>
     <!-- 頭部 -->
     <div class="header">
-        <img id="img1" src="./images/header_h3.png" alt="" class="h3">
+        <img id="img1" src="./images/header_h3-tr.png" alt="" class="h3">
         <div class="rule_rule text67"></div>
-        <div id="text1" class="text"></div>
+        <!-- <div id="text1" class="text"></div> -->
         <!-- <img src="./images/gold.png" alt=""> -->
     </div>
     <!-- 容器 -->
     <div class="bg">
         <!-- 自己信息 -->
-        <div class="myInfo">
+        <div class="myInfo" >
             <img src="./images/logo.png" alt="" class="tx">
             <p id="text2"></p>
             <b class="invitationCode"></b>
-            <div class="skip img5" >
+            <div class="skip img5">
                 <!-- <img src="./images/skip.png" alt=""> <b id="text3"></b> -->
             </div>
             <div class="copy img6" id="copy">
@@ -42,6 +42,7 @@
             <img src="./images/gold.png" alt="">
             <p id="text5"></p>
             <b>0</b>
+            <div class="text myIncomeText"></div>
         </div>
         <!-- 收益tab -->
 
@@ -179,14 +180,14 @@
                     </div> -->
                 </div>
             </div>
-            <div class="wishingStar" id="text28"></b></a>
+            <div class="wishingStar" style="display: none;" id="text28"></b></a>
             </div>
         </div>
     </div>
     <!-- 展開分享 -->
     <div class="openShare" id="text31"></div>
     <!-- 保存二維碼 -->
-    <div class="code">
+    <div class="code" style="display: none;">
         <div class="rule_icon"></div>
         <div class="p1" id="text32"></div>
         <div class="p2" id="text33"></div>
@@ -227,5 +228,6 @@
 <script src="./local/en.js?v=1.1"></script>
 <script src="./local/zh.js?v=1.1"></script>
 <script src="./local/ar.js?v=1.2"></script>
+<script src="./local/tr.js?v=1.2"></script>
 <script src="./js/index.js?v=1.4"></script>
 <script src="../../common/local/langHandler.js"></script>

view/molistar/activity/2024-invitationFission/js/index.js

@@ -113,8 +113,9 @@ function translateFun() {
     $('#text32').html(langReplace(localLang.demoModule.text32));
     $('#text33').html(langReplace(localLang.demoModule.text33));
     $('#text34').html(langReplace(localLang.demoModule.text34));
-    $('#text66').html(langReplace(localLang.demoModule.text66));
+    // $('#text66').html(langReplace(localLang.demoModule.text66));
     $('.text67').text(langReplace(localLang.demoModule.text67));
+    $('.bg .myIncome .text').text(langReplace(localLang.demoModule.myIncomeText));
     $('#img1').attr('src', langReplace(localLang.demoModule.img1))
     $('#img2').attr('src', langReplace(localLang.demoModule.img2))
     $('#img3').attr('src', langReplace(localLang.demoModule.img3))
@@ -168,6 +169,30 @@ function getConfig() {
         }
     })
 }
+// 领取接口
+function inviteReceive() {
+    showLoading()
+    networkRequest({
+        type: 'post',
+        url: urlPrefix + '/user/invite/receive',
+        success(res) {
+            if (res.code === 200) {
+                getMySelf();
+                toastMsg(langReplace(localLang.demoModule.claimed));
+            } else {
+                toastMsg(res.message)
+            }
+            hideLoading(layerIndex)
+        },
+        error(err) {
+            hideLoading(layerIndex)
+            toastMsg(langReplace(localLang.share.text8))
+        }
+    })
+}
+$('.bg .myIncome .text').click(function(){
+    inviteReceive();
+})
 // 獲取收益接口
 function getMySelf() {
     showLoading()
@@ -327,8 +352,8 @@ function profitPage() {
                             str += `
                             <li>
                                 <div class="act">
-                                    <p>${dateFormat(res.createTime, 'yyyy-MM-dd')}</p>
-                                    <b>${dateFormat(res.createTime, 'hh:mm:ss')}</b>
+                                    <p>${res.inviteTimeYMD}</p>
+                                    <b>${res.inviteTimeHMS}</b>
                                 </div>
                                 <div>+${res.rewardNum} <img src="./images/${res.rewardType == 1 ? 'diamond' : 'magicStick'}.png" alt=""></div>
                                 <div>${res.type == 1 && res.rewardType == 1 ? langReplace(localLang.demoModule.text52) : res.type == 3 && res.rewardType == 1 ? langReplace(localLang.demoModule.text53) : res.type == 3 && res.rewardType == 2 ? langReplace(localLang.demoModule.text54) : langReplace(localLang.demoModule.text55)}</div>
@@ -344,14 +369,14 @@ function profitPage() {
                             str += `
                             <li>
                                 <div class="act">
-                                    <p>${dateFormat(res.createTime, 'yyyy-MM-dd')}</p>
-                                    <b>${dateFormat(res.createTime, 'hh:mm:ss')}</b>
+                                    <p>${res.inviteTimeYMD}</p>
+                                    <b>${res.inviteTimeHMS}</b>
                                 </div>
                                 <div>+${res.rewardNum} <img src="./images/${res.rewardType == 1 ? 'diamond' : 'magicStick'}.png" alt=""></div>
                                 <div>${res.type == 1 && res.rewardType == 1 ? langReplace(localLang.demoModule.text52) : res.type == 3 && res.rewardType == 1 ? langReplace(localLang.demoModule.text53) : res.type == 3 && res.rewardType == 2 ? langReplace(localLang.demoModule.text54) : langReplace(localLang.demoModule.text55)}</div>
                                 <div class="act">
-                                    <p>${res.inviteNick}</p>
-                                    <b>ID:${res.inviteErBanNo}</b>
+                                    <p>${res.inviteNick[0]+'*****'}</p>
+                                    <b>ID:******</b>
                                 </div>
                             </li>
                             `
@@ -385,10 +410,10 @@ function userPage() {
                 var str = '';
                 if (text == langReplace(localLang.demoModule.text39) && typeStr == "1") {
                     $('.bg .incomeBox .tableTitle div').remove();
-                    $('.bg .incomeBox .tableTitle').append(`<div>${langReplace(localLang.demoModule.text56)}</div><div>${langReplace(localLang.demoModule.text57)}</div><div>${langReplace(localLang.demoModule.text58)}</div>`);
+                    $('.bg .incomeBox .tableTitle').append(`<div>${langReplace(localLang.demoModule.text56)}</div><div>${langReplace(localLang.demoModule.text57)}</div>`);
                 } else if (text == langReplace(localLang.demoModule.text40) && typeStr == "2") {
                     $('.bg .incomeBox .tableTitle div').remove();
-                    $('.bg .incomeBox .tableTitle').append(`<div>${langReplace(localLang.demoModule.text59)}</div><div>${langReplace(localLang.demoModule.text60)}</div><div style="font-size: 0.24rem;">${langReplace(localLang.demoModule.text61)}</div><div>${langReplace(localLang.demoModule.text62)}</div>`);
+                    $('.bg .incomeBox .tableTitle').append(`<div>${langReplace(localLang.demoModule.text59)}</div><div>${langReplace(localLang.demoModule.text60)}</div><div style="font-size: 0.24rem;">${langReplace(localLang.demoModule.text61)}</div>`);
                 }
                 if (res.data.records.length == 0) {
                     if (page == 1) {
@@ -407,14 +432,15 @@ function userPage() {
                             str += `
                             <li>
                                 <div class="act">
-                                    <p>${dateFormat(res.createTime, 'yyyy-MM-dd')}</p>
-                                    <b>${dateFormat(res.createTime, 'hh:mm:ss')}</b>
+                                    <p>${res.inviteTimeYMD}</p>
+                                    <b>${res.inviteTimeHMS}</b>
                                 </div>
                                 <div class="act">
                                     <p>${res.inviteNick}</p>
                                     <b>ID:${res.inviteErBanNo}</b>
                                 </div>
-                                <div>${res.charge30Amount ? res.charge30Amount : 0} <img src="./images/gold.png" alt=""></div>
+                                <!-- <div>${res.charge30Amount ? res.charge30Amount : 0} <img src="./images/gold.png" alt=""></div> -->
+                                
                             </li>
                             `
                         });
@@ -423,18 +449,18 @@ function userPage() {
                             str += `
                             <li>
                                 <div class="act">
-                                    <p>${dateFormat(res.createTime, 'yyyy-MM-dd')}</p>
-                                    <b>${dateFormat(res.createTime, 'hh:mm:ss')}</b>
+                                    <p>${res.inviteTimeYMD}</p>
+                                    <b>${res.inviteTimeHMS}</b>
                                 </div>
                                 <div class="act">
                                     <p>${res.inviteNick}</p>
                                     <b>ID:${res.inviteErBanNo}</b>
                                 </div>
                                 <div class="act">
-                                    <p>${res.indirectNick}</p>
-                                    <b>ID:${res.indirectErBanNo}</b>
+                                    <p>${typeStr == "2" ? res.indirectNick[0] + '*****' : res.indirectNick}</p>
+                                    <b>ID:******</b>
                                 </div>
-                                <div>${res.charge30Amount ? res.charge30Amount : 0} <img src="./images/gold.png" alt=""></div>
+                                <!-- <div>${res.charge30Amount ? res.charge30Amount : 0} <img src="./images/gold.png" alt=""></div> -->
                             </li>
                             `
                         });

view/molistar/activity/2024-invitationFission/local/ar.js

@@ -2,7 +2,7 @@
 langAr = {
     // 模块
     demoModule: {
-        endTimes:'انتهاء الفعالية',
+        endTimes: 'انتهاء الفعالية',
         img1: `./images/header_h3-ar.png`,
         img2: `./images/rule_rule-ar.png`,
         img3: `./images/rule1_in-ar.png`,
@@ -83,39 +83,42 @@ langAr = {
         text61: `المستخدم غير مباشر`,
         text62: `شحن في 30 يومًا`,
         text66: `<div class="table1_1">
-                    <div style="line-height: 0.4rem;">مبلغ الشحن<br>(خلال 30 يومًا، الوحدة: العملات)</div>
-                    <div>الأرباح</div>
-                </div>
-                <div class="table1_2">
-                    <div>الشحن &lt;10000</div>
-                    <div style="line-height: 0.4rem;">سيحصل المدعو المباشر علي ٢ عصا سحرية,وستحصل أنت علي ١ عصا سحرية</div>
-                </div>
-                <div class="table1_3">
-                    <div>10000 ≤ الشحن &lt;50000</div>
-                    <div class="table1_3_div" style="line-height: 0.4rem;">في كل مرة سيشحن المدعو المباشر 1000 عملة ذهبية ستحصل انت علي مكافأة 30 عملة أي(3٪)</div>
-                </div>
-                <div class="table1_4">
-                    <div>الشحن ≥50000 </div>
-                    <div style="line-height: 0.4rem;">عن كل 1000 شحن من قبل المستخدم المدعو مباشرة، أنت +50 (5.00%)</div>
-                </div>
-                <div class="table2_1">
-                    <div style="line-height: 0.4rem;">مبلغ الشحن<br>(خلال 30 يومًا، الوحدة: العملات)</div>
-                    <div>الأرباح</div>
-                </div>
-                <div class="table2_2">
-                    <div>10000 ≤ الشحن &lt;50000</div>
-                    <div style="line-height: 0.4rem;" class="table1_3_div">في كل مرة سيشحن المدعو الغير المباشر 1000 عملة ذهبية ستحصل انت علي مكافأة ١٠ عملات ذهبية أي(١٪)</div>
-                </div>
-                <div class="table2_3">
-                    <div>الشحن ≥50000</div>
-                    <div style="line-height: 0.34rem;"  class="table1_3_div">في كل مرة سيشحن المدعو الغير المباشر 1000 عملة ذهبية ستحصل انت علي مكافأة ٢٠ عملة ذهبية أي(٢٪)</div>
-                </div>`,
+        <div style="line-height: 0.4rem;font-size: 0.2rem;">مقدار الإيداع الفردي<br> (الوقت: خلال 30 يومًا، الوحدة: العملات الذهبية)</div>
+        <div>الأرباح المكتسبة</div>
+    </div>
+    <div class="table1_2">
+        <div>إيداع < 70000 عملة ذهبية</div>
+        <div style="line-height: 0.4rem;font-size: 0.2rem;">عند قيام الشخص المدعو مباشرةً بالإيداع، ستحصل على مكافأة بنسبة 1% من مبلغ الإيداع;</div>
+    </div>
+    <div class="table1_3">
+        <div style="line-height: 0.4rem;">70000 عملة ذهبية ≤ إيداع < 700000 عملة ذهبية</div>
+        <div style="line-height: 0.4rem;font-size: 0.15rem;">عند قيام الشخص المدعو مباشرةً بالإيداع أكثر من 70000 عملة ذهبية، ستحصل على مكافأة بنسبة 2% من مبلغ الإيداع;</div>
+    </div>
+    <div class="table1_4">
+        <div>إيداع ≥ 700000 عملة ذهبية</div>
+        <div style="line-height: 0.4rem;font-size: 0.15rem;">عند قيام الشخص المدعو مباشرةً بالإيداع أكثر من 700000 عملة ذهبية، ستحصل على مكافأة بنسبة 4% من مبلغ الإيداع;</div>
+    </div>
+    <div class="table2_1">
+        <div style="line-height: 0.4rem;font-size: 0.2rem;">مقدار الإيداع الفردي<br> (الوقت: خلال 30 يومًا، الوحدة: العملات الذهبية)</div>
+        <div>الأرباح المكتسبة</div>
+    </div>
+    <div class="table2_2">
+        <div style="line-height: 0.4rem;">70000 عملة ذهبية ≤ إيداع < 700000 عملة ذهبية</div>
+        <div style="line-height: 0.4rem;font-size: 0.15rem;">عند قيام الشخص المدعو غير مباشر بالإيداع أكثر من 70000 عملة ذهبية، ستحصل على مكافأة بنسبة 0.5% من مبلغ الإيداع;</div>
+    </div>
+    <div class="table2_3">
+        <div>إيداع ≥ 700000 عملة ذهبية</div>
+        <div style="line-height: 0.34rem;font-size: 0.15rem;">عند قيام الشخص المدعو غير مباشر بالإيداع أكثر من 700000 عملة ذهبية، ستحصل على مكافأة بنسبة 1% من مبلغ الإيداع;</div>
+    </div>
+    `,
 
         text67: `تفاصيل الأرباح`,
         img5: `background: url(./images/myInfoBut-ar.png) no-repeat;background-size: 100% 100%;`,
         img6: `background: url(./images/myInfoBut2-ar.png) no-repeat;background-size: 100% 100%;`,
         img7: `background: url(./images/ruleBoxBg-ar.png) no-repeat;background-size: 100% 100%;`,
         img8: `./images/rule_inNew-ar.png`,
+        myIncomeText: `الحصول`,
+        claimed:'تم الاستلام بنجاح',
     },
     share: {
         img1: `background: url(./images/share/header-ar.png) no-repeat;background-size: 100% 100%;`,

view/molistar/activity/2024-invitationFission/local/en.js

@@ -83,38 +83,41 @@ langEn = {
         text61: `Indirect Invitee`,
         text62: `30-Day Top-Up`,
         text66: `<div class="table1_1">
-                    <div style="line-height: 0.4rem;">Top-Up Amount<br>(Within 30 Days, Unit: Coins)</div>
-                    <div>Earnings</div>
-                </div>
-                <div class="table1_2">
-                    <div>Top-Up &lt;10000</div>
-                    <div style="line-height: 0.4rem;">Directly Invited User +2 Magic Wands, You +1 Magic Wand</div>
-                </div>
-                <div class="table1_3">
-                    <div>10000≤ Top-Up &lt;50000</div>
-                    <div style="line-height: 0.4rem;">For every 1000 top-up by Directly Invited User, You +30 (3.00%)</div>
-                </div>
-                <div class="table1_4">
-                    <div>Top-Up ≥50000 </div>
-                    <div style="line-height: 0.4rem;">For every 1000 top-up by Directly Invited User, You +50 (5.00%)</div>
-                </div>
-                <div class="table2_1">
-                    <div style="line-height: 0.4rem;">Top-Up Amount<br>(Within 30 Days, Unit: Coins)</div>
-                    <div>Earnings</div>
-                </div>
-                <div class="table2_2">
-                    <div>10000≤ Top-Up &lt;50000</div>
-                    <div style="line-height: 0.4rem;">For every 1000 top-up by Indirectly Invited User, You +10 (1.00%)</div>
-                </div>
-                <div class="table2_3">
-                    <div>Top-Up ≥50000</div>
-                    <div style="line-height: 0.34rem;">For every 1000 top-up by Indirectly Invited User, You +20 (2.00%)</div>
-                </div>`,
+        <div style="line-height: 0.4rem;">Single Deposit Amount<br> (Time: Within 30 days, Unit: Gold Coins)</div>
+        <div>Earnings</div>
+    </div>
+    <div class="table1_2">
+        <div>Deposit < 70000 Gold Coins</div>
+        <div style="line-height: 0.4rem;font-size: 0.15rem;">For each deposit made by the directly invited person, you earn 1% of the deposited amount as reward;</div>
+    </div>
+    <div class="table1_3">
+        <div>70000 Gold Coins ≤ Deposit < 700000 Gold Coins</div>
+        <div style="line-height: 0.4rem;font-size: 0.15rem;">For each deposit made by the directly invited person exceeding 70000 Gold Coins, you earn 2% of the deposited amount as reward;</div>
+    </div>
+    <div class="table1_4">
+        <div>Deposit ≥ 700000 Gold Coins</div>
+        <div style="line-height: 0.4rem;font-size: 0.2rem;">For each deposit made by the directly invited person exceeding 700000 Gold Coins, you earn 4% of the deposited amount as reward;</div>
+    </div>
+    <div class="table2_1">
+        <div style="line-height: 0.4rem;">Single Deposit Amount<br> (Time: Within 30 days, Unit: Gold Coins)</div>
+        <div>Earnings</div>
+    </div>
+    <div class="table2_2">
+        <div>70000 Gold Coins ≤ Deposit < 700000 Gold Coins</div>
+        <div style="line-height: 0.4rem;">For each deposit made by the indirectly invited person exceeding 70000 Gold Coins, you earn 0.5% of the deposited amount as reward;</div>
+    </div>
+    <div class="table2_3">
+        <div>Deposit ≥ 700000 Gold Coins</div>
+        <div style="line-height: 0.34rem;">For each deposit made by the indirectly invited person exceeding 700000 Gold Coins, you earn 1% of the deposited amount as reward;</div>
+    </div>
+    `,
         text67: `Profit `,
         img5: `background: url(./images/myInfoBut-en.png) no-repeat;background-size: 100% 100%;`,
         img6: `background: url(./images/myInfoBut2-en.png) no-repeat;background-size: 100% 100%;`,
         img7: `background: url(./images/ruleBoxBg-en.png) no-repeat;background-size: 100% 100%;`,
         img8: `./images/rule_inNew-en.png`,
+        myIncomeText: `Obtain`,
+        claimed:'Successfully claimed',
     },
     share: {
         img1: `background: url(./images/share/header-en.png) no-repeat;background-size: 100% 100%;`,

view/molistar/activity/2024-invitationFission/local/tr.js

@@ -0,0 +1,142 @@
+// 英文
+langTr = {
+    // 模块
+    demoModule: {
+        endTimes: 'Etkinlik sona erdi',
+        img1: `./images/header_h3-tr.png`,
+        img2: `./images/rule_rule-tr.png`,
+        img3: `./images/rule1_in-tr.png`,
+        img4: `./images/rule_2in-tr.png`,
+        title: `Davet Ederek Coin Kazan`,
+        text1: `Her davet için <b>500</b> <img src="./images/gold.png" alt=""> kazan`,
+        text2: `Benim Kodum`,
+        text3: `Arkadaşlarla Paylaş`,
+        text4: `Davet Kodunu Kopyala`,
+        text5: `Kazançlar`,
+        texts5: `Kazançlar`,
+        text6: `Doğrudan Davet Kazançları`,
+        text7: `Dolaylı Davet Kazançları`,
+        text8: `Doğrudan Davet Kazançları Kaydı`,
+        text9: `Doğrudan Davet Kullanıcı Kaydı`,
+        text10: `Zaman`,
+        text11: `Kazanç`,
+        text12: `Kazanç Türü`,
+        text13: `Davet Edilen Kullanıcı`,
+        text14: `Etkinlik Kuralları`,
+        text15: `Bir arkadaşı kaydettirerek başarıyla davet ederseniz, her iki taraf da 500 coin kazanır, sınırsız!`,
+        text16: `Davet Eden: Siz`,
+        text17: `Doğrudan Davet Edilen`,
+        text18: `Arkadaşlarınızı top-up yapmaya davet edin ve 30 gün boyunca %7'ye kadar geri ödeme kazanın!`,
+        text19: `Davet Eden: Siz`,
+        text20: `Doğrudan Davet Edilen`,
+        text21: `Dolaylı Davet Edilen`,
+        text22: `Doğrudan Davet Edilen: Davet kodunuzu kullanarak kaydolanlar`,
+        text23: `Dolaylı Davet Edilen: Kayıtlı arkadaşlarınız tarafından davet edilenler`,
+        text24: `Yatırım Tutarı`,
+        text25: `Kazançlar`,
+        text26: `Yatırım Tutarı`,
+        text27: `Kazançlar`,
+        text28: `*Büyülü asa, <a href="../../modules/act-wishingStar/index.html?lang=tr"><b>Dilek Yıldızı etkinliği>>`,
+        text29: `Diğer Talimatlar`,
+        text30: `<li class="title">Davet Ödüllerinin Dağıtımı Hakkında</li>
+            <li>1. Davet Edilen Kullanıcının Kazançları: Sistem, yeni kullanıcı davet kodunu doldurduktan sonra ödülleri ilgili hesaba otomatik olarak dağıtır.</li>
+            <li>2. Davet Edenin Kazançları: Sistem, yeni kullanıcı davet kodunu doldurduktan sonra ödülleri ilgili hesaba otomatik olarak dağıtır.</li>
+            <li>3. Yatırım Ödülü: Sadece doğrudan yapılan yatırımlar sayılır; Yeni kullanıcı davet kodunu doldurduktan sonra ilk 30 günlük yatırımlarını tamamladığında, bir büyülü asa ödülü kazanabilir, bu ödül, Dilek Yıldızı oyununda nadir hediyeler almak için kullanılabilir; Davet edenler belirli bir yatırım miktarını tamamlayarak ek kazançlar elde edebilir ve kazançlar gerçek zamanlı olarak yatırılır.</li>
+            <li class="title">Geçersiz Davetler Hakkında</li>
+            <li>1. Aynı cihaz, aynı telefon numarası ve aynı kimlik bilgileriyle kaydolan kullanıcılar aynı kullanıcı olarak kabul edilir ve ödüller tekrar verilemez; Eğer davet eden ve davet edilen aynı cihazı, kimlik bilgilerini ve telefon numarasını kullanıyorsa, davet eden ödül alamaz.</li>
+            <li>2. Her yeni kullanıcı yalnızca bir kez davet kodu doldurabilir ve doldurduktan sonra değiştirilemez, dikkat! Davet kodu daha sonra doldurulamaz, lütfen yeni kullanıcıyı kaydolurken davet kodunu zamanında doldurması için bilgilendirin, aksi takdirde bu davet geçersizdir.</li>
+            <li>3. Herhangi bir dolandırıcılık davranışı durumunda, resmi yetkililer dolandırıcıların elde ettiği tüm ödülleri iptal etme ve hesabı yasaklama hakkına sahiptir.</li>
+            <li>4. Sanal telefon numaraları ve yasaklı kullanıcılar etkinliğe katılamazlar.</li>
+            <li class="title">Diğerleri</li>
+            <li>1. Herhangi bir sorunuz varsa, lütfen WhatsApp ile iletişime geçin: 8618984433556</li>
+            <li>2. Bu etkinliğin nihai yorumlama hakkı resmiye aittir ve Apple Inc./Google Inc. ile ilgisi yoktur.</li>`,
+        text31: `QR Kodunu Paylaş >`,
+        text32: `Arkadaşlar QR Kodunu Tarayarak İndirip Kaydolabilir`,
+        text33: `Get <b>500</b><img src="./images/gold.png" alt="" class="diamond">`,
+        text34: `Yerel Olarak Kaydet`,
+        text35: `Doğrudan`,
+        text36: `Molistar'ı indirip Kaydınızı Yaparak 500 coin Kazanın!`,
+        text37: `Molistar, Kalp Atışıyla Tanışın`,
+        text38: `Molistar'da Sohbet Edin, Oyunlar Oynayın, Arkadaş Edinin, Her Zaman ve Her Yerde`,
+        text39: `Doğrudan`,
+        text40: `Dolaylı`,
+        text41: `Davet Kazançları Kaydı`,
+        text42: `Davet Edilen Kullanıcı Kaydı`,
+        text43: `Yok`,
+        text44: `Zaman`,
+        text45: `Kazanç`,
+        text46: `Kazanç Türü`,
+        text47: `Doğrudan Davet Edilen`,
+        text48: `Zaman`,
+        text49: `Kazanç`,
+        text50: `Kazanç Türü`,
+        text51: `Dolaylı Davet Edilen`,
+        text52: `Arkadaşları Kaydetmeye Davet Et`,
+        text53: `Arkadaşların Yatırım Geri Ödemesi`,
+        text54: `Arkadaşın İlk Yatırımı`,
+        text55: `Dolaylı Davet Yatırım Geri Ödemesi`,
+        text56: `Zaman`,
+        text57: `Doğrudan Davet Edilen`,
+        text58: `30 Günlük Yatırım`,
+        text59: `Zaman`,
+        text60: `Doğrudan Davet Edilen`,
+        text61: `Dolaylı Davet Edilen`,
+        text62: `30 Günlük Yatırım`,
+        text66: `<div class="table1_1">
+        <div style="line-height: 0.4rem;">Tek Yatırım Miktarı<br> (Zaman: Son 30 gün, Birim: Altın Paralar)</div>
+        <div>Kazanılan Gelir</div>
+    </div>
+    <div class="table1_2">
+        <div>Yatırım < 70000 Altın Para</div>
+        <div style="line-height: 0.4rem;">Doğrudan davet edilen kişi yatırım yaparsa, yatırılan miktarın %1'ini kazanırsınız;</div>
+    </div>
+    <div class="table1_3">
+        <div>70000 Altın Para ≤ Yatırım < 700000 Altın Para</div>
+        <div style="line-height: 0.4rem;">Doğrudan davet edilen kişi 70000 Altın Paradan fazla yatırım yaparsa, yatırılan miktarın %2'sini kazanırsınız;</div>
+    </div>
+    <div class="table1_4">
+        <div>Yatırım ≥ 700000 Altın Para</div>
+        <div style="line-height: 0.4rem;">Doğrudan davet edilen kişi 700000 Altın Paradan fazla yatırım yaparsa, yatırılan miktarın %4'ünü kazanırsınız;</div>
+    </div>
+    <div class="table2_1">
+        <div style="line-height: 0.4rem;">Tek Yatırım Miktarı<br> (Zaman: Son 30 gün, Birim: Altın Paralar)</div>
+        <div>Kazanılan Gelir</div>
+    </div>
+    <div class="table2_2">
+        <div>70000 Altın Para ≤ Yatırım < 700000 Altın Para</div>
+        <div style="line-height: 0.4rem;">Dolaylı davet edilen kişi 70000 Altın Paradan fazla yatırım yaparsa, yatırılan miktarın %0.5'ini kazanırsınız;</div>
+    </div>
+    <div class="table2_3">
+        <div>Yatırım ≥ 700000 Altın Para</div>
+        <div style="line-height: 0.34rem;">Dolaylı davet edilen kişi 700000 Altın Paradan fazla yatırım yaparsa, yatırılan miktarın %1'ini kazanırsınız;</div>
+    </div>
+    `,
+        text67: `Kar`,
+        img5: `background: url(./images/myInfoBut-tr.png) no-repeat;background-size: 100% 100%;`,
+        img6: `background: url(./images/myInfoBut2-tr.png) no-repeat;background-size: 100% 100%;`,
+        img7: `background: url(./images/ruleBoxBg-tr.png) no-repeat;background-size: 100% 100%;`,
+        img8: `./images/rule_inNew-tr.png`,
+        myIncomeText: `Kazan`,
+        claimed:'Başarıyla alındı',
+    },
+    share: {
+        img1: `background: url(./images/share/header-tr.png) no-repeat;background-size: 100% 100%;`,
+        img2: `background: url(./images/share/codeBg-tr.png) no-repeat;background-size: 100% 100%;`,
+        title: `Molistar'a katıl, eğlence seni bekliyor!`,
+        text1: `Molistar'da beklenmedik bağlantılar keşfet.`,
+        text2: `Sohbet et, oyun oyna ve Molistar'da her zaman, her yerde arkadaş edin.`,
+        xz_id: `Molistar'ı şimdi indir!`,
+        text4: `Molistar'a davet kodumla kaydol ve hemen 500 altın coin kazan!`,
+        text5: `Yükleniyor...`,
+        text6: `İşlem tamamlandı`,
+        text7: `Başarıyla kopyalandı`,
+        text8: `Ağ hatası, lütfen daha sonra tekrar deneyin`,
+        inviteCodes: `text-align: right;`,
+        imgs1: `./images/share/1-tr.png`,
+        imgs2: `./images/share/2-tr.png`,
+        imgs3: `./images/share/3-tr.png`,
+        imgs4: `./images/share/4-tr.png`,
+        imgs5: `./images/share/5-tr.png`,
+    }
+
+}

view/molistar/activity/2024-invitationFission/local/zh.js

@@ -2,7 +2,7 @@
 langZh = {
     // 模塊
     demoModule: {
-        endTimes:'活動已結束',
+        endTimes: '活動已結束',
         img1: `./images/header_h3.png`,
         img2: `./images/rule_rule.png`,
         img3: `./images/rule1_in.png`,
@@ -86,38 +86,41 @@ langZh = {
         text64: `金幣`,
         text65: `直接邀請對象+2魔法棒，妳+1魔法棒`,
         text66: `<div class="table1_1">
-                    <div style="line-height: 0.4rem;">儲值數額<br>（時間：30天內，單位：金幣）</div>
+                    <div style="line-height: 0.4rem;">單筆充值金額<br>（時間：30天內 單位：金幣）</div>
                     <div>獲得收益</div>
                 </div>
                 <div class="table1_2">
-                    <div>儲值&lt;10000</div>
-                    <div style="line-height: 0.4rem;">直接邀請對象 +2 魔法棒，妳 +1 魔法棒</div>
+                    <div>充值<70000金幣</div>
+                    <div style="line-height: 0.4rem;">直接邀請對象充值，你獲得充值金額1%金幣獎勳；</div>
                 </div>
                 <div class="table1_3">
-                    <div>10000≤儲值&lt50000</div>
-                    <div style="line-height: 0.4rem;">直接邀請對象每儲值1000，妳+30（3.00%）</div>
+                    <div>70000金幣=<充值<700000金幣</div>
+                    <div style="line-height: 0.4rem;">直接邀請對象充值>70000金幣，你將獲得充值金額2%金幣獎勳；</div>
                 </div>
                 <div class="table1_4">
-                    <div>儲值≥50000 </div>
-                    <div style="line-height: 0.4rem;">直接邀請對象每儲值1000，妳+50（5.00%）</div>
+                    <div>充值>=700000金幣</div>
+                    <div style="line-height: 0.4rem;">直接邀請對象充值>700000金幣，你獲得充值金額4%金幣獎勳；</div>
                 </div>
                 <div class="table2_1">
-                    <div style="line-height: 0.4rem;">儲值數額<br>（時間：30天內，單位：金幣）</div>
+                    <div style="line-height: 0.4rem;">單筆充值金額<br>（時間：30天內 單位：金幣）</div>
                     <div>獲得收益</div>
                 </div>
                 <div class="table2_2">
-                    <div>10000≤儲值&lt;50000</div>
-                    <div style="line-height: 0.4rem;">間接邀請對象每儲值1000，妳+10（1.00%）</div>
+                    <div>70000金幣=<充值<700000金幣</div>
+                    <div style="line-height: 0.4rem;">間接邀請對象充值>70000金幣，你將獲得充值金額0.5%金幣獎勳；</div>
                 </div>
                 <div class="table2_3">
-                    <div>儲值≥50000</div>
-                    <div style="line-height: 0.34rem;">間接邀請對象每儲值1000，妳+20（2.00%）</div>
-                </div>`,
+                    <div>充值>=700000金幣</div>
+                    <div style="line-height: 0.34rem;">間接邀請對象充值>700000金幣，你獲得充值金額1%金幣獎勳；</div>
+                </div>
+    `,
         text67: `收益明細`,
         img5: `background: url(./images/myInfoBut.png) no-repeat;background-size: 100% 100%;`,
         img6: `background: url(./images/myInfoBut2.png) no-repeat;background-size: 100% 100%;`,
         img7: `background: url./images/ruleBoxBg.png) no-repeat;background-size: 100% 100%;`,
         img7: `./images/rule_inNew.png`,
+        myIncomeText: `獲取`,
+        claimed:'領取成功',
     },
     share: {
         img1: `background: url(./images/share/header.png) no-repeat;background-size: 100% 100%;`,

view/molistar/common/local/langHandler.js

@@ -34,7 +34,7 @@ function initLocalLang() {
         window.lang.code = 'id'
         window.lang.defaults = false
     } else if (lang === 'tr' || window.location.href.match('=tr')) {
-        if (window.location.href.match('inform') || window.location.href.match('superId') || window.location.href.match('newWeekStar') || window.location.href.match('home')|| window.location.href.match('pay')) {
+        if (window.location.href.match('2024-invitationFission') || window.location.href.match('inform') || window.location.href.match('superId') || window.location.href.match('newWeekStar') || window.location.href.match('home') || window.location.href.match('pay')) {
             // 土耳其
             console.log("langHandler" + '土耳其')
             window.lang = langTr

view/molistar/modules/myincome/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>molistar</title><link href=./static/css/app.0aa8565668a6aee2f1a14870252a6efc.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.836dd12dd20a2dc8a4c9.js></script><script type=text/javascript src=./static/js/vendor.ef63a6e67767f10f7bb6.js></script><script type=text/javascript src=./static/js/app.d410826480395a69f2ee.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>molistar</title><link href=./static/css/app.2ab3c49db0611874bf5700de654e028a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.993852eff675f62fe242.js></script><script type=text/javascript src=./static/js/vendor.ef63a6e67767f10f7bb6.js></script><script type=text/javascript src=./static/js/app.36f760d4e09081923bc4.js></script></body></html>

view/molistar/modules/myincome/static/js/manifest.0e3fcb793d88e03113b5.js

@@ -0,0 +1,7 @@
+<<<<<<<< HEAD:view/molistar/modules/myincome/static/js/manifest.525e73ccaf627848d5f0.js
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[d]);return u};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"b040ea26506725a01e07",1:"c2ef46c6dcac24931ba4",2:"17debe0f6011a97521e8",3:"a4c2cd2893242b26adcb",4:"1c8935faedda18361064",5:"23033c432e0012f87baf",6:"0e7ac399b5d59483b7f2",7:"770781e704ff5805cd00",8:"4218eb5becaddd649623",9:"d02156509389fc441584",10:"9f5644b8d8539a302508",11:"5d316356ba01de644f13",12:"b16a14104ab77a57b8a2"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
+//# sourceMappingURL=manifest.525e73ccaf627848d5f0.js.map
+========
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,d,i,u=0,s=[];u<r.length;u++)d=r[u],t[d]&&s.push(t[d][0]),t[d]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);s.length;)s.shift()();if(c)for(u=0;u<c.length;u++)i=o(o.s=c[u]);return i};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"9b42e162ef90c3d92a52",1:"c2ef46c6dcac24931ba4",2:"17debe0f6011a97521e8",3:"a4c2cd2893242b26adcb",4:"1c8935faedda18361064",5:"eb4d2db2d0f2e08dfd03",6:"0e7ac399b5d59483b7f2",7:"770781e704ff5805cd00",8:"4218eb5becaddd649623",9:"d02156509389fc441584",10:"9f5644b8d8539a302508",11:"5d316356ba01de644f13",12:"b16a14104ab77a57b8a2"}[e]+".js";var f=setTimeout(d,12e4);function d(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=d,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
+//# sourceMappingURL=manifest.0e3fcb793d88e03113b5.js.map
+>>>>>>>> 31560ab (邀请活动暂存):view/molistar/modules/myincome/static/js/manifest.0e3fcb793d88e03113b5.js

view/molistar/modules/myincome/static/js/manifest.525e73ccaf627848d5f0.js

@@ -0,0 +1,7 @@
+<<<<<<<< HEAD:view/molistar/modules/myincome/static/js/manifest.525e73ccaf627848d5f0.js
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[d]);return u};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"b040ea26506725a01e07",1:"c2ef46c6dcac24931ba4",2:"17debe0f6011a97521e8",3:"a4c2cd2893242b26adcb",4:"1c8935faedda18361064",5:"23033c432e0012f87baf",6:"0e7ac399b5d59483b7f2",7:"770781e704ff5805cd00",8:"4218eb5becaddd649623",9:"d02156509389fc441584",10:"9f5644b8d8539a302508",11:"5d316356ba01de644f13",12:"b16a14104ab77a57b8a2"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
+//# sourceMappingURL=manifest.525e73ccaf627848d5f0.js.map
+========
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,d,i,u=0,s=[];u<r.length;u++)d=r[u],t[d]&&s.push(t[d][0]),t[d]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);s.length;)s.shift()();if(c)for(u=0;u<c.length;u++)i=o(o.s=c[u]);return i};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"9b42e162ef90c3d92a52",1:"c2ef46c6dcac24931ba4",2:"17debe0f6011a97521e8",3:"a4c2cd2893242b26adcb",4:"1c8935faedda18361064",5:"eb4d2db2d0f2e08dfd03",6:"0e7ac399b5d59483b7f2",7:"770781e704ff5805cd00",8:"4218eb5becaddd649623",9:"d02156509389fc441584",10:"9f5644b8d8539a302508",11:"5d316356ba01de644f13",12:"b16a14104ab77a57b8a2"}[e]+".js";var f=setTimeout(d,12e4);function d(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=d,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
+//# sourceMappingURL=manifest.0e3fcb793d88e03113b5.js.map
+>>>>>>>> 31560ab (邀请活动暂存):view/molistar/modules/myincome/static/js/manifest.0e3fcb793d88e03113b5.js

view/molistar/modules/myincome/static/js/manifest.993852eff675f62fe242.js

@@ -1,2 +1,2 @@
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[d]);return u};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"9b42e162ef90c3d92a52",1:"c2ef46c6dcac24931ba4",2:"17debe0f6011a97521e8",3:"a4c2cd2893242b26adcb",4:"1c8935faedda18361064",5:"23033c432e0012f87baf",6:"0e7ac399b5d59483b7f2",7:"770781e704ff5805cd00",8:"4218eb5becaddd649623",9:"d02156509389fc441584",10:"9f5644b8d8539a302508",11:"5d316356ba01de644f13",12:"b16a14104ab77a57b8a2"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
-//# sourceMappingURL=manifest.836dd12dd20a2dc8a4c9.js.map
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[d]);return u};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"b040ea26506725a01e07",1:"c2ef46c6dcac24931ba4",2:"17debe0f6011a97521e8",3:"a4c2cd2893242b26adcb",4:"1c8935faedda18361064",5:"3fd3e8faf813a778a49f",6:"0e7ac399b5d59483b7f2",7:"770781e704ff5805cd00",8:"4218eb5becaddd649623",9:"d02156509389fc441584",10:"9f5644b8d8539a302508",11:"5d316356ba01de644f13",12:"b16a14104ab77a57b8a2"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
+//# sourceMappingURL=manifest.993852eff675f62fe242.js.map

view/molistar/modules/superId/rule.html

@@ -15,7 +15,7 @@
         <img src="./images/travel/backGold.png" alt="">
         <b class="text1"></b>
     </div>
-    <img src="./images/rule.png?v=1.0" alt="" class="ruleImg">
+    <img src="./images/rule.png?v=2.0" alt="" class="ruleImg">
     <div class="ruleTitle text1"></div>
     <div class="text2">
        

view/molistar/vue-project/myincome/src/i18n/langs/ar.js

@@ -1,5 +1,6 @@
 const ar = {
     diamondLog: {
+        邀请活动: "فعالية الدعوة",
         公会周期结算会长钻石收入: "إيرادات الماس لرئيس النقابة عند التسوية الدورية",
         购买房间背景: "شراء خلفية الغرفة",
         自定义房间背景: "خلفية الغرفة المخصصة",

view/molistar/vue-project/myincome/src/i18n/langs/en.js

@@ -1,5 +1,6 @@
 const en = {
     diamondLog: {
+        邀请活动: "Invitation Event",
         公会周期结算会长钻石收入: "Guild Leader Diamond Income for Periodic Settlement",
         购买房间背景: "Purchase Room Background",
         自定义房间背景: "Custom Room Background",

view/molistar/vue-project/myincome/src/i18n/langs/zh.js

@@ -1,5 +1,6 @@
 const zh = {
   diamondLog: {
+    邀请活动: "邀請活動",
     公会周期结算会长钻石收入: "公會週期結算會長鑽石收入",
     购买房间背景: "購買房間背景",
     自定义房间背景: "自訂房間背景",

view/molistar/vue-project/myincome/src/utils/request.js

@@ -17,7 +17,7 @@ const service = axios.create({
     baseURL,
     // baseURL: 'http://www.if66.cn/',
     // baseURL: '',
-    'timeout': 5000,
+    'timeout': 10000,
     'Content-Type': 'application/x-www-form-urlencoded',
 })
 

view/molistar/vue-project/myincome/src/view/myincome/DiamondLog.vue

@@ -74,6 +74,9 @@
               <p v-else-if="tab === 11 && item1.objType === 44">
                 {{ $t("diamondLog.全服紅包_來自") }}{{ item1.roomTitle }}
               </p>
+              <p v-else-if="tab === 11 && item1.objType === 144">
+                {{ $t("diamondLog.邀请活动") }}
+              </p>
               <p v-else-if="tab === 11 && item1.objType === 41">
                 {{ $t("diamondLog.房間紅包退款_來自") }}{{ item1.roomTitle }}
               </p>