修改星级公会样式

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

@@ -135,7 +135,7 @@ body {
   font-weight: 600;
   position: absolute;
   left: 0;
-  bottom: -0.53333rem;
+  bottom: -0.65rem;
 }
 
 .timeBox {
@@ -936,3 +936,11 @@ body {
   background: url(../images/rewardBg-tr.png) no-repeat;
   background-size: 100% 100%;
 }
+
+.Turkiye .timeBox {
+  width: 10rem;
+}
+
+.Turkiye .timeBox div {
+  width: 1.6rem;
+}

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

@@ -136,7 +136,7 @@ body {
                 font-weight: 600;
                 position: absolute;
                 left: 0;
-                bottom: px2rem(-40);
+                bottom: -0.65rem;
             }
         }
     }
@@ -949,4 +949,12 @@ body {
         background: url(../images/rewardBg-tr.png) no-repeat;
         background-size: 100% 100%;
     }
+
+    .timeBox {
+        width: px2rem(750);
+
+        div {
+            width: 1.6rem;
+        }
+    }
 }

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

@@ -128,7 +128,7 @@ function getConfig() {
                 if (listTo3.length < 3) {
                     let arr = new Array(3 - listTo3.length).fill({
                         avatar: './images/logo.png',
-                        name: '虚位以待',
+                        name: langReplace(localLang.demoModule.waiting),
                         erbanNo: null,
                         totalNum: null
                     })

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

@@ -24,5 +24,6 @@ langAr = {
         more: 'أكثر',
         month: 'شهر ',
         day: 'يوم ',
+        waiting: 'منتظر',
     }
 }

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

@@ -28,5 +28,6 @@ langEn = {
         more: 'More',
         month: 'Month',
         day: 'Day',
+        waiting: 'Waiting',
     },
 }

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

@@ -26,6 +26,7 @@ langTr = {
         more: 'Daha Fazla',
         month: 'Ay',
         day: 'Gün',
+        waiting: 'Beklemek',
     },
     
 }

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

@@ -24,5 +24,6 @@ langZh = {
         more: '更多',
         month: '月',
         day: '日',
+        waiting: '虚位以待',
     }
 }

view/molistar/activity/rechargeNew/index.html

@@ -42,7 +42,7 @@
     <!-- 我的充值 -->
     <div class="myRecharge">
         <div class="title text7"></div>
-        <p><b>$0</b><img style="display: none;" src="./images/why.png" alt=""></p>
+        <p><b>$0</b><img src="./images/why.png" alt=""></p>
         <div class="but text8"></div>
     </div>
     <!-- 充值档位到达10 -->
@@ -224,6 +224,121 @@
             <div class="but text10"></div>
         </div>
     </div>
+    <!-- 充值档位到达5000 -->
+    <div class="recharge5000 recharge7 recharges">
+        <div class="top">
+            <div class="title">Recharge $5000</div>
+        </div>
+        <div class="content">
+            <!-- 奖励图片 -->
+            <div class="rewardImg">
+                <div class="ts" id="txTop5000"></div>
+                <img src="./images/bo.png" alt="" class="bo">
+                <img src="./images/why.png" alt="" class="why">
+            </div>
+            <!-- 前三标题 -->
+            <div class="topTitle">
+                <img src="./images/left.png" alt="" class="left">
+                <b class="text26"></b>
+                <img src="./images/right.png" alt="" class="right">
+            </div>
+            <!-- 前三信息 -->
+            <div class="topBox">
+                <div class="no2">
+                    <img src="./images/logo.png" alt="" class="tx">
+                    <img src="./images/top2.png" alt="" class="ts">
+                </div>
+                <div class="no1">
+                    <img src="./images/logo.png" alt="" class="tx">
+                    <img src="./images/top1.png" alt="" class="ts">
+                </div>
+                <div class="no3">
+                    <img src="./images/logo.png" alt="" class="tx">
+                    <img src="./images/top3.png" alt="" class="ts">
+                </div>
+            </div>
+        </div>
+        <div class="bottom">
+            <div class="but text10"></div>
+        </div>
+    </div>
+    <!-- 充值档位到达8000 -->
+    <div class="recharge8000 recharge8 recharges">
+        <div class="top">
+            <div class="title">Recharge $8000</div>
+        </div>
+        <div class="content">
+            <!-- 奖励图片 -->
+            <div class="rewardImg">
+                <div class="ts" id="txTop8000"></div>
+                <img src="./images/bo.png" alt="" class="bo">
+                <img src="./images/why.png" alt="" class="why">
+            </div>
+            <!-- 前三标题 -->
+            <div class="topTitle">
+                <img src="./images/left.png" alt="" class="left">
+                <b class="text26"></b>
+                <img src="./images/right.png" alt="" class="right">
+            </div>
+            <!-- 前三信息 -->
+            <div class="topBox">
+                <div class="no2">
+                    <img src="./images/logo.png" alt="" class="tx">
+                    <img src="./images/top2.png" alt="" class="ts">
+                </div>
+                <div class="no1">
+                    <img src="./images/logo.png" alt="" class="tx">
+                    <img src="./images/top1.png" alt="" class="ts">
+                </div>
+                <div class="no3">
+                    <img src="./images/logo.png" alt="" class="tx">
+                    <img src="./images/top3.png" alt="" class="ts">
+                </div>
+            </div>
+        </div>
+        <div class="bottom">
+            <div class="but text10"></div>
+        </div>
+    </div>
+    <!-- 充值档位到达10000 -->
+    <div class="recharge10000 recharge9 recharges">
+        <div class="top">
+            <div class="title">Recharge $10000</div>
+        </div>
+        <div class="content">
+            <!-- 奖励图片 -->
+            <div class="rewardImg">
+                <div class="ts" id="txTop10000"></div>
+                <img src="./images/bo.png" alt="" class="bo">
+                <img src="./images/why.png" alt="" class="why">
+                <img src="./images/why.png" alt="" class="why why2">
+            </div>
+            <!-- 前三标题 -->
+            <div class="topTitle">
+                <img src="./images/left.png" alt="" class="left">
+                <b class="text26"></b>
+                <img src="./images/right.png" alt="" class="right">
+            </div>
+            <!-- 前三信息 -->
+            <div class="topBox">
+                <div class="no2">
+                    <img src="./images/logo.png" alt="" class="tx">
+                    <img src="./images/top2.png" alt="" class="ts">
+                </div>
+                <div class="no1">
+                    <img src="./images/logo.png" alt="" class="tx">
+                    <img src="./images/top1.png" alt="" class="ts">
+                </div>
+                <div class="no3">
+                    <img src="./images/logo.png" alt="" class="tx">
+                    <img src="./images/top3.png" alt="" class="ts">
+                </div>
+            </div>
+        </div>
+        <div class="bottom">
+            <div class="but text10"></div>
+        </div>
+    </div>
     <!-- 弹窗 -->
     <div class="pub">
         <div class="pub_in">
@@ -239,15 +354,32 @@
             </div>
         </div>
     </div>
-
     <!-- 免责声明 -->
     <div class="disclaimer text24"></div>
-    <div class="video">
+    <div class="video video3000">
         <video id="zjVideo" controls>
             <source src="./mp4/3000.mp4" type="video/mp4">
         </video>
         <img src="./images/close.png" alt="" class="close">
     </div>
+    <div class="video video5000">
+        <video id="zjVideo5000" controls>
+            <source src="./mp4/5000.mp4" type="video/mp4">
+        </video>
+        <img src="./images/close.png" alt="" class="close">
+    </div>
+    <div class="video video8000">
+        <video id="zjVideo8000" controls>
+            <source src="./mp4/8000.mp4" type="video/mp4">
+        </video>
+        <img src="./images/close.png" alt="" class="close">
+    </div>
+    <div class="video video10000">
+        <video id="zjVideo10000" controls>
+            <source src="./mp4/10000.mp4" type="video/mp4">
+        </video>
+        <img src="./images/close.png" alt="" class="close">
+    </div>
 
 </body>
 
@@ -259,8 +391,9 @@
 <script src="../../common/js/vconsole.min.js"></script>
 <script src="../../common/js/route-constant.js"></script>
 <script src="../../common/js/svga.min.js"></script>
-<script src="./local/en.js"></script>
-<script src="./local/zh.js"></script>
-<script src="./local/ar.js"></script>
+<script src="./local/en.js?v=1.0"></script>
+<script src="./local/zh.js?v=1.0"></script>
+<script src="./local/ar.js?v=1.0"></script>
+<script src="./local/tr.js?v=1.0"></script>
 <script src="./js/index.js"></script>
 <script src="../../common/local/langHandler.js"></script>

view/molistar/activity/rechargeNew/js/index.js

@@ -81,6 +81,9 @@ document.addEventListener('DOMContentLoaded', function () {
     loadSVGA('ts500', './svga/500.svga');
     loadSVGA('ts1000', './svga/1000.svga');
     loadSVGA('ts3000', './svga/3000.svga');
+    loadSVGA('txTop5000', './svga/txTop.svga');
+    loadSVGA('txTop8000', './svga/txTop.svga');
+    loadSVGA('txTop10000', './svga/txTop.svga');
     loadSVGA('zj10', './svga/zj10.svga');
     loadSVGA('zj100', './svga/zj100.svga');
     loadSVGA('zj300', './svga/zj300.svga');
@@ -125,9 +128,9 @@ function getConfig() {
                 wealth = res.data.wealth;
                 limitWealth = res.data.limitWealth;
                 // 处理是否我的充值展示
-                if(res.data.rechargeUser){
+                if (res.data.rechargeUser) {
                     $('.myRecharge').hide();
-                }else{
+                } else {
                     $('.myRecharge').show();
                 }
                 // 处理倒计时
@@ -179,7 +182,6 @@ $('.myRecharge .but').click(function () {
         if (channel == "google") {
             window.androidJsObj.openChargePage(6);
         } else {
-            window.androidJsObj.openChargePage(6);
             window.location.href = urlPrefix + '/molistar/modules/pay/index.html?channelType=4';
         }
     } else if (browser.ios) {
@@ -187,7 +189,6 @@ $('.myRecharge .but').click(function () {
         if (channel == "appstore") {
             window.webkit.messageHandlers.openChargePage.postMessage(null);
         } else {
-            window.webkit.messageHandlers.chargePayClickPage.postMessage(6);
             window.location.href = urlPrefix + '/molistar/modules/pay/index.html?channelType=4';
         }
     }
@@ -215,6 +216,38 @@ $('.recharge3000 .content .rewardImg .why').click(function () {
     $('.pub ').show();
     bodyScroolFun(true);
 })
+// 打开5000头饰弹窗
+$('.recharge5000 .content .rewardImg .why').click(function () {
+    $('.pub .pub_in .centent').addClass('myRechargeTextWhy');
+    $('.pub .pub_in .title').html(langReplace(localLang.demoModule.headdressTitle));
+    $('.pub .pub_in .centent').html(langReplace(localLang.demoModule.headdressText));
+    $('.pub ').show();
+    bodyScroolFun(true);
+})
+// 打开8000头饰弹窗
+$('.recharge8000 .content .rewardImg .why').click(function () {
+    $('.pub .pub_in .centent').addClass('myRechargeTextWhy');
+    $('.pub .pub_in .title').html(langReplace(localLang.demoModule.headdressTitle));
+    $('.pub .pub_in .centent').html(langReplace(localLang.demoModule.headdressText));
+    $('.pub ').show();
+    bodyScroolFun(true);
+})
+// 打开10000头饰弹窗
+$('.recharge10000 .content .rewardImg .why2').click(function () {
+    $('.pub .pub_in .centent').addClass('myRechargeTextWhy');
+    $('.pub .pub_in .title').html(langReplace(localLang.demoModule.headdressTitle));
+    $('.pub .pub_in .centent').html(langReplace(localLang.demoModule.headdressText));
+    $('.pub ').show();
+    bodyScroolFun(true);
+})
+// 打开10000座驾弹窗
+$('.recharge10000 .content .rewardImg .why').click(function () {
+    $('.pub .pub_in .centent').addClass('myRechargeTextWhy');
+    $('.pub .pub_in .title').html(langReplace(localLang.demoModule.carTitle));
+    $('.pub .pub_in .centent').html(langReplace(localLang.demoModule.carText));
+    $('.pub ').show();
+    bodyScroolFun(true);
+})
 // 关闭弹窗
 $('.pub .pub_in .close').click(function () {
     $('.pub .pub_in .centent').removeClass('myRechargeText');
@@ -291,12 +324,39 @@ $('.recharge3000 .content .rewardImg .bo').click(function () {
     var video = document.getElementById('zjVideo');
     video.play();
     bodyScroolFun(true);
-    $('.video').show();
+    $('.video3000').show();
+})
+// 打开mp4弹窗
+$('.recharge5000 .content .rewardImg .bo').click(function () {
+    var video = document.getElementById('zjVideo5000');
+    video.play();
+    bodyScroolFun(true);
+    $('.video5000').show();
+})
+// 打开mp4弹窗
+$('.recharge8000 .content .rewardImg .bo').click(function () {
+    var video = document.getElementById('zjVideo8000');
+    video.play();
+    bodyScroolFun(true);
+    $('.video8000').show();
+})
+// 打开mp4弹窗
+$('.recharge10000 .content .rewardImg .bo').click(function () {
+    var video = document.getElementById('zjVideo10000');
+    video.play();
+    bodyScroolFun(true);
+    $('.video10000').show();
 })
 // 关闭mp4弹窗
 $('.video .close').click(function () {
     var video = document.getElementById('zjVideo');
+    var video5000 = document.getElementById('zjVideo5000');
+    var video8000 = document.getElementById('zjVideo8000');
+    var video10000 = document.getElementById('zjVideo10000');
     video.pause();
+    video5000.pause();
+    video8000.pause();
+    video10000.pause();
     bodyScroolFun(false);
     $('.video').hide();
 })

view/molistar/activity/rechargeNew/local/ar.js

@@ -23,13 +23,15 @@ langAr = {
         text16: `إعادة شحن $3000`,
         text17: `القواعد`,
         text18: `
-        <p>1، وقت نشاط إعادة الشحن: من 00:00:00 في اليوم الأول من كل شهر إلى 23:59:59 في اليوم الأخير من الشهر (GMT+3).</p>
-        <p>2، يمكنك الحصول على مكافأة كل درجة مرة واحدة فقط.</p>
-        <p>3، عند انتهاء كل جولة من الأنشطة، ستنتهي المكافآت تلقائيًا.</p>
-        <p>4، اتصل بخدمة العملاء الرسمية للحصول على معرفك الفريد!</p>
-        <p>5، لا يمكن لوكيل الشحن الانضمام إلى النشاط.</p>
-        <p>6، هذا الحدث ليس مرتبطًا بجوجل/أبل.</p>
-        `,
+<p>1. وقت نشاط الشحن: من الساعة 0:00:00 في اليوم الأول من كل شهر إلى الساعة 23:59:59 في آخر يوم من الشهر (GMT+3).</p>
+<p>2. يمكنك الحصول على كل مكافأة مرتبة مرة واحدة فقط.</p>
+<p>3. بعد انتهاء كل جولة من الأنشطة، ستنتهي صلاحية المكافآت تلقائيًا.</p>
+<p>4. تواصل مع خدمة العملاء الرسمية للحصول على معرفك الفريد!</p>
+<p>5. لا يمكن لوكلاء الشحن المشاركة في النشاط.</p>
+<p>6. يمكن للمستخدمين تخصيص هدية أو مركبة أو غطاء رأس مرة واحدة في الشهر إذا قاموا بالشحن إلى المستوى المطلوب.</p>
+<p>7. هذا الحدث غير مرتبط بجوجل/آبل.</p>
+`,
+
         text19: `إعادة شحن شهريتي`,
         text20: `
         <p>1، تشمل طرق إعادة الشحن Google وApple الداخلية وما إلى ذلك.</p>
@@ -41,5 +43,10 @@ langAr = {
         text24: `هذا الحدث غير مرتبط بشركة أبل.`,
         text25: `هذا الحدث غير مرتبط بشركة جوجل.`,
         text26: `أفضل 3 فائزين`,
+        headdressTitle: 'تاج مخصص',
+        headdressText: '<p>يمكنك إرسال لقبك الفريد إلى خدمة العملاء الرسمية لتخصيص تاجك المخصص</p>',
+        carTitle: 'سيارة مخصصة',
+        carText: '<p>يمكنك إرسال صورتك الرمزية الفريدة ولقبك إلى خدمة العملاء الرسمية لتخصيص سيارتك المخصصة</p>'
+
     }
 }

view/molistar/activity/rechargeNew/local/en.js

@@ -26,7 +26,8 @@ langEn = {
         <p>3. Each round of activities end, the rewards will automatically expire.</p>
         <p>4. Contact our official customer service to get your unique ID!</p>
         <p>5. Recharge agent can not join the activity.</p>
-        <p>6. This event is not related to Google/Apple.</p>
+        <p>6. Users can customize gift, vehicle or headwear once a month if they recharge to the corresponding level.</p>
+        <p>7. This event is not related to Google/Apple.</p>
     `,
         text19: `My Monthly Recharge`,
         text20: `
@@ -39,5 +40,9 @@ langEn = {
         text24: `This event is not related to Apple.`,
         text25: `This event is not related to Google.`,
         text26: `Top 3 Winner`,
+        headdressTitle: `Customized Headdress`,
+        headdressText: `<p>You can send your unique nickname to the official customer service to customize your customized headdress</p>`,
+        carTitle: `Customized Car`,
+        carText: `<p>You can send your unique avatar and nickname to the official customer service to customize your customized car</p>`,
     }
 }

view/molistar/activity/rechargeNew/local/tr.js

@@ -0,0 +1,49 @@
+langTr = {
+    demoModule: {
+        layerIndex1: 'Yükleniyor...',
+        layerIndex2: 'Başarılı',
+        layerIndex3: 'Ağ hatası',
+        text1: 'Aylık yeniden doldurma',
+        text2: 'Kurallar',
+        text3: 'Gün',
+        text4: 'Saat',
+        text5: 'Dakika',
+        text6: 'Saniye',
+        text7: 'Yeniden Doldurmam',
+        text8: 'Yeniden Doldur',
+        text9: '10$ Yeniden Doldur',
+        text10: 'Ödül Al',
+        text11: '100$ Yeniden Doldur',
+        text12: '300$ Yeniden Doldur',
+        text13: 'İlk 3 Kazanan',
+        text14: '500$ Yeniden Doldur',
+        text15: '1000$ Yeniden Doldur',
+        text16: '3000$ Yeniden Doldur',
+        text17: 'Kurallar',
+        text18: `
+<p>1. Şarj etkinliği süresi: Her ayın 1. günü saat 00:00:00'dan ayın son günü saat 23:59:59'a kadar (GMT+3).</p>
+<p>2. Her derece ödülünü yalnızca bir kez alabilirsiniz.</p>
+<p>3. Her etkinlik turu sona erdiğinde, ödüller otomatik olarak sona erecektir.</p>
+<p>4. Benzersiz kimliğinizi almak için resmi müşteri hizmetlerimizle iletişime geçin!</p>
+<p>5. Şarj acenteleri etkinliğe katılamaz.</p>
+<p>6. Kullanıcılar, ilgili seviyeye şarj ettikleri takdirde ayda bir hediye, araç veya başlık özelleştirebilirler.</p>
+<p>7. Bu etkinlik Google/Apple ile ilişkili değildir.</p>
+`,
+
+        text19: 'Aylık Yeniden Doldurmam',
+        text20: `
+            <p>1. Yeniden doldurma yöntemleri Google, Apple içi satın alma vb. içerir.</p>
+            <p>2. Yeniden doldurma aracısı etkinliğe katılamaz.</p>
+        `,
+        text21: 'Özelleştirilmiş Hediye',
+        text22: '<p>Özelleştirilmiş hediyenizi almak için özel videonuzu müşteri hizmetlerimize gönderebilirsiniz.</p>',
+        text23: 'Alındı',
+        text24: 'Bu etkinlik Apple ile ilişkili değildir.',
+        text25: 'Bu etkinlik Google ile ilişkili değildir.',
+        text26: 'İlk 3 Kazanan',
+        headdressTitle: 'Özelleştirilmiş Taç',
+        headdressText: '<p>Benzersiz takma adınızı resmi müşteri hizmetlerine göndererek özelleştirilmiş tacınızı oluşturabilirsiniz</p>',
+        carTitle: 'Özelleştirilmiş Araç',
+        carText: '<p>Benzersiz avatarınızı ve takma adınızı resmi müşteri hizmetlerine göndererek özelleştirilmiş aracınızı oluşturabilirsiniz</p>',
+    }
+}

view/molistar/activity/rechargeNew/local/zh.js

@@ -23,13 +23,15 @@ langZh = {
         text16: `充值 $3000`,
         text17: `規則`,
         text18: `
-        <p>1、充值活動時間：每月1日00:00:00到每月最後一天23:59:59（GMT+3）。</p>
-        <p>2、每個等級的獎勵只能獲得一次。</p>
-        <p>3、每輪活動結束後，獎勵將自動過期。</p>
-        <p>4、聯系客服獲取您的唯一ID！</p>
-        <p>5、充值代理不能參加活動。</p>
-        <p>6、該活動與谷歌/蘋果無關。</p>
-        `,
+<p>1. 充值活動時間：每月1日的0:00:00至每月最後一天的23:59:59（GMT+3）。</p>
+<p>2. 每個等級的獎勵只能獲得一次。</p>
+<p>3. 每輪活動結束後，獎勵將自動失效。</p>
+<p>4. 聯繫我們的官方客服以獲取您的專屬ID！</p>
+<p>5. 充值代理無法參與此活動。</p>
+<p>6. 用戶若充值至對應等級，每月可定制一次禮物、座駕或頭飾。</p>
+<p>7. 此活動與Google/Apple無關。</p>
+`,
+
         text19: `我的月度充值`,
         text20: `
         <p>1、充值方式包括Google、Apple內購等。</p>
@@ -41,5 +43,10 @@ langZh = {
         text24: `本活動與蘋果無關`,
         text25: `本活動與谷歌無關`,
         text26: `前3名獲獎者`,
+        headdressTitle: '定制頭飾',
+        headdressText: '<p>您可以將您的獨特暱稱發送給官方客服，來定制您的專屬頭飾</p>',
+        carTitle: '定制車輛',
+        carText: '<p>您可以將您的獨特頭像和暱稱發送給官方客服，來定制您的專屬車輛</p>'
+
     }
 }

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('2024-newYear') || window.location.href.match('guild-ar') || 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')) {
+        if (window.location.href.match('rechargeNew') ||window.location.href.match('2024-newYear') || window.location.href.match('guild-ar') || 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/dailyConsumption/local/ar.js

@@ -12,13 +12,13 @@ langAr = {
         text5: `ثانية`,
         text6: `استهلاك العملات`,
         text7: `استهلاك 70K-700K`,
-        text8: `استهلاك 210K-7M`,
+        text8: `استهلاك 2.1M-7M`,
         text9: `استهلاك 700K`,
         text10: `استهلاك 350K`,
         text11: `استهلاك 70K`,
         text12: `استهلاك 7M`,
-        text13: `استهلاك 3500K`,
-        text14: `استهلاك 210K`,
+        text13: `استهلاك 3.5M`,
+        text14: `استهلاك 2.1M`,
         text15: `هذا الحدث لا علاقة له بـ Apple`,
         text16: `هذا الحدث لا علاقة له بـ Google`,
         priorityWinners: `الفائزون ذوو الأولوية`,

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

@@ -10,13 +10,13 @@ langEn = {
         text5: `Sec`,
         text6: `Consume coins`,
         text7: `Consume 70K-700K`,
-        text8: `Consume 210K-7M`,
+        text8: `Consume 2.1M-7M`,
         text9: `Consume 700K`,
         text10: `Consume 350K`,
         text11: `Consume 70K`,
         text12: `Consume 7M`,
-        text13: `Consume 3500K`,
-        text14: `Consume 210K`,
+        text13: `Consume 3.5M`,
+        text14: `Consume 2.1M`,
         text15: `This event has nothing to do with Apple`,
         text16: `This event has nothing to do with Google`,
         priorityWinners: `Priority Winners`,

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

@@ -12,13 +12,13 @@ langZh = {
         text5: `秒`,
         text6: `消耗金幣`,
         text7: `消耗 70K-700K`,
-        text8: `消耗 210K-700萬`,
+        text8: `消耗 2.1M-700萬`,
         text9: `消耗 700K`,
         text10: `消耗 350K`,
         text11: `消耗 70K`,
         text12: `消耗 700萬`,
-        text13: `消耗 3500K`,
-        text14: `消耗 210K`,
+        text13: `消耗 3.5M`,
+        text14: `消耗 2.1M`,
         text15: `此活動與 Apple 無關`,
         text16: `此活動與 Google 無關`,
         priorityWinners: `優先獲勝者`,

view/molistar/modules/guild-ar/bill.html

@@ -59,7 +59,7 @@
     <script src="./local/zh.js"></script>
     <script src="./local/ar.js"></script>
     <script src="./local/tr.js"></script>
-    <script src="./js/bill.js"></script>
+    <script src="./js/bill.js?v=1.0"></script>
     <script src="../../common/local/langHandler.js"></script>
 </body>
 

view/molistar/modules/guild-ar/css/personal.css

@@ -160,6 +160,47 @@ body {
   font-weight: 500;
 }
 
+.page1 .myDuration {
+  width: 9.14667rem;
+  height: 1.17333rem;
+  line-height: 1.17333rem;
+  background: #F2F3F7;
+  border-radius: 0.21333rem;
+  margin: 0 auto 0.34667rem;
+  box-sizing: border-box;
+  padding: 0 0.29333rem;
+  display: none;
+}
+
+.page1 .myDuration strong {
+  color: #313131;
+  font-size: 0.4rem;
+  font-weight: 500;
+  display: block;
+}
+
+.page1 .myDuration b {
+  color: #313131;
+  font-size: 0.4rem;
+  font-weight: 500;
+  display: block;
+  margin-right: 0.1rem;
+}
+
+.page1 .myDuration span {
+  display: block;
+  width: 1.62667rem;
+  height: 0.45333rem;
+  line-height: 0.45333rem;
+  font-weight: 600;
+  font-size: 0.26667rem;
+  color: #fff;
+  text-align: center;
+  background: #313131;
+  border-radius: 0.45333rem;
+  margin-top: 0.37333rem;
+}
+
 .page1 .incomeTitle {
   width: 9.14667rem;
   height: 0.66667rem;
@@ -654,6 +695,10 @@ body {
   font-weight: 400;
 }
 
+.arabic .page1 .myDuration span {
+  margin-right: 0.1rem;
+}
+
 .arabic .my .tx {
   float: right;
 }

view/molistar/modules/guild-ar/css/personal.scss

@@ -168,6 +168,47 @@ body {
         font-weight: 500;
     }
 
+    .myDuration {
+        width: px2rem(686);
+        height: px2rem(88);
+        line-height: px2rem(88);
+        background: #F2F3F7;
+        border-radius: px2rem(16);
+        margin: 0 auto px2rem(26);
+        box-sizing: border-box;
+        padding: 0 px2rem(22);
+        display: none;
+
+        strong {
+            color: #313131;
+            font-size: px2rem(30);
+            font-weight: 500;
+            display: block;
+        }
+
+        b {
+            color: #313131;
+            font-size: px2rem(30);
+            font-weight: 500;
+            display: block;
+            margin-right: 0.1rem;
+        }
+
+        span {
+            display: block;
+            width: px2rem(122);
+            height: px2rem(34);
+            line-height: px2rem(34);
+            font-weight: 600;
+            font-size: px2rem(20);
+            color: #fff;
+            text-align: center;
+            background: #313131;
+            border-radius: px2rem(34);
+            margin-top: px2rem(28);
+        }
+    }
+
     .incomeTitle {
         width: px2rem(686);
         height: px2rem(50);
@@ -664,6 +705,9 @@ body {
 }
 
 .arabic {
+    .page1 .myDuration span{
+        margin-right: 0.1rem;
+    }
     .my .tx {
         float: right;
     }

view/molistar/modules/guild-ar/css/salary.css

@@ -590,7 +590,7 @@ html {
   display: flex;
   align-items: center;
   position: absolute;
-  top: 0.4rem;
+  top: 0.29333rem;
   left: 2.02667rem;
 }
 
@@ -616,6 +616,38 @@ html {
   height: 0.32rem;
 }
 
+.agent_pop .agent_pop_in .wrap li .starLevel,
+.agent_pop .president_pop_in .wrap li .starLevel,
+.president_pop .agent_pop_in .wrap li .starLevel,
+.president_pop .president_pop_in .wrap li .starLevel {
+  height: 0.4rem;
+  line-height: 0.4rem;
+  display: flex;
+  position: absolute;
+  left: 2.02667rem;
+  top: 1.28rem;
+}
+
+.agent_pop .agent_pop_in .wrap li .starLevel span,
+.agent_pop .president_pop_in .wrap li .starLevel span,
+.president_pop .agent_pop_in .wrap li .starLevel span,
+.president_pop .president_pop_in .wrap li .starLevel span {
+  height: 0.4rem;
+  margin-right: 0.10667rem;
+  color: #7B7B7D;
+  font-size: 0.34667rem;
+}
+
+.agent_pop .agent_pop_in .wrap li .starLevel img,
+.agent_pop .president_pop_in .wrap li .starLevel img,
+.president_pop .agent_pop_in .wrap li .starLevel img,
+.president_pop .president_pop_in .wrap li .starLevel img {
+  width: 0.4rem;
+  height: 0.4rem;
+  display: block;
+  margin: 0 0.04rem;
+}
+
 .agent_pop .agent_pop_in .wrap li .id,
 .agent_pop .president_pop_in .wrap li .id,
 .president_pop .agent_pop_in .wrap li .id,
@@ -624,7 +656,7 @@ html {
   font-size: 0.34667rem;
   color: #7b7b7d;
   position: absolute;
-  bottom: 0.45333rem;
+  top: 0.88rem;
   left: 2.02667rem;
 }
 
@@ -848,6 +880,10 @@ html {
   border-radius: 0.66667rem;
 }
 
+.arabic .agent_pop .agent_pop_in .wrap li {
+  direction: ltr;
+}
+
 .arabic .nav .back {
   right: 0.4rem;
   left: unset;

view/molistar/modules/guild-ar/css/salary.scss

@@ -560,7 +560,7 @@ html {
           display: flex;
           align-items: center;
           position: absolute;
-          top: px2rem(15);
+          top: px2rem(11);
           left: px2rem(76);
 
           p {
@@ -581,12 +581,35 @@ html {
           }
         }
 
+        .starLevel {
+          height: px2rem(15);
+          line-height: px2rem(15);
+          display: flex;
+          position: absolute;
+          left: px2rem(76);
+          top: px2rem(48);
+
+          span {
+            height: px2rem(15);
+            margin-right: px2rem(4);
+            color: #7B7B7D;
+            font-size: px2rem(13);
+          }
+
+          img {
+            width: px2rem(15);
+            height: px2rem(15);
+            display: block;
+            margin: 0 px2rem(1.5);
+          }
+        }
+
         .id {
           font-weight: 400;
           font-size: px2rem(13);
           color: #7b7b7d;
           position: absolute;
-          bottom: px2rem(17);
+          top: px2rem(33);
           left: px2rem(76);
         }
       }
@@ -806,6 +829,9 @@ html {
 }
 
 .arabic {
+  .agent_pop .agent_pop_in .wrap li{
+    direction: ltr;
+  }
   .nav {
     .back {
       right: px2rem(15);

view/molistar/modules/guild-ar/js/bill.js

@@ -107,7 +107,7 @@ function getData() {
                                 </div>
                                 <div>
                                         <span>${langReplace(localLang.bill.text4)}${item.beforeUsdNum}ÜS -> ${item.afterUsdNum}ÜS</span>
-                                        <span>${dateFormat(item.createTime, 'yyyy/MM/dd hh:mm:ss')}</span>
+                                        <span>${item.createTime}</span>
                                 </div>
                             </li>`
                     //     } else {

view/molistar/modules/guild-ar/js/index.js

@@ -37,6 +37,7 @@ var payoneer;
 var usdt;
 var payPal;
 var familyMemberId;
+var partitionId;
 // 初始化函數
 $(function () {
     getInfoFromClient();
@@ -144,6 +145,7 @@ function get() {
         success(res) {
             if (res.code === 200) {
                 // 存储分区id partitionId
+                partitionId = res.data.partitionId;
                 window.localStorage.setItem('partitionId', res.data.partitionId);
                 // 判断身份
                 roleTypes = res.data.roleType;
@@ -396,7 +398,7 @@ $('.guildInfoSet').click(function () {
 })
 // 我的收入
 $('.memberFlow').click(function (params) {
-    window.location.href = `./personal.html?roleTypes=${roleTypes}`
+    window.location.href = `./personal.html?roleTypes=${roleTypes}&partitionId=${partitionId}`
 })
 // 薪资账户
 $('.memberFlow2 b').click(function (params) {

view/molistar/modules/guild-ar/js/personal.js

@@ -57,7 +57,7 @@ $(function () {
         fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言
         langReplace = window.lang.replace;
         localLang = window.lang;
-        if(getQueryString().roleTypes == 1){
+        if (getQueryString().roleTypes == 1) {
             $('.page2 .agencyDiamondIncome').show();
         }
         translateFun();
@@ -86,6 +86,7 @@ function translateFun() {
     $('.text17').text(langReplace(localLang.personal.text17));
     $('.text18').text(langReplace(localLang.personal.text18));
     $('.text19').text(langReplace(localLang.personal.text19));
+    $('.duration').text(langReplace(localLang.personal.duration));
     $('.agencyDiamondIncometext1').text(langReplace(localLang.agencyDiamondIncome.text1));
 }
 // 配置接口
@@ -117,6 +118,12 @@ function getAccount() {
                 $('.page1 .incomeBoxLast .d1 span').text(`${lastCycle.totalIncome} ÜS`);
                 $('.page1 .incomeBoxLast .d2 span').text(`${lastCycle.settledIncome} ÜS`);
                 $('.page1 .incomeBoxLast .d3 span').text(`${lastCycle.remainingIncome} ÜS`);
+                // 有效时长
+                if (getQueryString().partitionId == 8) {
+                    $('.page1 .myDuration b').text(res.data.person.curCycleMicRemainTime);
+                    $('.page1 .myDuration span').text(res.data.person.curCycle.cycleDate);
+                    $('.page1 .myDuration').css('display', 'flex');
+                }
                 // agency
                 if (res.data.agency) {
                     var agency = res.data.agency

view/molistar/modules/guild-ar/js/salary.js

@@ -142,6 +142,10 @@ function getTab() {
                     <img src="" alt="" class="flag">
                   </dic>
                   <p class="id">ID:${res.erbanNo}</p>
+                  <div class="starLevel">
+                   <span>${langReplace(localLang.salary.textnew18)}</span>
+                   ${starFun(res)}
+                  </div>
                 </li>
             `
           })
@@ -191,6 +195,22 @@ function getTab() {
     }
   })
 }
+// 处理星级
+function starFun(res) {
+  var str = '';
+  var starNum = 5;
+  for (let index = 1; index <= res.starLevel; index++) {
+    str += `
+      <img src="./images/starAct.png" alt="" class="star">
+    `
+  }
+  for (let index = 1; index <= starNum - res.starLevel; index++) {
+    str += `
+      <img src="./images/star.png" alt="" class="star">
+    `
+  }
+  return str;
+}
 // 选择代理人列表
 $('.agent_pop .wrap').on('click', 'li', function () {
   var uid = $(this).attr('uid');
@@ -509,12 +529,23 @@ function operateValue(than) {
       $('.pubWithdrawal .pubWithdrawal_in .ok').attr('type', type);
       $('.pubWithdrawal .pubWithdrawal_in .ok').attr('accountType', accountObj.type);
       if (accountObj.type == 'VODAFONE') {
-        $('.pubWithdrawal .pubWithdrawal_in .box3 .left p').show();
+        $('.pubWithdrawal .pubWithdrawal_in .box3 .left p strong').text(localLang.salary.textnew8);
         $('.pubWithdrawal .pubWithdrawal_in .box3 .left p span').text(accountObj.usdRatio);
-        $('.pubWithdrawal .pubWithdrawal_in .box4 .right').text(`${((than.attr('guildUsdNum')) - (than.attr('guildUsdNum') * withdrawRate)) * 50} ${accountObj.currency}`);
+        var num = numberFun(((than.attr('guildUsdNum')) - (than.attr('guildUsdNum') * withdrawRate)) * accountObj.usdRatio)
+        $('.pubWithdrawal .pubWithdrawal_in .box4 .right').text(`${num} ${accountObj.currency}`);
+        $('.pubWithdrawal .pubWithdrawal_in .box3 .left p').show();
+      } else if (accountObj.type == 'BANK_TRANSFER_LIRA') {
+        $('.pubWithdrawal .pubWithdrawal_in .box3 .left p strong').text(localLang.salary.textnew8_TRY);
+        $('.pubWithdrawal .pubWithdrawal_in .box3 .left p span').text(accountObj.usdRatio);
+        var num = numberFun(((than.attr('guildUsdNum')) - (than.attr('guildUsdNum') * withdrawRate)) * accountObj.usdRatio)
+        $('.pubWithdrawal .pubWithdrawal_in .box4 .right').text(`${num} ${accountObj.currency}`);
+        $('.pubWithdrawal .pubWithdrawal_in .box3 .left p').show();
+        // Math.floor(((than.attr('guildUsdNum')) - (than.attr('guildUsdNum') * withdrawRate)) * accountObj.usdRatio * 100) / 100
       } else {
         $('.pubWithdrawal .pubWithdrawal_in .box3 .left p').hide();
-        $('.pubWithdrawal .pubWithdrawal_in .box4 .right').text(`${((than.attr('guildUsdNum')) - (than.attr('guildUsdNum') * withdrawRate))} ${accountObj.currency}`);
+        console.log(accountObj.usdRatio);
+        var num = numberFun(((than.attr('guildUsdNum')) - (than.attr('guildUsdNum') * withdrawRate)) * accountObj.usdRatio)
+        $('.pubWithdrawal .pubWithdrawal_in .box4 .right').text(`${num} ${accountObj.currency}`);
       }
       $('.pubWithdrawal .pubWithdrawal_in .box1 .right').text(`${than.attr('guildUsdNum')} USD`);
       $('.pubWithdrawal .pubWithdrawal_in .box2 .right').text(withdrawRate * 100 + '%');
@@ -532,6 +563,19 @@ function operateValue(than) {
     operate(obj)
   }
 }
+// 保留两位小数函数
+function numberFun(num) {
+  // 將數字轉為字符串
+  var numStr = num.toString();
+  // 分割整數部分和小數部分
+  var parts = numStr.split('.');
+  // 如果有小數部分，截取前兩位，否則直接返回整數部分
+  var result = parts[0]; // 整數部分
+  if (parts[1]) { // 存在小數部分時
+    result += '.' + parts[1].substring(0, 2);
+  }
+  return parseFloat(result); // 返回數字
+}
 // 确认提现按钮
 $('.pubWithdrawal .pubWithdrawal_in .ok').click(function () {
   var guildUsdNum = $(this).attr('guildUsdNum');

view/molistar/modules/guild-ar/local/ar.js

@@ -204,6 +204,7 @@ langAr = {
         departed: 'غادر',
     },
     personal: {
+        duration: 'مدتي:',
         text1: `الشخصي`,
         text2: `الوكالة`,
         text3: `الماس الخاص بي:`,
@@ -269,6 +270,7 @@ langAr = {
         textnew6: `معدل رسوم المعالجة`,
         textnew7: `رسوم المعالجة`,
         textnew8: `سعر الصرف من الدولار الأمريكي إلى الجنيه المصري: 1:`,
+        textnew8_TRY: 'سعر صرف الدولار الأمريكي إلى الليرة التركية: 1:',
         textnew9: `المبلغ المقدر`,
         textnew10: `ملاحظة: قد يتأثر المبلغ المتوقع الوصول بسعر صرف البنك وما إلى ذلك.`,
         textnew11: `سحب`,
@@ -277,7 +279,8 @@ langAr = {
         textnew14: `أكثر من الحد الأقصى للمبلغ القابل للتحويل.`,
         textnew15: `نجاح`,
         textnew16: `وقت معالجة طلبات السحب يكون من اليوم الثالث إلى العاشر من كل شهر.`,
-        textnew17: `موافق`,
+        textnew17: `موافق`,textnew18: 'تقييم النجوم:',
+
     },
     bill: {
         text1: `الفاتورة`,

view/molistar/modules/guild-ar/local/en.js

@@ -204,6 +204,7 @@ langEn = {
         departed: 'Departed',
     },
     personal: {
+        duration: `My duration:`,
         text1: `Personal<span></span>`,
         text2: `Agency<span></span>`,
         text3: `My diamond:`,
@@ -269,6 +270,7 @@ langEn = {
         textnew6: `Handling Fee rate`,
         textnew7: `Handling Fee`,
         textnew8: `USD to EGP exchange rate: 1:`,
+        textnew8_TRY: `USD to TRY exchange rate: 1:`,
         textnew9: `Estimated amount`,
         textnew10: `Note: Estimated arrival amount may be affected by bank exchange rate, etc.`,
         textnew11: `Withdraw`,
@@ -278,6 +280,7 @@ langEn = {
         textnew15: `Success`,
         textnew16: `The processing time for withdrawal requests is from the 3rd to the 10th of every month.`,
         textnew17: `OK`,
+        textnew18: `Star rating:`,
     },
     bill: {
         text1: `Bill`,

view/molistar/modules/guild-ar/local/tr.js

@@ -203,6 +203,7 @@ langTr = {
         departed: 'Ayrıldılar',
     },
     personal: {
+        duration: 'Sürem:',
         text1: `Kişisel<span></span>`,
         text2: `Ajans<span></span>`,
         text3: `Benim elmasım:`,
@@ -269,6 +270,7 @@ langTr = {
         textnew6: `İşlem Ücreti Oranı`,
         textnew7: `İşlem Ücreti`,
         textnew8: `USD to EGP döviz kuru: 1:`,
+        textnew8_TRY: `USD ile TRY döviz kuru: 1:`,
         textnew9: `Tahmini Miktar`,
         textnew10: `Not: Tahmini varış miktarı banka döviz kuru gibi faktörlerden etkilenebilir.`,
         textnew11: `Çekim`,
@@ -277,7 +279,8 @@ langTr = {
         textnew14: `Maksimum transfer edilebilir miktardan fazla.`,
         textnew15: `Başarı`,
         textnew16: `Çekim taleplerinin işlenme süresi her ayın 3'ü ile 10'u arasındadır.`,
-        textnew17: `Tamam`,
+        textnew17: `Tamam`, textnew18: 'Yıldız puanı:',
+
     },
     bill: {
         text1: `Fatura`,

view/molistar/modules/guild-ar/local/zh.js

@@ -206,6 +206,7 @@ langZh = {
         placeholder: '請添加',
     },
     personal: {
+        duration: '我的時長:',
         text1: `個人`,
         text2: `機構`,
         text3: `我的鑽石：`,
@@ -271,6 +272,7 @@ langZh = {
         textnew6: `手續費率`,
         textnew7: `手續費`,
         textnew8: `美元兌埃及鎊匯率：1：`,
+        textnew8_TRY: `美元兌土耳其里拉匯率：1：`,
         textnew9: `預估金額`,
         textnew10: `注意：預估到賬金額可能會受銀行匯率等影響。`,
         textnew11: `提款`,
@@ -279,7 +281,8 @@ langZh = {
         textnew14: `超過最大可轉賬金額。`,
         textnew15: `成功`,
         textnew16: `提款申請的處理時間為每月3日至10日。`,
-        textnew17: `確定`,
+        textnew17: `確定`,textnew18: '星級評分：',
+
     },
     bill: {
         text1: `賬單`,

view/molistar/modules/guild-ar/personal.html

@@ -37,6 +37,8 @@
         </div>
         <!-- 账户 -->
         <div class="account text5"></div>
+        <!-- 主播时长 -->
+        <div class="myDuration"><strong class="duration"></strong> <b>0s</b> <span>12.1-12.15</span></div>
         <!-- 当前收益 -->
         <div class="incomeTitle"><span></span><b class="text6"></b><i></i></div>
         <p class="copywriting1 text7"></p>

view/molistar/modules/guild-ar/salary_account.html

@@ -14,7 +14,7 @@
   <meta http-equiv="expires" content="" />
   <script src="../../common/js/flexible.js"></script>
   <link rel="stylesheet" href="../../common/css/reset.css" />
-  <link rel="stylesheet" href="css/salary.css" />
+  <link rel="stylesheet" href="css/salary.css?v=2.0" />
 </head>
 
 <body>
@@ -220,11 +220,11 @@
   <script src="../../common/js/vconsole.min.js"></script>
   <script src="../../common/js/common2.js"></script>
   <script src="../../common/js/layer.js"></script>
-  <script src="./local/en.js?v=1.0"></script>
-  <script src="./local/zh.js?v=1.0"></script>
-  <script src="./local/ar.js?v=1.0"></script>
-  <script src="./local/tr.js?v=1.0"></script>
-  <script src="./js/salary.js?v=1.0"></script>
+  <script src="./local/en.js?v=2.0"></script>
+  <script src="./local/zh.js?v=2.0"></script>
+  <script src="./local/ar.js?v=2.0"></script>
+  <script src="./local/tr.js?v=2.0"></script>
+  <script src="./js/salary.js?v=2.0"></script>
   <script src="../../common/local/langHandler.js"></script>
 </body>
 

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.d1c2b68dc5139c43e9ebe1829075d68c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.272774d75bca469e2f4c.js></script><script type=text/javascript src=./static/js/vendor.ef63a6e67767f10f7bb6.js></script><script type=text/javascript src=./static/js/app.d54d862a2d7e9c963263.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.d1c2b68dc5139c43e9ebe1829075d68c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.f8cc02553244364f2c4b.js></script><script type=text/javascript src=./static/js/vendor.ef63a6e67767f10f7bb6.js></script><script type=text/javascript src=./static/js/app.d54d862a2d7e9c963263.js></script></body></html>

view/molistar/modules/myincome/static/js/manifest.f8cc02553244364f2c4b.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:"30fbedff4ed0e375ac3d",1:"f7fd3566ec61ced38fe8",2:"48bde5b1f5f3eaa3c75f",3:"00bcf5022e7d98b672a2",4:"c9d5b75efaa28b779e79",5:"93d874959b80a4ee1da1",6:"de3228ef1e13c7d6649c",7:"a1746a1c89c587b75f6f",8:"67319477a4c5ac59b510",9:"cf187b6df4a386b203eb",10:"f6e85397f46b6b94d58d",11:"a5e798e367bdaa3003e9",12:"b8ac2b08a54dd44dc799"}[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.272774d75bca469e2f4c.js.map
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,b=[];d<r.length;d++)i=r[d],t[i]&&b.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);b.length;)b.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:"870a31b2b5a5125962ab",1:"f7fd3566ec61ced38fe8",2:"48bde5b1f5f3eaa3c75f",3:"00bcf5022e7d98b672a2",4:"c9d5b75efaa28b779e79",5:"93d874959b80a4ee1da1",6:"de3228ef1e13c7d6649c",7:"a1746a1c89c587b75f6f",8:"67319477a4c5ac59b510",9:"cf187b6df4a386b203eb",10:"f6e85397f46b6b94d58d",11:"a5e798e367bdaa3003e9",12:"b8ac2b08a54dd44dc799"}[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.f8cc02553244364f2c4b.js.map

view/molistar/modules/pay/css/index.css

@@ -443,6 +443,7 @@ body {
   padding: 0 0.32rem 0 0.42667rem;
   overflow: hidden;
   margin-bottom: 0.26667rem;
+  position: relative;
 }
 
 .page2 ul li .left {
@@ -451,8 +452,8 @@ body {
 
 .page2 ul li .left .name {
   width: 5rem;
-  margin-top: 0.4rem;
-  margin-bottom: 0.2rem;
+  margin-top: 0.26667rem;
+  margin-bottom: 0.13333rem;
 }
 
 .page2 ul li .left .name b {
@@ -504,6 +505,30 @@ body {
   margin-top: 0.14rem;
 }
 
+.page2 ul li .left .starLevel {
+  height: 0.4rem;
+  line-height: 0.4rem;
+  display: flex;
+  float: left;
+  position: absolute;
+  bottom: 0.2rem;
+  left: 0.3rem;
+}
+
+.page2 ul li .left .starLevel span {
+  height: 0.4rem;
+  margin-right: 0.10667rem;
+  color: #8A8CAB;
+  font-size: 0.32rem;
+}
+
+.page2 ul li .left .starLevel img {
+  width: 0.4rem;
+  height: 0.4rem;
+  display: block;
+  margin: 0 0.04rem;
+}
+
 .page2 ul li .copy {
   width: 1.76rem;
   height: 0.77333rem;
@@ -1036,3 +1061,11 @@ body {
   padding-left: 0;
   padding-right: 0.42667rem;
 }
+
+.arabic .page2 ul li {
+  direction: ltr;
+}
+
+.arabic .page2 ul li .id {
+  text-align-last: left;
+}

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

@@ -453,14 +453,15 @@ body {
             padding: 0 px2rem(24) 0 px2rem(32);
             overflow: hidden;
             margin-bottom: px2rem(20);
+            position: relative;
 
             .left {
                 float: left;
 
                 .name {
                     width: 5rem;
-                    margin-top: px2rem(30);
-                    margin-bottom: px2rem(15);
+                    margin-top: px2rem(20);
+                    margin-bottom: px2rem(10);
 
                     b {
                         color: #1F1B4F;
@@ -511,6 +512,30 @@ body {
                     float: left;
                     margin-top: 0.14rem;
                 }
+
+                .starLevel {
+                    height: px2rem(30);
+                    line-height: px2rem(30);
+                    display: flex;
+                    float: left;
+                    position: absolute;
+                    bottom: 0.2rem;
+                    left: 0.3rem;
+
+                    span {
+                        height: px2rem(30);
+                        margin-right: px2rem(8);
+                        color: #8A8CAB;
+                        font-size: px2rem(24);
+                    }
+
+                    img {
+                        width: px2rem(30);
+                        height: px2rem(30);
+                        display: block;
+                        margin: 0 px2rem(3);
+                    }
+                }
             }
 
             .copy {
@@ -1051,6 +1076,7 @@ body {
         background: url(../images/tab2.png) no-repeat;
         background-size: 100% 100%;
     }
+
     .tab2 {
         background: url(../images/tab1.png) no-repeat;
         background-size: 100% 100%;
@@ -1060,4 +1086,12 @@ body {
         padding-left: 0;
         padding-right: 0.42667rem;
     }
+
+    .page2 ul li {
+        direction: ltr;
+
+        .id {
+            text-align-last: left;
+        }
+    }
 }

view/molistar/modules/pay/index.html

@@ -9,7 +9,7 @@
     <!-- 充值 -->
     <link rel="stylesheet" href="../../common/css/reset.css">
     <link rel="stylesheet" href="../../common/css/flex.css">
-    <link rel="stylesheet" href="./css/index.css?v=1.4">
+    <link rel="stylesheet" href="./css/index.css?v=2">
 </head>
 
 <body>
@@ -185,9 +185,9 @@
 <script src="../../common/js/layer.js"></script>
 <script src="../../common/js/vconsole.min.js"></script>
 <script src="../../common/js/jquery.copy.min.js"></script>
-<script src="./local/en.js?v=1.4"></script>
-<script src="./local/zh.js?v=1.4"></script>
-<script src="./local/ar.js?v=1.4"></script>
-<script src="./local/tr.js?v=1.4"></script>
-<script src="./js/index.js?v=1.4"></script>
+<script src="./local/en.js?v=2"></script>
+<script src="./local/zh.js?v=2"></script>
+<script src="./local/ar.js?v=2"></script>
+<script src="./local/tr.js?v=2"></script>
+<script src="./js/index.js?v=2"></script>
 <script src="../../common/local/langHandler.js"></script>

view/molistar/modules/pay/js/index.js

@@ -468,6 +468,10 @@ function rechargeUserList(regionCode) {
                                     <span style="display:${res.isOnline == 0 ? 'none' : 'block'}"><i></i>${langReplace(localLang.demoModule.text27)}</span>
                                 </div>
                                 <div class="id">molistar ID：${res.erbanNo}</div>
+                                <div class="starLevel">
+                                    <span></span>
+                                    ${starFun(res)}
+                                </div>
                             </div>
                             <div class="but" uid=${res.uid} erbanNo=${res.erbanNo}>${langReplace(localLang.demoModule.text28)}</div>
                             <div id="copy" class="copy" uid=${res.uid} erbanNo=${res.erbanNo}>${langReplace(localLang.demoModule.text29)}</div>
@@ -488,6 +492,22 @@ function rechargeUserList(regionCode) {
 
     });
 }
+// 处理星级
+function starFun(res) {
+    var str = '';
+    var starNum = 5;
+    for (let index = 1; index <= res.starLevel; index++) {
+      str += `
+        <img src="./images/starAct.png" alt="" class="star">
+      `
+    }
+    for (let index = 1; index <= starNum - res.starLevel; index++) {
+      str += `
+        <img src="./images/star.png" alt="" class="star">
+      `
+    }
+    return str;
+  }
 // 复制id按钮
 $('.page2 ul').on('click', 'li .copy', function () {
     var erbanNo = $(this).attr('erbanNo');

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

@@ -48,6 +48,7 @@ langAr = {
     <p><b>ملاحظات:</b></p>
     <p>1. الحد الأقصى لإعادة الشحن اليومية هو 60,000 جنيه مصري.</p>
     <p>2. بعد إعادة الشحن، يُرجى الاتصال بخدمة العملاء الرسمية لتأكيد المعاملة حتى نتمكن من إعادة شحن عملاتك في الوقت المناسب.</p>
-    <p><b>شكرًا لدعمكم ونتمنى لكم استخدامًا سعيدًا!</b></p>`
+    <p><b>شكرًا لدعمكم ونتمنى لكم استخدامًا سعيدًا!</b></p>`,
+        textnew18: 'تقييم النجوم:',
     }
 }

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

@@ -54,5 +54,6 @@ langEn = {
         can recharge your coins in time.</p>
     <p><b>Thank you for your support and wish you a happy use!</b></p>
 </div>`,
+        textnew18: `Star rating:`,
     }
 }

view/molistar/modules/pay/local/tr.js

@@ -46,5 +46,6 @@ langTr = {
     <p>2 Yükleme yaptıktan sonra, işlemi doğrulamak için lütfen resmi müşteri hizmetleri ile iletişime geçin, böylece coin'lerinizi zamanında yükleyebiliriz.</p>
     <p><b>Desteğiniz için teşekkür ederiz ve iyi kullanımlar dileriz!</b></p>
 </div>`,
+        textnew18: 'Yıldız değerlendirmesi:',
     }
 }

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

@@ -50,6 +50,7 @@ langZh = {
     <p><b>注意：</b></p>
     <p>1. 每日充值上限為60,000埃及鎊。</p>
     <p>2. 充值後，請聯繫官方客服確認交易，以便我們及時充值您的金幣。</p>
-    <p><b>感謝您的支持，祝您使用愉快！</b></p>`
+    <p><b>感謝您的支持，祝您使用愉快！</b></p>`,
+        textnew18: '星級評分：',
     }
 }

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

@@ -29,7 +29,8 @@ service.interceptors.request.use(config => {
             config.headers = {
                 'h5_token': window.sessionStorage.getItem('ticket'),
                 //   'pub_uid': window.sessionStorage.getItem('uid'),
-                'client': 'h5'
+                'client': 'h5',
+                'Accept-language': info.deviceInfo['Accept-Language'],
             }
             // } if(router.apps[0]._route.name === 'GoldLog'){
             //     config.headers = {
@@ -41,7 +42,8 @@ service.interceptors.request.use(config => {
             config.headers = {
                 'h5_token': window.sessionStorage.getItem('ticket'),
                 'pub_uid': window.sessionStorage.getItem('uid'),
-                'client': 'h5'
+                'client': 'h5',
+                'Accept-language': info.deviceInfo['Accept-Language'],
             }
         }
 
@@ -50,13 +52,15 @@ service.interceptors.request.use(config => {
             config.headers = {
                 'pub_ticket': window.sessionStorage.getItem('ticket'),
                 //   'pub_uid': window.sessionStorage.getItem('uid'),
-                'client': 'h5'
+                'client': 'h5',
+                'Accept-language': info.deviceInfo['Accept-Language'],
             }
         } else {
             config.headers = {
                 'pub_ticket': window.sessionStorage.getItem('ticket'),
                 'pub_uid': window.sessionStorage.getItem('uid'),
                 'client': 'h5',
+                'Accept-language': info.deviceInfo['Accept-Language'],
             }
         }
     }