修改翻译

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

@@ -388,6 +388,7 @@ body {
   position: absolute;
   top: 1.17333rem;
   left: 2.37333rem;
+  border-radius: 50%;
 }
 
 .page1 .content .topBox .top1 .txR {
@@ -396,6 +397,7 @@ body {
   position: absolute;
   top: 1.17333rem;
   right: 2.37333rem;
+  border-radius: 50%;
 }
 
 .page1 .content .topBox .top1 .nameL {
@@ -463,6 +465,7 @@ body {
   transform: translateX(-50%);
   background: rgba(0, 0, 0, 0.3);
   padding: 0 0.14667rem;
+  white-space: nowrap;
 }
 
 .page1 .content .topBox .top1 .sclore img {
@@ -506,6 +509,7 @@ body {
   position: absolute;
   top: 1.04rem;
   left: 0.44rem;
+  border-radius: 50%;
 }
 
 .page1 .content .topBox .top2 .txR {
@@ -514,6 +518,7 @@ body {
   position: absolute;
   top: 1.04rem;
   right: 0.44rem;
+  border-radius: 50%;
 }
 
 .page1 .content .topBox .top2 .nameL {
@@ -581,6 +586,7 @@ body {
   transform: translateX(-50%);
   background: rgba(0, 0, 0, 0.3);
   padding: 0 0.14667rem;
+  white-space: nowrap;
 }
 
 .page1 .content .topBox .top2 .sclore img {
@@ -624,6 +630,7 @@ body {
   position: absolute;
   top: 1.04rem;
   left: 0.44rem;
+  border-radius: 50%;
 }
 
 .page1 .content .topBox .top3 .txR {
@@ -632,6 +639,7 @@ body {
   position: absolute;
   top: 1.04rem;
   right: 0.44rem;
+  border-radius: 50%;
 }
 
 .page1 .content .topBox .top3 .nameL {
@@ -699,6 +707,7 @@ body {
   transform: translateX(-50%);
   background: rgba(0, 0, 0, 0.3);
   padding: 0 0.14667rem;
+  white-space: nowrap;
 }
 
 .page1 .content .topBox .top3 .sclore img {
@@ -794,6 +803,7 @@ body {
   position: absolute;
   top: 1.17333rem;
   left: 2.37333rem;
+  border-radius: 50%;
 }
 
 .page2 .content .topBox .top1 .txR {
@@ -802,6 +812,7 @@ body {
   position: absolute;
   top: 1.17333rem;
   right: 2.37333rem;
+  border-radius: 50%;
 }
 
 .page2 .content .topBox .top1 .nameL {
@@ -869,6 +880,7 @@ body {
   transform: translateX(-50%);
   background: rgba(0, 0, 0, 0.3);
   padding: 0 0.14667rem;
+  white-space: nowrap;
 }
 
 .page2 .content .topBox .top1 .sclore img {
@@ -912,6 +924,7 @@ body {
   position: absolute;
   top: 1.04rem;
   left: 0.44rem;
+  border-radius: 50%;
 }
 
 .page2 .content .topBox .top2 .txR {
@@ -920,6 +933,7 @@ body {
   position: absolute;
   top: 1.04rem;
   right: 0.44rem;
+  border-radius: 50%;
 }
 
 .page2 .content .topBox .top2 .nameL {
@@ -987,6 +1001,7 @@ body {
   transform: translateX(-50%);
   background: rgba(0, 0, 0, 0.3);
   padding: 0 0.14667rem;
+  white-space: nowrap;
 }
 
 .page2 .content .topBox .top2 .sclore img {
@@ -1030,6 +1045,7 @@ body {
   position: absolute;
   top: 1.04rem;
   left: 0.44rem;
+  border-radius: 50%;
 }
 
 .page2 .content .topBox .top3 .txR {
@@ -1038,6 +1054,7 @@ body {
   position: absolute;
   top: 1.04rem;
   right: 0.44rem;
+  border-radius: 50%;
 }
 
 .page2 .content .topBox .top3 .nameL {
@@ -1105,6 +1122,7 @@ body {
   transform: translateX(-50%);
   background: rgba(0, 0, 0, 0.3);
   padding: 0 0.14667rem;
+  white-space: nowrap;
 }
 
 .page2 .content .topBox .top3 .sclore img {

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

@@ -397,6 +397,7 @@ body {
                     position: absolute;
                     top: px2rem(88);
                     left: px2rem(178);
+                    border-radius: 50%;
                 }
 
                 .txR {
@@ -405,6 +406,7 @@ body {
                     position: absolute;
                     top: px2rem(88);
                     right: px2rem(178);
+                    border-radius: 50%;
                 }
 
                 .nameL {
@@ -473,6 +475,7 @@ body {
                     transform: translateX(-50%);
                     background: rgba(0, 0, 0, .3);
                     padding: 0 px2rem(11);
+                    white-space: nowrap;
 
                     img {
                         display: inline-block;
@@ -516,6 +519,7 @@ body {
                     position: absolute;
                     top: px2rem(78);
                     left: px2rem(33);
+                    border-radius: 50%;
                 }
 
                 .txR {
@@ -524,6 +528,7 @@ body {
                     position: absolute;
                     top: px2rem(78);
                     right: px2rem(33);
+                    border-radius: 50%;
                 }
 
                 .nameL {
@@ -592,6 +597,7 @@ body {
                     transform: translateX(-50%);
                     background: rgba(0, 0, 0, .3);
                     padding: 0 px2rem(11);
+                    white-space: nowrap;
 
                     img {
                         display: inline-block;
@@ -635,6 +641,7 @@ body {
                     position: absolute;
                     top: px2rem(78);
                     left: px2rem(33);
+                    border-radius: 50%;
                 }
 
                 .txR {
@@ -643,6 +650,7 @@ body {
                     position: absolute;
                     top: px2rem(78);
                     right: px2rem(33);
+                    border-radius: 50%;
                 }
 
                 .nameL {
@@ -711,6 +719,7 @@ body {
                     transform: translateX(-50%);
                     background: rgba(0, 0, 0, .3);
                     padding: 0 px2rem(11);
+                    white-space: nowrap;
 
                     img {
                         display: inline-block;
@@ -807,6 +816,7 @@ body {
                     position: absolute;
                     top: px2rem(88);
                     left: px2rem(178);
+                    border-radius: 50%;
                 }
 
                 .txR {
@@ -815,6 +825,7 @@ body {
                     position: absolute;
                     top: px2rem(88);
                     right: px2rem(178);
+                    border-radius: 50%;
                 }
 
                 .nameL {
@@ -883,6 +894,7 @@ body {
                     transform: translateX(-50%);
                     background: rgba(0, 0, 0, .3);
                     padding: 0 px2rem(11);
+                    white-space: nowrap;
 
                     img {
                         display: inline-block;
@@ -926,6 +938,7 @@ body {
                     position: absolute;
                     top: px2rem(78);
                     left: px2rem(33);
+                    border-radius: 50%;
                 }
 
                 .txR {
@@ -934,6 +947,7 @@ body {
                     position: absolute;
                     top: px2rem(78);
                     right: px2rem(33);
+                    border-radius: 50%;
                 }
 
                 .nameL {
@@ -1002,6 +1016,7 @@ body {
                     transform: translateX(-50%);
                     background: rgba(0, 0, 0, .3);
                     padding: 0 px2rem(11);
+                    white-space: nowrap;
 
                     img {
                         display: inline-block;
@@ -1045,6 +1060,7 @@ body {
                     position: absolute;
                     top: px2rem(78);
                     left: px2rem(33);
+                    border-radius: 50%;
                 }
 
                 .txR {
@@ -1053,6 +1069,7 @@ body {
                     position: absolute;
                     top: px2rem(78);
                     right: px2rem(33);
+                    border-radius: 50%;
                 }
 
                 .nameL {
@@ -1121,6 +1138,7 @@ body {
                     transform: translateX(-50%);
                     background: rgba(0, 0, 0, .3);
                     padding: 0 px2rem(11);
+                    white-space: nowrap;
 
                     img {
                         display: inline-block;

view/molistar/activity/customizedGift/index.html

@@ -0,0 +1,257 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title class="text1"></title>
+    <link rel="stylesheet" href="../../common/css/reset.css">
+    <link rel="stylesheet" href="./css/index.css">
+</head>
+
+<body>
+    <!-- 頂部返回 -->
+    <div class="back">
+        <img src="./images/travel/back.png" alt="">
+    </div>
+    <!-- header -->
+    <div class="header"></div>
+    <!-- 标题盒子 -->
+    <div class="activityIntroduction">
+        <div class="title text2"></div>
+        <div class="box text3">
+            
+        </div>
+    </div>
+    <!-- 上周前三榜单 -->
+    <div class="lastWeek">
+        <div class="top">
+            <div class="title text4"></div>
+            <div class="top1">
+                <img src="./images/null.png" alt="" class="tx">
+                <div class="name"><b class="text5"></b><strong></strong></div>
+                <div class="giftedTime"><b class="text6"></b><strong></strong></div>
+            </div>
+            <div class="top2">
+                <img src="./images/null.png" alt="" class="tx">
+                <div class="name"><b class="text5">Gift name:</b><strong></strong></div>
+                <div class="giftedTime"><b class="text6">Gifted time:</b><strong></strong></div>
+            </div>
+            <div class="top3">
+                <img src="./images/null.png" alt="" class="tx">
+                <div class="name"><b class="text5">Gift name:</b><strong></strong></div>
+                <div class="giftedTime"><b class="text6">Gifted time:</b><strong></strong></div>
+            </div>
+        </div>
+        <div class="content">
+        </div>
+        <div class="bottom"></div>
+    </div>
+    <!-- tab切换 -->
+    <div class="tabBox">
+        <div class="text7"></div>
+        <div class="act text8"></div>
+    </div>
+    <!-- 本周榜单 -->
+    <div class="page1">
+        <div class="thisWeek">
+            <div class="top">
+                <!-- 规则 -->
+                <div class="rule text9"></div>
+                <!-- 奖励 -->
+                <div class="reward">
+                    <span class="text10"></span>
+                </div>
+                <!-- 倒计时 -->
+                <div class="countdownText text11"></div>
+                <div class="countdown">
+                    <div class="day">
+                        <span>0</span>
+                        <b class="text12"></b>
+                    </div>
+                    <div class="hours">
+                        <span>0</span>
+                        <b class="text13"></b>
+                    </div>
+                    <div class="mins">
+                        <span>0</span>
+                        <b class="text14"></b>
+                    </div>
+                    <div class="secs">
+                        <span>0</span>
+                        <b class="text15"></b>
+                    </div>
+                </div>
+                <div class="top1">
+                    <img src="./images/null.png" alt="" class="tx">
+                    <div class="name"><b class="text5">Gift name:</b><strong></strong></div>
+                    <div class="giftedTime"><b class="text6">Gifted time:</b><strong></strong></div>
+                </div>
+                <div class="top2">
+                    <img src="./images/null.png" alt="" class="tx">
+                    <div class="name"><b class="text5">Gift name:</b><strong></strong></div>
+                    <div class="giftedTime"><b class="text6">Gifted time:</b><strong></strong></div>
+                </div>
+                <div class="top3">
+                    <img src="./images/null.png" alt="" class="tx">
+                    <div class="name"><b class="text5">Gift name:</b><strong></strong></div>
+                    <div class="giftedTime"><b class="text6">Gifted time:</b><strong></strong></div>
+                </div>
+            </div>
+            <div class="content">
+                <ul>
+                    <li>
+                        <div class="num">0</div>
+                        <img src="./images/null.png" alt="" class="tx">
+                        <div class="giftInfo">
+                            <p>Gift name:GAÚCHA</p>
+                            <b>Gifted time:500</b>
+                        </div>
+                    </li>
+                </ul>
+            </div>
+            <div class="bottom"></div>
+        </div>
+    </div>
+    <!-- 自己榜单 -->
+    <div class="page2">
+        <div class="myList">
+            <div class="top">
+                <!-- 规则 -->
+                <div class="rule text9">Rule</div>
+                <!-- 奖励 -->
+                <div class="reward">
+                    <span class="text10">Reward</span>
+                </div>
+                <!-- 倒计时 -->
+                <div class="countdownText text16"></div>
+                <div class="countdown">
+                    <div class="day">
+                        <span>0</span>
+                        <b class="text12">Day</b>
+                    </div>
+                    <div class="hours">
+                        <span>0</span>
+                        <b class="text13">Hours</b>
+                    </div>
+                    <div class="mins">
+                        <span>0</span>
+                        <b class="text14">Mins</b>
+                    </div>
+                    <div class="secs">
+                        <span>0</span>
+                        <b class="text15">Secs</b>
+                    </div>
+                </div>
+                <div class="my">
+                    <img src="./images/null.png" alt="" class="tx">
+                    <div>
+                        <p>Momo</p>
+                        <b>Gifted time:0</b>
+                        <span>Coins of Gifted:0</span>
+                    </div>
+                </div>
+            </div>
+            <div class="content">
+                <ul>
+                    <li>
+                        <div class="num">0</div>
+                        <img src="./images/ts1.png" alt="" class="ts">
+                        <img src="./images/null.png" alt="" class="tx">
+                        <span>名称</span>
+                        <div class="giftInfo">
+                            <p>Gifted time:500</p>
+                            <b>Coins of Gifted:900</b>
+                        </div>
+                    </li>
+                </ul>
+            </div>
+            <div class="bottom"></div>
+        </div>
+    </div>
+    <!-- 规则 -->
+    <div class="ruleBox">
+        <div class="rule_in">
+            <div class="title text9">Rule</div>
+            <img src="./images/close.png" alt="" class="close">
+            <div class="box text17">
+                
+            </div>
+        </div>
+    </div>
+    <!-- 规则 -->
+    <div class="ruleBox2">
+        <div class="rule_in">
+            <div class="title text9">Rule</div>
+            <img src="./images/close.png" alt="" class="close">
+            <div class="box text18">
+                
+            </div>
+        </div>
+    </div>
+    <!-- 奖励 -->
+    <div class="rewardBox">
+        <div class="rule_in">
+            <div class="title text10">Reward</div>
+            <img src="./images/close.png" alt="" class="close">
+            <div class="box">
+                <p class="text19"></p>
+                <img src="./images/reward1.png" alt="" class="img1">
+                <p class="text20"></p>
+                <img src="./images/reward2.png" alt="" class="img2">
+                <p class="text21" style="margin-bottom: .3rem;"></p>
+                <p class="text22"></p>
+                <img src="./images/reward3.png" alt="" class="img3">
+            </div>
+        </div>
+    </div>
+    <!-- 奖励2 -->
+    <div class="rewardBox2">
+        <div class="rule_in">
+            <div class="title text10">Reward</div>
+            <img src="./images/close.png" alt="" class="close">
+            <div class="stabBox">
+                <div>700</div>
+                <div>2100</div>
+                <div>3500</div>
+                <div>4900</div>
+                <div>5600</div>
+                <div class="act">7000</div>
+            </div>
+            <div class="box">
+                <p class="text23" style="text-align: center;"></p>
+                <img src="./images/1.png" alt="" class="img1">
+                <img src="./images/2.png" alt="" class="img2">
+                <img src="./images/3.png" alt="" class="img3">
+                <div style="display: none;" class="img4 boxs">
+                    <div class="why">
+                        <span class="text24"></span>
+                    </div>
+                </div>
+                <div style="display: none;" class="img5 boxs">
+                    <div class="why">
+                        <span class="text244"></span>
+                    </div>
+                </div>
+                <div class="img6 boxs">
+                    <div class="why">
+                        <span class="text2444"></span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+
+</html>
+<script src="../../common/js/flexible.js"></script>
+<script src="../../common/js/jquery-3.2.1.min.js"></script>
+<script src="../../common/js/common2.js"></script>
+<script src="../../common/js/layer.js"></script>
+<script src="../../common/js/vconsole.min.js"></script>
+<script src="../../common/js/route-constant.js"></script>
+<script src="./local/en.js"></script>
+<script src="./local/zh.js"></script>
+<script src="./local/ar.js"></script>
+<script src="./js/index.js"></script>
+<script src="../../common/local/langHandler.js"></script>

view/molistar/activity/customizedGift/js/index.js

@@ -0,0 +1,348 @@
+let urlPrefix = getUrlPrefix()
+let browser = checkVersion()
+let env = EnvCheck();
+if (env == 'test') {
+    new VConsole();
+}
+// 封裝layer消息提醒框
+let layerIndex
+var langReplace;
+var localLang;
+const showLoading = (content = langReplace(localLang.demoModule.layerIndex1)) => {
+    layer.open({
+        type: 2,
+        shadeClose: false,
+        content,
+        success(e) {
+            layerIndex = $(e).attr('index')
+        }
+    })
+}
+const hideLoading = (index) => {
+    layer.close(index)
+}
+const toastMsg = (content = langReplace(localLang.demoModule.layerIndex2), time = 2) => {
+    layer.open({
+        content,
+        time,
+        skin: 'msg'
+    })
+}
+var countupTime1;//倒计时容器
+var countupTime2;//倒计时容器
+// 初始化函數
+$(function () {
+    getInfoFromClient();
+    fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言
+    setTimeout(function () {
+        // 頁面全屏
+        if (browser.app) {
+            if (browser.android) {
+                window.androidJsObj.initShowNav(false)
+            } else {
+                window.webkit.messageHandlers.initShowNav.postMessage(0)
+            }
+        };
+        // 頂部返回事件
+        $('.back img').click(() => {
+            if (browser.android) {
+                window.androidJsObj.closeWebView()
+            } else {
+                window.webkit.messageHandlers.closeWebView.postMessage(null)
+            }
+        })
+        fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言
+        langReplace = window.lang.replace;
+        localLang = window.lang;
+        translateFun();
+        rankGift();
+        giftRank();
+    }, 100)
+})
+function translateFun() {
+    var langReplace = window.lang.replace;
+    var localLang = window.lang;
+    $('.text1').html(langReplace(localLang.demoModule.text1));
+    $('.text2').html(langReplace(localLang.demoModule.text2));
+    $('.text3').html(langReplace(localLang.demoModule.text3));
+    $('.text4').html(langReplace(localLang.demoModule.text4));
+    $('.text5').html(langReplace(localLang.demoModule.text5));
+    $('.text6').html(langReplace(localLang.demoModule.text6));
+    $('.text7').html(langReplace(localLang.demoModule.text7));
+    $('.text8').html(langReplace(localLang.demoModule.text8));
+    $('.text9').html(langReplace(localLang.demoModule.text9));
+    $('.text10').html(langReplace(localLang.demoModule.text10));
+    $('.text11').html(langReplace(localLang.demoModule.text11));
+    $('.text12').html(langReplace(localLang.demoModule.text12));
+    $('.text13').html(langReplace(localLang.demoModule.text13));
+    $('.text14').html(langReplace(localLang.demoModule.text14));
+    $('.text15').html(langReplace(localLang.demoModule.text15));
+    $('.text16').html(langReplace(localLang.demoModule.text16));
+    $('.text17').html(langReplace(localLang.demoModule.text17));
+    $('.text18').html(langReplace(localLang.demoModule.text18));
+    $('.text19').html(langReplace(localLang.demoModule.text19));
+    $('.text20').html(langReplace(localLang.demoModule.text20));
+    $('.text21').html(langReplace(localLang.demoModule.text21));
+    $('.text22').html(langReplace(localLang.demoModule.text22));
+    $('.text23').html(langReplace(localLang.demoModule.text23));
+    $('.text24').html(langReplace(localLang.demoModule.text24));
+    $('.text244').html(langReplace(localLang.demoModule.text244));
+    $('.text2444').html(langReplace(localLang.demoModule.text2444));
+    $('.text25').html(langReplace(localLang.demoModule.text25));
+    $('.rewardBox .rule_in .box .img1').attr('src', langReplace(localLang.demoModule.img1));
+    $('.rewardBox2 .rule_in .box .img1').attr('src', langReplace(localLang.demoModule.img2));
+    $('.rewardBox2 .rule_in .box .img2').attr('src', langReplace(localLang.demoModule.img3));
+    $('.rewardBox2 .rule_in .box .img3').attr('src', langReplace(localLang.demoModule.img4));
+}
+// 第一Tab接口
+function rankGift() {
+    showLoading()
+    networkRequest({
+        type: 'get',
+        url: urlPrefix + '/activity/h5/special/gift/rank/gift',
+        data: { uid: pubInfo.uid },
+        success(res) {
+            if (res.code === 200) {
+                // 处理倒计时
+                countup1(res.data.endTime - res.timestamp);
+                var listTo3 = res.data.lastWeekTop.slice(0, 3);
+                if (listTo3.length < 3) {
+                    let arr = new Array(3 - listTo3.length).fill({
+                        picUrl: './images/null.png',
+                        giftName: 'Vacant',
+                        giftNum: "Vacant"
+                    })
+                    listTo3.push(...arr)
+                }
+                // 处理上周数据
+                listTo3.forEach((res, i) => {
+                    $(`.lastWeek .top .top${i + 1} .tx`).attr('src', res.picUrl);
+                    $(`.lastWeek .top .top${i + 1} .name strong`).text(res.giftName);
+                    $(`.lastWeek .top .top${i + 1} .giftedTime strong`).text(res.giftNum);
+                })
+                var thisListTo3 = res.data.thisWeekTop.slice(0, 3);
+                var notThisListTo3 = res.data.thisWeekTop.slice(3);
+                if (thisListTo3.length < 3) {
+                    let arr = new Array(3 - thisListTo3.length).fill({
+                        picUrl: './images/null.png',
+                        giftName: 'Vacant',
+                        giftNum: "Vacant"
+                    })
+                    thisListTo3.push(...arr)
+                }
+                // 处理本周前三
+                thisListTo3.forEach((res, i) => {
+                    $(`.page1 .thisWeek .top .top${i + 1} .tx`).attr('src', res.picUrl);
+                    $(`.page1 .thisWeek .top .top${i + 1} .name strong`).text(res.giftName);
+                    $(`.page1 .thisWeek .top .top${i + 1} .giftedTime strong`).text(res.giftNum);
+                })
+                // 本周非前三
+                $('.page1 .thisWeek .content ul li').remove();
+                var str = '';
+                notThisListTo3.forEach(res => {
+                    str += `
+                        <li>
+                            <div class="num">${res.rank}</div>
+                            <img src="${res.picUrl}" alt="" class="tx">
+                            <div class="giftInfo">
+                                <p>${langReplace(localLang.demoModule.text5)}${res.giftName}</p>
+                                <b>${langReplace(localLang.demoModule.text6)}${res.giftNum}</b>
+                            </div>
+                        </li>
+                    `
+                })
+                $('.page1 .thisWeek .content ul').append(str);
+            } else {
+                toastMsg(res.message)
+            }
+            hideLoading(layerIndex)
+        },
+        error(err) {
+            hideLoading(layerIndex)
+            toastMsg(langReplace(localLang.demoModule.layerIndex3))
+        }
+    })
+}
+// 第二Tab接口
+function giftRank() {
+    showLoading()
+    networkRequest({
+        type: 'get',
+        url: urlPrefix + '/activity/h5/special/gift/rank',
+        data: { uid: pubInfo.uid },
+        success(res) {
+            if (res.code === 200) {
+                // 处理倒计时
+                countup2(res.data.endTime - res.timestamp);
+                // 处理自己
+                $('.page2 .myList .top .my .tx').attr('src', res.data.myRank.avatar);
+                $('.page2 .myList .top .my p').text(res.data.myRank.name);
+                $('.page2 .myList .top .my b').text(langReplace(localLang.demoModule.text5) + unitProcessingAr(res.data.myRank.totalNum, 1));
+                $('.page2 .myList .top .my span').text(langReplace(localLang.demoModule.text25) + unitProcessingAr(res.data.myRank.totalGoldNum, 1));
+                // 处理列表
+                $('.page2 .myList .content ul li').remove();
+                var str = '';
+                res.data.rankList.forEach(res => {
+                    str += `
+                        <li>
+                            <div class="num">${res.rank}</div>
+                            <img style="display:${res.rank <= 3 ? 'block' : 'none'}" src="./images/ts${res.rank}.png" alt="" class="ts">
+                            <img src="${res.avatar}" alt="" class="tx">
+                            <span>${res.name}</span>
+                            <div class="giftInfo">
+                                <p>${langReplace(localLang.demoModule.text5)}${unitProcessingAr(res.totalNum, 1)}</p>
+                                <b>${langReplace(localLang.demoModule.text25)}${unitProcessingAr(res.totalGoldNum, 1)}</b>
+                            </div>
+                        </li>
+                    `
+                })
+                $('.page2 .myList .content ul').append(str);
+            } else {
+                toastMsg(res.message)
+            }
+            hideLoading(layerIndex)
+        },
+        error(err) {
+            hideLoading(layerIndex)
+            toastMsg(langReplace(localLang.demoModule.layerIndex3))
+        }
+    })
+}
+// tab切换
+$('.tabBox div').click(function () {
+    var i = $(this).index() + 1;
+    $(this).addClass('act').siblings().removeClass('act');
+    $(`.page1,.page2`).hide();
+    $(`.page${i}`).show();
+})
+// 倒計時
+function countup1(leftTime, type) {
+    clearTimeout(countupTime1)
+    //獲取當前時間
+    // var now = nowTime;
+    var d = 0;
+    var h = 0;
+    var m = 0;
+    var s = 0;
+    //定義變數 d,h,m,s保存倒計時的時間
+    var d, h, m, s;
+    //遞歸每秒調⽤countTime⽅法，顯⽰動態時間效果 
+    if (leftTime > 0) {
+        d = getzf(Math.floor(leftTime / 1000 / 60 / 60 / 24));
+        h = getzf(Math.floor(leftTime / 1000 / 60 / 60 % 24));
+        m = getzf(Math.floor(leftTime / 1000 / 60 % 60));
+        s = getzf(Math.floor(leftTime / 1000 % 60));
+        //將倒計時賦值到div中
+        $(`.page1 .thisWeek .top .countdown .day span`).text(d);
+        $(`.page1 .thisWeek .top .countdown .hours span`).text(h);
+        $(`.page1 .thisWeek .top .countdown .mins span`).text(m);
+        $(`.page1 .thisWeek .top .countdown .secs span`).text(s);
+    } else {
+        rankGift();
+    }
+    if (leftTime > 0) {
+        leftTime = leftTime - 1000;
+    }
+    countupTime1 = setTimeout(function () {
+        countup1(leftTime);
+    }, 1000);
+}
+function countup2(leftTime, type) {
+    clearTimeout(countupTime2)
+    //獲取當前時間
+    // var now = nowTime;
+    var d = 0;
+    var h = 0;
+    var m = 0;
+    var s = 0;
+    //定義變數 d,h,m,s保存倒計時的時間
+    var d, h, m, s;
+    //遞歸每秒調⽤countTime⽅法，顯⽰動態時間效果 
+    if (leftTime > 0) {
+        d = getzf(Math.floor(leftTime / 1000 / 60 / 60 / 24));
+        h = getzf(Math.floor(leftTime / 1000 / 60 / 60 % 24));
+        m = getzf(Math.floor(leftTime / 1000 / 60 % 60));
+        s = getzf(Math.floor(leftTime / 1000 % 60));
+        //將倒計時賦值到div中
+        $(`.page2 .myList .top .countdown .day span`).text(d);
+        $(`.page2 .myList .top .countdown .hours span`).text(h);
+        $(`.page2 .myList .top .countdown .mins span`).text(m);
+        $(`.page2 .myList .top .countdown .secs span`).text(s);
+    } else {
+        giftRank();
+    }
+    if (leftTime > 0) {
+        leftTime = leftTime - 1000;
+    }
+    countupTime2 = setTimeout(function () {
+        countup2(leftTime);
+    }, 1000);
+}
+//补0操作  
+function getzf(num) {
+    if (parseInt(num) < 10) {
+        num = '0' + num;
+    }
+    return num;
+}
+// 打开规则
+$('.page2 .myList .top .rule').click(function () {
+    $('.ruleBox').show();
+    bodyScroolFun(true);
+})
+// 关闭规则
+$('.ruleBox .rule_in .close').click(function () {
+    $('.ruleBox').hide();
+    bodyScroolFun(false);
+})
+// 打开规则
+$('.page1 .thisWeek .top .rule').click(function () {
+    $('.ruleBox2').show();
+    bodyScroolFun(true);
+})
+// 关闭规则
+$('.ruleBox2 .rule_in .close').click(function () {
+    $('.ruleBox2').hide();
+    bodyScroolFun(false);
+})
+// 打开奖励
+$('.page1 .thisWeek .top .reward').click(function () {
+    $('.rewardBox').show();
+    bodyScroolFun(true);
+})
+// 关闭奖励
+$('.rewardBox .rule_in .close').click(function () {
+    $('.rewardBox').hide();
+    bodyScroolFun(false);
+})
+// 打开奖励
+$('.page2 .myList .top .reward').click(function () {
+    $('.rewardBox2').show();
+    bodyScroolFun(true);
+})
+// 关闭奖励
+$('.rewardBox2 .rule_in .close').click(function () {
+    $('.rewardBox2').hide();
+    $('.rewardBox2 .rule_in .box .img6 .why span,.rewardBox2 .rule_in .box .img5 .why span,.rewardBox2 .rule_in .box .img4 .why span').hide();
+    bodyScroolFun(false);
+})
+
+// 奖励tab切换
+$('.rewardBox2 .rule_in .stabBox div').click(function () {
+    var i = $(this).index() + 1;
+    $('.text23').text(langReplace(localLang.demoModule[`texts${i}`]));
+    $(this).addClass('act').siblings().removeClass();
+    $('.rewardBox2 .rule_in .box img').hide();
+    $('.rewardBox2 .rule_in .box .boxs').hide();
+    $(`.rewardBox2 .rule_in .box .img${i}`).css('display', 'block');
+})
+$('.rewardBox2 .rule_in .box img,.rewardBox2 .rule_in .box div').click(function(){
+    $('.rewardBox2 .rule_in .box .img6 .why span').hide();
+    $('.rewardBox2 .rule_in .box .img5 .why span').hide();
+    $('.rewardBox2 .rule_in .box .img4 .why span').hide();
+    return false;
+})
+$('.rewardBox2 .rule_in .box .img6 .why,.rewardBox2 .rule_in .box .img5 .why,.rewardBox2 .rule_in .box .img4 .why').click(function () {
+    $('.rewardBox2 .rule_in .box .img6 .why span,.rewardBox2 .rule_in .box .img5 .why span,.rewardBox2 .rule_in .box .img4 .why span').css('display', 'block');
+    return false;
+})

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

@@ -0,0 +1,51 @@
+// 阿拉伯
+langAr = {
+        // 模块
+        demoModule: {
+                layerIndex1: `جار التحميل...`,
+                layerIndex2: `نجاح`,
+                layerIndex3: `خطأ في الشبكة`,
+                text1: `مسابقة الهدايا المخصصة`,
+                text2: `مقدمة النشاط`,
+                text3: `<p>هل فكرت يومًا في إرسال هدية مخصصة تعبر عن مشاعرك؟</p>
+<p>الآن، الفرصة قد جاءت! مسابقتنا للهدايا المخصصة تتيح لك تحميل هداياك المخصصة والحصول على التقدير في المسابقة. نتطلع إلى إبداعك وحماسك!</p>`,
+                text4: `أفضل 3 هدايا الأسبوع الماضي`,
+                text5: `اسم الهدية:`,
+                text6: `وقت الإهداء:`,
+                text7: `الهدايا المخصصة الشائعة`,
+                text8: `داعمي الهدايا المخصصة`,
+                text9: `القواعد`,
+                text10: `المكافأة`,
+                text11: `العد التنازلي`,
+                text12: `يوم`,
+                text13: `ساعة`,
+                text14: `دقيقة`,
+                text15: `ثانية`,
+                text16: `العد التنازلي`,
+                text17: `<p>1. وقت النشاط: من اليوم الأول من هذا الشهر إلى نهاية الشهر الثاني (GMT+3)</p>
+<p>2. احتساب عدد الهدايا المخصصة المرسلة خلال الحدث. كلما زادت الهدايا المرسلة، زادت المكافآت التي ستحصل عليها.</p>
+<p>3. هذا الحدث لا علاقة له بـ Google أو Apple</p>`,
+                text18: `<p>1. وقت بدء الحدث: من الساعة 00:00 كل يوم اثنين إلى الساعة 23:59 كل يوم أحد (GMT+3)</p>
+<p>2. أفضل 3 هدايا مخصصة شائعة ستفوز بجوائز سخية.</p>
+<p>3. هذا الحدث لا علاقة له بـ Google أو Apple</p>`,
+                text19: `المكافأة 1: عندما تحتل الهدية المخصصة المرتبة الأولى في قائمة هدايا هذا الأسبوع، سيتم تخصيص الهدية كصفحة بداية وبانر.`,
+                text20: `المكافأة 2: عندما تكون الهدايا المخصصة ضمن المراكز الثلاثة الأولى لهذا الأسبوع، سيتم تحديثها في لوحة الهدايا كهدية حصرية مخصصة.`,
+                text21: `المكافأة 3: عندما تكون الهدايا المخصصة ضمن المراكز الثلاثة الأولى لهذا الأسبوع، سيكون هناك منطقة مخصصة في صفحة الحدث لعرض الهدايا المقابلة.`,
+                text22: `المكافأة 4: عندما تكون الهدايا المخصصة ضمن المراكز الثلاثة الأولى لهذا الأسبوع، ستحظى هذه الهدايا الثلاثة بظهور خاص على لوحة الهدايا المخصصة.`,
+                text23: `خلال الحدث، إذا وصل عدد الهدايا المخصصة المرسلة إلى 7000، يمكنك الحصول على المكافآت التالية!`,
+                texts6: `خلال الحدث، إذا وصل عدد الهدايا المخصصة المرسلة إلى 7000 مرة، يمكنك الحصول على المكافآت التالية!`,
+                texts5: `خلال الحدث، إذا وصل عدد الهدايا المخصصة المرسلة إلى 5600 مرة، يمكنك الحصول على المكافآت التالية!`,
+                texts4: `خلال الحدث، إذا وصل عدد الهدايا المخصصة المرسلة إلى 4900 مرة، يمكنك الحصول على المكافآت التالية!`,
+                texts3: `خلال الحدث، إذا وصل عدد الهدايا المخصصة المرسلة إلى 3500 مرة، يمكنك الحصول على المكافآت التالية!`,
+                texts2: `خلال الحدث، إذا وصل عدد الهدايا المخصصة المرسلة إلى 2100 مرة، يمكنك الحصول على المكافآت التالية!`,
+                texts1: `خلال الحدث، إذا وصل عدد الهدايا المخصصة المرسلة إلى 700 مرة، يمكنك الحصول على المكافآت التالية!`,
+                text24: `يرجى الاتصال بخدمة العملاء لدينا، وتحميل فيديو سيارة مدته 5 ثوانٍ، وتخصيص سيارتك الخاصة.`,
+                text244: `يرجى الاتصال بخدمة العملاء لدينا، وتحميل فيديو سيارة مدته 8 ثوانٍ، وتخصيص سيارتك الخاصة.`,
+                text2444: `يرجى الاتصال بخدمة العملاء لدينا، وتحميل فيديو سيارة مدته 10 ثوانٍ، وتخصيص سيارتك الخاصة.`,
+                text25: `عدد عملات الهدايا:`,
+                img1: `./images/reward1-ar.png`,
+                img2: `./images/1-ar.png`,
+                img3: `./images/2-ar.png`,
+                img4: `./images/3-ar.png`,
+        }
+}

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

@@ -0,0 +1,79 @@
+langEn = {
+    demoModule: {
+        layerIndex1: `Loading...`,
+        layerIndex2: `Success`,
+        layerIndex3: `Network error`,
+        text1: `Custom Gift Competition`,
+        text2: `Activity introduction`,
+        text3: `<p>Have you ever thought about sending a custom gift that expresses your feelings?</p>
+        <p>Now, the opportunity has come! Our customized gift competition allows you to upload your own customized
+            gifts and gain recognition in the competition. Looking forward to your creativity and enthusiasm!</p>`,
+        text4: `Top 3 Gifts Last Week`,
+        text5: `Gift name:`,
+        text6: `Gifted time:`,
+        text7: `Popular Custom Gifts`,
+        text8: `Custom Gifts Supporter`,
+        text9: `Rule`,
+        text10: `Reward`,
+        text11: `Countdown`,
+        text12: `Day`,
+        text13: `Hours`,
+        text14: `Mins`,
+        text15: `Secs`,
+        text16: `Countdown`,
+        text17: `<p>1. Event time: the 1st of this month to the end of the second month(GMT+3)</p>
+        <p>2. Calculate the number of customized gifts sent during the event. The more gifts sent, the more you
+            will get.</p>
+        <p>3. This event has nothing to do with Google and Apple</p>`,
+        text18: `<p>1 Event start time: 00:00 every Monday - 23:59 every Sunday (GMT+3)</p>
+        <p>2. The Top3 popular customized gifts will get generous gifts.</p>
+        <p>3 This event has nothing to do with Google and Apple</p>`,
+        text19: `Reward 1: When the customized gift ranks first on this week’s gift list, the gift will
+        be customized
+        as a start page and banner.`,
+        text20: `Reward 2: When the customized gifts are among the top three of the week, they will be
+        updated to the
+        gift panel as an exclusive customized lucky gift.`,
+        text21: `Reward 3: When the customized gifts are among the top
+        three of the
+        week, there will be a specific area on the event page to display the corresponding gifts.`,
+        text22: `Reward 4: When the customized gifts are the top three of the week, these three gifts
+        will have a
+        special presence on the customized gift panel.`,
+        text23: `During the event, if the number of customized gifts sent
+        in the gift
+        times reaches 7000, you can get the following rewards!`,
+        texts6: `During the event, if the number of customized gifts sent
+        in the gift
+        times reaches 7000, you can get the following rewards!`,
+        texts5: `During the event, if the number of customized gifts sent
+        in the gift
+        times reaches 5600, you can get the following rewards!`,
+        texts4: `During the event, if the number of customized gifts sent
+        in the gift
+        times reaches 4900, you can get the following rewards!`,
+        texts3: `During the event, if the number of customized gifts sent
+        in the gift
+        times reaches 3500, you can get the following rewards!`,
+        texts2: `During the event, if the number of customized gifts sent
+        in the gift
+        times reaches 2100, you can get the following rewards!`,
+        texts1: `During the event, if the number of customized gifts sent
+        in the gift
+        times reaches 700, you can get the following rewards!`,
+        text24: `Please contact our customer service, upload a 5-second car video, and
+        customize your own
+        car.`,
+        text244: `Please contact our customer service, upload a 8-second car video, and
+        customize your own
+        car.`,
+        text2444: `Please contact our customer service, upload a 10-second car video, and
+        customize your own
+        car.`,
+        text25: `Coins of Gifted:`,
+        img1: `./images/reward1.png`,
+        img2: `./images/1.png`,
+        img3: `./images/2.png`,
+        img4: `./images/3.png`,
+    }
+}

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

@@ -0,0 +1,51 @@
+// 中文
+langZh = {
+    // 模塊
+    demoModule: {
+        layerIndex1: `加载中...`,
+        layerIndex2: `成功`,
+        layerIndex3: `网络错误`,
+        text1: `客製禮物競賽`,
+        text2: `活動介紹`,
+        text3: `<p>您是否曾想過送出一份能表達您情感的客製禮物？</p>
+<p>現在，機會來了！我們的客製禮物競賽允許您上傳自己的客製禮物，並在競賽中獲得認可。期待您的創意和熱情！</p>`,
+        text4: `上週前三名禮物`,
+        text5: `禮物名稱：`,
+        text6: `送出時間：`,
+        text7: `熱門客製禮物`,
+        text8: `客製禮物支持者`,
+        text9: `規則`,
+        text10: `獎勵`,
+        text11: `倒計時`,
+        text12: `天`,
+        text13: `小時`,
+        text14: `分鐘`,
+        text15: `秒`,
+        text16: `倒計時`,
+        text17: `<p>1. 活動時間：本月1日至第二個月月底（GMT+3）</p>
+<p>2. 計算活動期間送出的客製禮物數量。送出的禮物越多，獲得的獎勵越多。</p>
+<p>3. 此活動與 Google 和 Apple 無關</p>`,
+        text18: `<p>1. 活動開始時間：每週一 00:00 - 每週日 23:59（GMT+3）</p>
+<p>2. 最受歡迎的前三名客製禮物將獲得豐厚禮品。</p>
+<p>3. 此活動與 Google 和 Apple 無關</p>`,
+        text19: `獎勵1：當客製禮物在本週的禮物榜上排名第一時，該禮物將被客製為起始頁面和橫幅。`,
+        text20: `獎勵2：當客製禮物進入本週前三名時，將被更新到禮物面板，作為專屬的客製幸運禮物。`,
+        text21: `獎勵3：當客製禮物進入本週前三名時，活動頁面上將有專屬區域展示相應禮物。`,
+        text22: `獎勵4：當客製禮物為本週前三名時，這三份禮物將在客製禮物面板上有特別展示。`,
+        text23: `活動期間，如果客製禮物的送出次數達到7000次，您將獲得以下獎勵！`,
+        texts6: `在活動期間，如果送出的定制禮物次數達到 7000 次，您可以獲得以下獎勵！`,
+        texts5: `在活動期間，如果送出的定制禮物次數達到 5600 次，您可以獲得以下獎勵！`,
+        texts4: `在活動期間，如果送出的定制禮物次數達到 4900 次，您可以獲得以下獎勵！`,
+        texts3: `在活動期間，如果送出的定制禮物次數達到 3500 次，您可以獲得以下獎勵！`,
+        texts2: `在活動期間，如果送出的定制禮物次數達到 2100 次，您可以獲得以下獎勵！`,
+        texts1: `在活動期間，如果送出的定制禮物次數達到 700 次，您可以獲得以下獎勵！`,
+        text24: `請聯繫我們的客服，並上傳一段5秒的汽車影片，客製化您的專屬汽車。`,
+        text244: `請聯繫我們的客服，並上傳一段8秒的汽車影片，客製化您的專屬汽車。`,
+        text2444: `請聯繫我們的客服，並上傳一段10秒的汽車影片，客製化您的專屬汽車。`,
+        text25: `禮物的硬幣數：`,
+        img1: `./images/reward1.png`,
+        img2: `./images/1.png`,
+        img3: `./images/2.png`,
+        img4: `./images/3.png`,
+    }
+}

view/molistar/common/local/langHandler.js

@@ -1,7 +1,7 @@
 /**
  * 初始化当前语言 
  */
-function initLocalLang () {
+function initLocalLang() {
     const lang = localStorage.getItem('lang')
     // if (lang === 'zh' || window.location.href.match('=zh-CN')) {
     //     console.log("langHandler" + '简体')
@@ -10,7 +10,7 @@ function initLocalLang () {
     //     window.lang.code = 'zh-CN'
     //     window.lang.defaults = false
     // } else
-     if (lang === 'zh' || window.location.href.match('=zh')) {
+    if (lang === 'zh' || window.location.href.match('=zh')) {
         console.log("langHandler" + '繁体')
         window.lang = langZh
         window.lang.code = 'zh'
@@ -33,16 +33,19 @@ function initLocalLang () {
         window.lang = langId
         window.lang.code = 'id'
         window.lang.defaults = false
-    }else if (lang === 'tr' || window.location.href.match('=tr')) {
-        // 土耳其
-        // console.log("langHandler" + '土耳其')
-        // window.lang = langTr
-        // window.lang.code = 'tr'
-        // window.lang.defaults = false
-        console.log("langHandler" + '英语/土耳其')
-        window.lang = langEn
-        window.lang.code = 'en'
-        window.lang.defaults = false
+    } else if (lang === 'tr' || window.location.href.match('=tr')) {
+        if (window.location.href.match('guild-ar')) {
+            // 土耳其
+            console.log("langHandler" + '土耳其')
+            window.lang = langTr
+            window.lang.code = 'tr'
+            window.lang.defaults = false
+        } else {
+            console.log("langHandler" + '英语/土耳其')
+            window.lang = langEn
+            window.lang.code = 'en'
+            window.lang.defaults = false
+        }
     } else {
         console.log("langHandler" + '默认英语')
         window.lang = langEn

view/molistar/home/index.html

@@ -16,7 +16,7 @@
     <meta property="og:image:type" content="image/png">
     <link rel="stylesheet" href="../common/css/reset.css">
     <link rel="stylesheet" href="./css/animate.css">
-    <link rel="stylesheet" href="./css/index.css?v=1.1">
+    <link rel="stylesheet" href="./css/index.css?v=1.2">
 </head>
 
 <body>
@@ -164,10 +164,10 @@
     <script src="../common/js/common2.js"></script>
     <script src="../common/js/layer.js"></script>
     <script src="../common/js/vconsole.min.js"></script>
-    <script src="./local/ar.js"></script>
-    <script src="./local/en.js"></script>
-    <script src="./local/zh.js"></script>
-    <script src="./js/index.js?v=2.12"></script>
+    <script src="./local/ar.js?v=1.0"></script>
+    <script src="./local/en.js?v=1.0"></script>
+    <script src="./local/zh.js?v=1.0"></script>
+    <script src="./js/index.js?v=2.123"></script>
     <script src="../common/local/langHandler.js"></script>
 </body>
 

view/molistar/home/local/ar.js

@@ -45,7 +45,7 @@ langAr = {
         <img src="./images/down.png" alt="" class="down animate__animated animate__slideInDown animate__slow  ">
     `,
         img6: `
-        <img style="width: 8.61333rem;"  src="./images/pageTxte5-ar.png" alt="" class="pageTxte5 animate__animated">
+        <img style="width: 6.61333rem;"  src="./images/pageTxte5-ar.png" alt="" class="pageTxte5 animate__animated">
         <img style="width: 4.62667rem;" src="./images/contactUs-ar.png" alt="" class="contactUs animate__animated">
         <img src="./images/downioad-ar.png" alt="" class="downioad animate__animated">
         <!-- <img src="./images/down.png" alt="" class="down"> -->

view/molistar/home/local/en.js

@@ -44,7 +44,7 @@ langEn = {
         <img src="./images/down.png" alt="" class="down animate__animated animate__slideInDown animate__slow  ">
     `,
         img6: `
-        <img style="width: 8.61333rem;" src="./images/pageTxte5-en.png" alt="" class="pageTxte5 animate__animated">
+        <img style="width: 6.61333rem;" src="./images/pageTxte5-en.png" alt="" class="pageTxte5 animate__animated">
         <img style="width: 4.2rem;" src="./images/contactUs-en.png" alt="" class="contactUs animate__animated">
         <img src="./images/downioad-en.png" alt="" class="downioad animate__animated">
         <!-- <img src="./images/down.png" alt="" class="down"> -->

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

@@ -75,6 +75,7 @@
 <script src="./local/en.js"></script>
 <script src="./local/zh.js"></script>
 <script src="./local/ar.js"></script>
+<script src="./local/tr.js"></script>
 <script src="./js/BANK.js"></script>
 <script src="../../common/local/langHandler.js"></script>
 

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

@@ -59,6 +59,7 @@
 <script src="./local/en.js"></script>
 <script src="./local/zh.js"></script>
 <script src="./local/ar.js"></script>
+<script src="./local/tr.js"></script>
 <script src="./js/PAYONNER.js"></script>
 <script src="../../common/local/langHandler.js"></script>
 

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

@@ -55,6 +55,7 @@
 <script src="./local/en.js"></script>
 <script src="./local/zh.js"></script>
 <script src="./local/ar.js"></script>
+<script src="./local/tr.js"></script>
 <script src="./js/USDT.js"></script>
 <script src="../../common/local/langHandler.js"></script>
 

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

@@ -54,6 +54,7 @@
 <script src="./local/en.js"></script>
 <script src="./local/zh.js"></script>
 <script src="./local/ar.js"></script>
+<script src="./local/tr.js"></script>
 <script src="./js/VODAFONE.js"></script>
 <script src="../../common/local/langHandler.js"></script>
 

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

@@ -58,5 +58,6 @@
 <script src="./local/en.js"></script>
 <script src="./local/zh.js"></script>
 <script src="./local/ar.js"></script>
+<script src="./local/tr.js"></script>
 <script src="./js/adminSet.js"></script>
 <script src="../../common/local/langHandler.js"></script>

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

@@ -58,5 +58,6 @@
 <script src="./local/en.js"></script>
 <script src="./local/zh.js"></script>
 <script src="./local/ar.js"></script>
+<script src="./local/tr.js"></script>
 <script src="./js/adminSet2.js"></script>
 <script src="../../common/local/langHandler.js"></script>

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

@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<html lang="ar">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title class="text1"></title>
+    <!-- 公会首页 -->
+    <link rel="stylesheet" href="../../common/css/reset.css">
+    <link rel="stylesheet" href="./css/agencyDiamondIncome.css">
+</head>
+
+<body>
+    <!-- 頂部返回 -->
+    <div class="back">
+        <img src="./images/travel/back3.png" alt="">
+        <div class="text1"></div>
+    </div>
+    <!-- 小标题 -->
+    <h3>
+        <b class="text1"></b>
+        <img src="./images/agencyDiamondIncomeWhy.png" alt="">
+        <div>
+            <p class="text2"></p>
+            <p class="text3"></p>
+        </div>
+    </h3>
+    <!-- 时间 -->
+    <div class="time">
+        <div class="start">
+            <b></b>
+            <img src="./images/xia.png" alt="">
+        </div>
+        <span class="text4"></span>
+        <div class="end">
+            <b></b>
+            <img src="./images/xia.png" alt="">
+        </div>
+        <div class="search text7"></div>
+    </div>
+
+    <!-- 当前钻石 -->
+    <div class="diamonds">
+        <img src="./images/agencyDiamondIncomeDom.png" alt="">
+        <span>0</span>
+    </div>
+    <!-- 数据 -->
+    <div class="data">
+        <div class="box">
+            <img src="./images/logo.png" alt="" class="tx">
+            <div class="user">
+                <p>Teeery</p>
+                <b>ID:1234567</b>
+            </div>
+            <div class="right">
+                <p>0</p>
+                <b>Diamond income</b>
+            </div>
+        </div>
+    </div>
+
+    <!-- 时间选择器 -->
+    <div class="timeBox">
+        <div class="timeBox_in">
+            <div class="title text5"></div>
+            <h5>GMT+3</h5>
+            <div class="but text6"></div>
+            <ul></ul>
+        </div>
+    </div>
+</body>
+
+</html>
+<script src="../../common/js/flexible.js"></script>
+<script src="../../common/js/jquery-3.2.1.min.js"></script>
+<script src="../../common/js/common2.js"></script>
+<script src="../../common/js/layer.js"></script>
+<script src="../../common/js/vconsole.min.js"></script>
+<script src="../../common/js/route-constant.js"></script>
+<script src="./local/en.js"></script>
+<script src="./local/zh.js"></script>
+<script src="./local/ar.js"></script>
+<script src="./local/tr.js"></script>
+<script src="./js/agencyDiamondIncome.js"></script>
+<script src="../../common/local/langHandler.js"></script>

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

@@ -58,6 +58,7 @@
     <script src="./local/en.js"></script>
     <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="../../common/local/langHandler.js"></script>
 </body>

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

@@ -0,0 +1,355 @@
+html,
+body {
+  width: 100%;
+  height: 17.78667rem;
+  background: #fff;
+}
+
+.back {
+  width: 100%;
+  height: 2.34667rem;
+  position: fixed;
+  left: 0;
+  top: 0rem;
+  text-align: center;
+  color: #FFFFFF;
+  font-size: 0.50667rem;
+  font-weight: bold;
+  z-index: 10;
+  background: #fff;
+}
+
+.back img {
+  width: 0.58667rem;
+  height: 0.58667rem;
+  position: absolute;
+  left: 0.24rem;
+  top: 1.46667rem;
+  z-index: 2;
+}
+
+.back div {
+  width: 100%;
+  height: 0.58667rem;
+  line-height: 0.58667rem;
+  color: #313131;
+  text-align: center;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 1.46667rem;
+}
+
+h3 {
+  width: 9.14667rem;
+  height: 0.48rem;
+  line-height: 0.48rem;
+  margin: 2.6rem auto 0.37333rem;
+  color: #313131;
+  font-size: 0.42667rem;
+  font-weight: 600;
+  position: relative;
+}
+
+h3 b {
+  color: #313131;
+  font-size: 0.42667rem;
+  font-weight: 600;
+}
+
+h3 img {
+  display: inline-block;
+  width: 0.48rem;
+  height: 0.48rem;
+  margin-top: 0.02667rem;
+}
+
+h3 div {
+  width: 4.61333rem;
+  box-sizing: border-box;
+  padding: 0.21333rem;
+  position: absolute;
+  background: #F7F7F7;
+  border-radius: 0.21333rem;
+  right: -0.26667rem;
+  bottom: -2.93333rem;
+  display: none;
+}
+
+h3 div p {
+  color: #313131;
+  font-weight: 400;
+  line-height: 0.45333rem;
+  font-size: 0.32rem;
+}
+
+.time {
+  width: 9.14667rem;
+  height: 0.85333rem;
+  line-height: 0.85333rem;
+  margin: 0 auto 0.48rem;
+  display: flex;
+  justify-content: space-around;
+}
+
+.time .start {
+  width: 3.04rem;
+  height: 0.85333rem;
+  display: flex;
+  justify-content: space-between;
+  box-sizing: border-box;
+  padding: 0 0.18667rem;
+  background: #F2F3F7;
+  border-radius: 0.21333rem;
+}
+
+.time .start img {
+  width: 0.56rem;
+  height: 0.56rem;
+  display: block;
+  margin-top: 0.18667rem;
+}
+
+.time span {
+  width: 0.45333rem;
+  color: #7B7B7D;
+  font-size: 0.37333rem;
+  font-weight: 400;
+}
+
+.time .end {
+  width: 3.04rem;
+  height: 0.85333rem;
+  display: flex;
+  justify-content: space-between;
+  box-sizing: border-box;
+  padding: 0 0.18667rem;
+  background: #F2F3F7;
+  border-radius: 0.21333rem;
+}
+
+.time .end img {
+  width: 0.56rem;
+  height: 0.56rem;
+  display: block;
+  margin-top: 0.18667rem;
+}
+
+.time .search {
+  width: 1.89333rem;
+  height: 0.85333rem;
+  border-radius: 0.85333rem;
+  line-height: 0.8rem;
+  text-align: center;
+  background: #04D5C6;
+  color: #fff;
+  font-size: 0.37333rem;
+  font-weight: 400;
+}
+
+.diamonds {
+  width: 9.14667rem;
+  height: 0.74667rem;
+  line-height: 0.64rem;
+  text-align: center;
+  margin: 0 auto 0.48rem;
+}
+
+.diamonds img {
+  width: 0.74667rem;
+  height: 0.74667rem;
+  display: inline-block;
+  margin-right: 0.13333rem;
+}
+
+.diamonds span {
+  color: #313131;
+  font-size: 0.53333rem;
+  font-weight: 600;
+}
+
+.data {
+  width: 9.14667rem;
+  height: 13rem;
+  margin: 0 auto 0rem;
+  overflow-y: scroll;
+}
+
+.data::-webkit-scrollbar {
+  display: none;
+}
+
+.data .box {
+  width: 100%;
+  height: 1.94667rem;
+  border-radius: 0.21333rem;
+  background: #DBF6FF;
+  box-sizing: border-box;
+  padding: 0 0.24rem;
+  margin-bottom: 0.26667rem;
+}
+
+.data .box .tx {
+  float: left;
+  width: 1.46667rem;
+  height: 1.46667rem;
+  border-radius: 50%;
+  display: block;
+  margin-top: 0.24rem;
+  margin-right: 0.21333rem;
+}
+
+.data .box .user {
+  width: 3.33333rem;
+  float: left;
+}
+
+.data .box .user p {
+  width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  color: #333333;
+  font-size: 0.42667rem;
+  font-weight: 600;
+  margin-top: 0.53333rem;
+  margin-bottom: 0.13333rem;
+}
+
+.data .box .user b {
+  color: #7B7B7D;
+  font-size: 0.34667rem;
+  font-weight: 400;
+}
+
+.data .box .right {
+  float: right;
+  text-align: right;
+}
+
+.data .box .right p {
+  color: #313131;
+  font-size: 0.48rem;
+  font-weight: 600;
+  margin-top: 0.45333rem;
+  margin-bottom: 0.2rem;
+}
+
+.data .box .right b {
+  color: #313131;
+  font-size: 0.34667rem;
+  font-weight: 400;
+}
+
+.timeBox {
+  position: fixed;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 99;
+  display: none;
+}
+
+.timeBox .timeBox_in {
+  width: 10rem;
+  height: 8.53333rem;
+  border-radius: 0.42667rem 0.42667rem 0 0;
+  background: #fff;
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+}
+
+.timeBox .timeBox_in .title {
+  width: 100%;
+  height: 0.58667rem;
+  line-height: 0.58667rem;
+  text-align: center;
+  color: #313131;
+  font-weight: 500;
+  font-size: 0.42667rem;
+  position: absolute;
+  top: 0.32rem;
+  left: 0;
+}
+
+.timeBox .timeBox_in .but {
+  height: 0.58667rem;
+  line-height: 0.58667rem;
+  position: absolute;
+  right: 0.42667rem;
+  top: 0.32rem;
+  z-index: 2;
+  color: #24CF9E;
+  font-size: 0.42667rem;
+  font-weight: 500;
+}
+
+.timeBox .timeBox_in h5 {
+  color: #AFB1B3;
+  width: 100%;
+  height: 0.45333rem;
+  line-height: 0.45333rem;
+  font-size: 0.32rem;
+  font-weight: 400;
+  text-align: center;
+  position: absolute;
+  left: 0;
+  top: 1.01333rem;
+}
+
+.timeBox .timeBox_in ul {
+  width: 10rem;
+  height: 6rem;
+  margin-top: 1.6rem;
+  overflow-y: scroll;
+}
+
+.timeBox .timeBox_in ul::-webkit-scrollbar {
+  display: none;
+}
+
+.timeBox .timeBox_in ul li {
+  width: 100%;
+  text-align: center;
+  height: 0.85333rem;
+  line-height: 0.85333rem;
+  color: #7B7B7D;
+  font-size: 0.4rem;
+  font-weight: 400;
+}
+
+.timeBox .timeBox_in ul .act {
+  background: #F4F4F4;
+  font-weight: 500;
+  color: #313131;
+}
+
+.arabic .back img {
+  left: auto;
+  right: 0.24rem;
+  transform: rotate(180deg);
+}
+
+.arabic h3 div {
+  right: auto;
+  left: -0.26667rem;
+}
+
+.arabic .data .box .tx {
+  float: right;
+  margin-left: 0.2rem;
+  margin-right: 0;
+}
+
+.arabic .data .box .user {
+  float: right;
+}
+
+.arabic .data .box .right {
+  float: left;
+  text-align: left;
+}

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

@@ -0,0 +1,365 @@
+@function px2rem($px) {
+    @return $px / 75+rem;
+}
+
+html,
+body {
+    width: 100%;
+    height: px2rem(1334);
+    background: #fff;
+}
+
+.back {
+    width: 100%;
+    height: px2rem(176);
+    position: fixed;
+    left: 0;
+    top: px2rem(0);
+    text-align: center;
+    color: #FFFFFF;
+    font-size: px2rem(38);
+    font-weight: bold;
+    z-index: 10;
+    background: #fff;
+
+    img {
+        width: px2rem(44);
+        height: px2rem(44);
+        position: absolute;
+        left: px2rem(18);
+        top: px2rem(110);
+        z-index: 2;
+    }
+
+    div {
+        width: 100%;
+        height: px2rem(44);
+        line-height: px2rem(44);
+        color: #313131;
+        text-align: center;
+        position: absolute;
+        left: 50%;
+        transform: translateX(-50%);
+        top: px2rem(110);
+    }
+}
+
+h3 {
+    width: px2rem(686);
+    height: px2rem(36);
+    line-height: px2rem(36);
+    margin: 2.6rem auto px2rem(28);
+    color: #313131;
+    font-size: px2rem(32);
+    font-weight: 600;
+    position: relative;
+
+    b {
+        color: #313131;
+        font-size: px2rem(32);
+        font-weight: 600;
+    }
+
+    img {
+        display: inline-block;
+        width: px2rem(36);
+        height: px2rem(36);
+        margin-top: px2rem(2);
+    }
+
+    div {
+        width: px2rem(346);
+        box-sizing: border-box;
+        padding: px2rem(16);
+        position: absolute;
+        background: #F7F7F7;
+        border-radius: px2rem(16);
+        right: px2rem(-20);
+        bottom: px2rem(-220);
+        display: none;
+
+        p {
+            color: #313131;
+            font-weight: 400;
+            line-height: px2rem(34);
+            font-size: px2rem(24);
+        }
+    }
+}
+
+.time {
+    width: px2rem(686);
+    height: px2rem(64);
+    line-height: px2rem(64);
+    margin: 0 auto px2rem(36);
+    display: flex;
+    justify-content: space-around;
+
+    .start {
+        width: px2rem(228);
+        height: px2rem(64);
+        display: flex;
+        justify-content: space-between;
+        box-sizing: border-box;
+        padding: 0 px2rem(14);
+        background: #F2F3F7;
+        border-radius: px2rem(16);
+
+        img {
+            width: px2rem(42);
+            height: px2rem(42);
+            display: block;
+            margin-top: px2rem(14);
+        }
+    }
+
+    span {
+        width: px2rem(34);
+        color: #7B7B7D;
+        font-size: px2rem(28);
+        font-weight: 400;
+    }
+
+    .end {
+        width: px2rem(228);
+        height: px2rem(64);
+        display: flex;
+        justify-content: space-between;
+        box-sizing: border-box;
+        padding: 0 px2rem(14);
+        background: #F2F3F7;
+        border-radius: px2rem(16);
+
+        img {
+            width: px2rem(42);
+            height: px2rem(42);
+            display: block;
+            margin-top: px2rem(14);
+        }
+    }
+
+    .search {
+        width: px2rem(142);
+        height: px2rem(64);
+        border-radius: px2rem(64);
+        line-height: px2rem(60);
+        text-align: center;
+        background: #04D5C6;
+        color: #fff;
+        font-size: px2rem(28);
+        font-weight: 400;
+    }
+}
+
+.diamonds {
+    width: px2rem(686);
+    height: px2rem(56);
+    line-height: px2rem(48);
+    // display: flex;
+    text-align: center;
+    margin: 0 auto px2rem(36);
+
+    img {
+        width: px2rem(56);
+        height: px2rem(56);
+        display: inline-block;
+        margin-right: px2rem(10);
+    }
+
+    span {
+        color: #313131;
+        font-size: px2rem(40);
+        font-weight: 600;
+    }
+
+}
+
+.data {
+    width: px2rem(686);
+    height: 13rem;
+    margin: 0 auto px2rem(0);
+    overflow-y: scroll;
+
+    &::-webkit-scrollbar {
+        display: none;
+    }
+
+    .box {
+        width: 100%;
+        height: px2rem(146);
+        border-radius: px2rem(16);
+        background: #DBF6FF;
+        box-sizing: border-box;
+        padding: 0 px2rem(18);
+        margin-bottom: px2rem(20);
+
+        .tx {
+            float: left;
+            width: px2rem(110);
+            height: px2rem(110);
+            border-radius: 50%;
+            display: block;
+            margin-top: px2rem(18);
+            margin-right: px2rem(16);
+        }
+
+        .user {
+            width: px2rem(250);
+            float: left;
+
+            p {
+                width: 100%;
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+                color: #333333;
+                font-size: px2rem(32);
+                font-weight: 600;
+                margin-top: px2rem(40);
+                margin-bottom: px2rem(10);
+            }
+
+            b {
+                color: #7B7B7D;
+                font-size: px2rem(26);
+                font-weight: 400;
+            }
+        }
+
+        .right {
+            float: right;
+            text-align: right;
+
+            p {
+                color: #313131;
+                font-size: px2rem(36);
+                font-weight: 600;
+                margin-top: px2rem(34);
+                margin-bottom: px2rem(15);
+            }
+
+            b {
+                color: #313131;
+                font-size: px2rem(26);
+                font-weight: 400;
+            }
+        }
+    }
+}
+
+.timeBox {
+    position: fixed;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 0, 0, .5);
+    z-index: 99;
+    display: none;
+
+    .timeBox_in {
+        width: px2rem(750);
+        height: px2rem(640);
+        border-radius: px2rem(32) px2rem(32) 0 0;
+        background: #fff;
+        position: absolute;
+        bottom: 0;
+        left: 50%;
+        transform: translateX(-50%);
+
+        .title {
+            width: 100%;
+            height: px2rem(44);
+            line-height: px2rem(44);
+            text-align: center;
+            color: #313131;
+            font-weight: 500;
+            font-size: px2rem(32);
+            position: absolute;
+            top: px2rem(24);
+            left: 0;
+        }
+
+        .but {
+            height: px2rem(44);
+            line-height: px2rem(44);
+            position: absolute;
+            right: px2rem(32);
+            top: px2rem(24);
+            z-index: 2;
+            color: #24CF9E;
+            font-size: px2rem(32);
+            font-weight: 500;
+        }
+
+        h5 {
+            color: #AFB1B3;
+            width: 100%;
+            height: px2rem(34);
+            line-height: px2rem(34);
+            font-size: px2rem(24);
+            font-weight: 400;
+            text-align: center;
+            position: absolute;
+            left: 0;
+            top: px2rem(76);
+        }
+
+        ul {
+            width: px2rem(750);
+            height: 6rem;
+            margin-top: px2rem(120);
+            overflow-y: scroll;
+
+            &::-webkit-scrollbar {
+                display: none;
+            }
+
+            li {
+                width: 100%;
+                text-align: center;
+                height: px2rem(64);
+                line-height: px2rem(64);
+                color: #7B7B7D;
+                font-size: px2rem(30);
+                font-weight: 400;
+            }
+
+            .act {
+                background: #F4F4F4;
+                font-weight: 500;
+                color: #313131;
+            }
+        }
+    }
+}
+
+.arabic {
+    .back img {
+        left: auto;
+        right: 0.24rem;
+        transform: rotate(180deg);
+    }
+
+    h3 div {
+        right: auto;
+        left: -0.26667rem;
+    }
+
+    .data .box {
+        .tx {
+            float: right;
+            margin-left: 0.2rem;
+            margin-right: 0;
+        }
+
+        .user {
+            float: right;
+        }
+
+        .right {
+            float: left;
+            text-align: left;
+        }
+    }
+}

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

@@ -0,0 +1,61 @@
+html,
+body {
+  width: 100%;
+  height: 17.78667rem;
+  background: #F5F7F9;
+  box-sizing: border-box;
+  padding: 1.6rem 0.36rem 0 0.36rem;
+  box-sizing: border-box;
+}
+
+.back {
+  width: 100%;
+  height: 2.66667rem;
+  line-height: 3.46667rem;
+  position: fixed;
+  left: 0;
+  top: 0rem;
+  text-align: center;
+  color: #333333;
+  font-size: 0.50667rem;
+  font-weight: bold;
+  z-index: 10;
+  background: #fff;
+}
+
+.back img {
+  width: 0.58667rem;
+  height: 0.58667rem;
+  position: absolute;
+  left: 0.24rem;
+  top: 32%;
+}
+
+p {
+  color: #000000;
+  font-size: 0.37333rem;
+  font-weight: 400;
+  float: right;
+  width: 100%;
+  margin-bottom: 0.46667rem;
+}
+
+.title {
+  margin-bottom: 0.69333rem;
+}
+
+img {
+  display: block;
+  width: 3.77333rem;
+  margin: 0.33333rem 0;
+}
+
+.null {
+  height: 0.48rem;
+}
+
+.arabic .back img {
+  transform: rotate(180deg);
+  left: auto;
+  right: 0.24rem;
+}

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

@@ -0,0 +1,67 @@
+@function px2rem($px) {
+    @return $px / 75+rem;
+}
+
+html,
+body {
+    width: 100%;
+    height: px2rem(1334);
+    background: #F5F7F9;
+    box-sizing: border-box;
+    padding: px2rem(120) px2rem(27) 0 px2rem(27);
+    box-sizing: border-box;
+}
+
+.back {
+    width: 100%;
+    height: px2rem(200);
+    line-height: px2rem(260);
+    position: fixed;
+    left: 0;
+    top: px2rem(0);
+    text-align: center;
+    color: #333333;
+    font-size: px2rem(38);
+    font-weight: bold;
+    z-index: 10;
+    background: #fff;
+
+    img {
+        width: px2rem(44);
+        height: px2rem(44);
+        position: absolute;
+        left: px2rem(18);
+        top: 32%;
+    }
+}
+
+p {
+    color: #000000;
+    font-size: px2rem(28);
+    font-weight: 400;
+    float: right;
+    width: 100%;
+    margin-bottom: px2rem(35);
+}
+
+.title {
+    margin-bottom: px2rem(52);
+}
+
+img {
+    display: block;
+    width: px2rem(283);
+    margin: px2rem(25) 0;
+    // float: right;
+}
+.null{
+    height: px2rem(36);
+}
+
+.arabic {
+    .back img {
+        transform: rotate(180deg);
+        left: auto;
+        right: 0.24rem;
+    }
+}

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

@@ -180,3 +180,7 @@ h3 {
   left: auto;
   right: 2.5rem;
 }
+
+.arabic .background input {
+  right: 4.7rem;
+}

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

@@ -186,4 +186,7 @@ h3 {
         left: auto;
         right: 2.5rem;
     }
+    .background input{
+        right: 4.7rem;
+    }
 }

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

@@ -179,6 +179,8 @@ body {
   text-align: left;
   box-sizing: border-box;
   padding: 0 0.13333rem;
+  position: relative;
+  word-spacing: normal;
 }
 
 .headerBox .headerBox_in div img {
@@ -188,6 +190,12 @@ body {
   vertical-align: middle;
 }
 
+.headerBox .headerBox_in div .why {
+  width: 0.53333rem;
+  height: 0.53333rem;
+  margin-top: -0.06667rem;
+}
+
 .headerBox .headerBox_in div span {
   display: inline-block;
   color: #313131;
@@ -408,7 +416,8 @@ body {
   line-height: 0.45333rem;
 }
 
-.weeklyRewards .weeklyRewards_in .box .right .speedOfProgress span, .weeklyRewards .weeklyRewards_in .box .right .speedOfProgress b {
+.weeklyRewards .weeklyRewards_in .box .right .speedOfProgress span,
+.weeklyRewards .weeklyRewards_in .box .right .speedOfProgress b {
   color: #7B7B7D;
   font-size: 0.32rem;
   font-weight: 400;

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

@@ -184,6 +184,8 @@ body {
             text-align: left;
             box-sizing: border-box;
             padding: 0 px2rem(10);
+            position: relative;
+            word-spacing: normal;
 
             img {
                 display: inline;
@@ -192,6 +194,16 @@ body {
                 vertical-align: middle;
             }
 
+            .why {
+                width: px2rem(40);
+                height: px2rem(40);
+                margin-top: px2rem(-5);
+                // right: px2rem(50);
+                // top: 53%;
+                // transform: translateY(-50%);
+                // position: absolute;
+            }
+
             span {
                 display: inline-block;
                 color: #313131;
@@ -410,7 +422,8 @@ body {
                     height: px2rem(34);
                     line-height: px2rem(34);
 
-                    span,b {
+                    span,
+                    b {
                         color: #7B7B7D;
                         font-size: px2rem(24);
                         font-weight: 400;

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

@@ -441,6 +441,10 @@ body {
   font-weight: 600;
 }
 
+.page2 .agentSalaryInfo .top b img {
+  float: right;
+}
+
 .page2 .agentSalaryInfo .bottom {
   width: 100%;
   height: 1.76rem;
@@ -529,6 +533,54 @@ body {
   margin-top: 0.10667rem;
 }
 
+.page2 .agencyDiamondIncome {
+  width: 9.14667rem;
+  height: 0.66667rem;
+  line-height: 0.66667rem;
+  position: relative;
+  margin: 0 auto 0.33333rem;
+  display: none;
+}
+
+.page2 .agencyDiamondIncome span {
+  position: absolute;
+  width: 0.10667rem;
+  height: 0.45333rem;
+  top: 50%;
+  transform: translateY(-50%);
+  left: -0.26667rem;
+  background: #04D5C6;
+}
+
+.page2 .agencyDiamondIncome b {
+  display: block;
+  float: left;
+  color: #313131;
+  font-size: 0.48rem;
+  font-weight: 600;
+}
+
+.page2 .agencyDiamondIncome i {
+  font-style: normal;
+  display: block;
+  float: left;
+  height: 0.45333rem;
+  border-radius: 0.45333rem;
+  line-height: 0.45333rem;
+  padding: 0.05333rem 0.21333rem;
+  background: #313131;
+  color: #fff;
+  margin: 0.10667rem 0.26667rem 0;
+}
+
+.page2 .agencyDiamondIncome img {
+  float: right;
+  display: block;
+  width: 0.56rem;
+  height: 0.56rem;
+  margin-top: 0.10667rem;
+}
+
 .page2 .data {
   width: 9.14667rem;
   height: 13rem;
@@ -731,3 +783,17 @@ body {
   right: 0.24rem;
   transform: rotate(180deg);
 }
+
+.arabic .page2 .agencyDiamondIncome span {
+  left: auto;
+  right: -0.26667rem;
+}
+
+.arabic .page2 .agencyDiamondIncome b {
+  float: right;
+}
+
+.arabic .page2 .agencyDiamondIncome img {
+  float: left;
+  transform: rotate(180deg);
+}

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

@@ -445,6 +445,10 @@ body {
                 color: #313131;
                 font-size: px2rem(36);
                 font-weight: 600;
+
+                img {
+                    float: right;
+                }
             }
         }
 
@@ -537,6 +541,54 @@ body {
         }
     }
 
+    .agencyDiamondIncome {
+        width: px2rem(686);
+        height: px2rem(50);
+        line-height: px2rem(50);
+        position: relative;
+        margin: 0 auto px2rem(25);
+        display: none;
+
+        span {
+            position: absolute;
+            width: px2rem(8);
+            height: px2rem(34);
+            top: 50%;
+            transform: translateY(-50%);
+            left: px2rem(-20);
+            background: #04D5C6;
+        }
+
+        b {
+            display: block;
+            float: left;
+            color: #313131;
+            font-size: px2rem(36);
+            font-weight: 600;
+        }
+
+        i {
+            font-style: normal;
+            display: block;
+            float: left;
+            height: px2rem(34);
+            border-radius: px2rem(34);
+            line-height: px2rem(34);
+            padding: px2rem(4) px2rem(16);
+            background: #313131;
+            color: #fff;
+            margin: px2rem(8) px2rem(20) 0;
+        }
+
+        img {
+            float: right;
+            display: block;
+            width: px2rem(42);
+            height: px2rem(42);
+            margin-top: px2rem(8);
+        }
+    }
+
     .data {
         width: px2rem(686);
         height: 13rem;
@@ -754,4 +806,21 @@ body {
         right: 0.24rem;
         transform: rotate(180deg);
     }
+
+    .page2 .agencyDiamondIncome {
+        span {
+            left: auto;
+            right: -0.26667rem;
+        }
+
+        b {
+            float: right;
+
+        }
+
+        img {
+            float: left;
+            transform: rotate(180deg);
+        }
+    }
 }

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

@@ -18,7 +18,7 @@
     </div>
     <!-- 我的钻石 -->
     <div class="myDiamond">
-        <i>My diamond: </i>
+        <i class="text9">My diamond: </i>
         <b>0</b>
         <img src="./images/diamond.png" alt="">
     </div>
@@ -62,5 +62,6 @@
 <script src="./local/en.js"></script>
 <script src="./local/zh.js"></script>
 <script src="./local/ar.js"></script>
+<script src="./local/tr.js"></script>
 <script src="./js/diamondWithdraw.js"></script>
 <script src="../../common/local/langHandler.js"></script>

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

@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html lang="ar">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title class="text1"></title>
+    <!-- 公会首页 -->
+    <link rel="stylesheet" href="../../common/css/reset.css">
+    <link rel="stylesheet" href="./css/guide.css">
+</head>
+
+<body>
+    <!-- 頂部返回 -->
+    <div class="back">
+        <img src="./images/travel/back3.png" alt="">
+        <b class="text2"></b>
+    </div>
+    <p class="title">اهلا ايها مضيفون مولي ستار</p>
+    <p>عندنا اثنان طريقان لسحب الرواتب، طريق وكيل الشحن وطريق وكيل المضيفين، يشيركم التفاصيل فيما يلي:</p>
+    <p>طريق وكيل الشحن:</p>
+    <p>ادخل صفحة وكالتي، من ثم حسلب الرواتب، من ثم شخصي </p>
+    <p>طريق وكيل المضيفين</p>
+    <p>ادخل صفحة وكالتي، من ثم حساب الرواتب، من ثم وكيل </p>
+    <img src="./images/guide1.png" alt="">
+    <p>طريق وكيل المضيفين</p>
+    <p>ادخل صفحة وكالتي، من ثم حساب الرواتب، من ثم وكيل </p>
+    <img src="./images/guide2.png" alt="">
+    <div class="null"></div>
+</body>
+
+</html>
+<script src="../../common/js/flexible.js"></script>
+<script src="../../common/js/jquery-3.2.1.min.js"></script>
+<script src="../../common/js/common2.js"></script>
+<script src="../../common/js/layer.js"></script>
+<script src="../../common/js/vconsole.min.js"></script>
+<script src="../../common/js/route-constant.js"></script>
+<script src="./local/en.js"></script>
+<script src="./local/zh.js"></script>
+<script src="./local/ar.js"></script>
+<script src="./local/tr.js"></script>
+<!-- <script src="./js/guide.js"></script> -->
+<script src="../../common/local/langHandler.js"></script>
+<script>
+    let browser = checkVersion()
+    $(function () {
+        let env = EnvCheck();
+        if (env == 'test') {
+            new VConsole();
+        }
+        getInfoFromClient()
+        setTimeout(() => {
+            // 頁面全屏
+            if (browser.app) {
+                if (browser.android) {
+                    window.androidJsObj.initShowNav(false)
+                } else {
+                    window.webkit.messageHandlers.initShowNav.postMessage(0)
+                }
+            };
+            // 頂部返回事件
+            $('.back img').click(() => {
+                window.history.back();
+            })
+            fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言
+            translateFun();
+        }, 100);
+    })
+    function translateFun() {
+        const langReplace = window.lang.replace;
+        const localLang = window.lang;
+        $('.text3').text(langReplace(localLang.demoModule.text3));
+    }
+</script>

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

@@ -86,5 +86,6 @@
 <script src="./local/en.js"></script>
 <script src="./local/zh.js"></script>
 <script src="./local/ar.js"></script>
+<script src="./local/tr.js"></script>
 <script src="./js/guild.js?v=1.0"></script>
 <script src="../../common/local/langHandler.js"></script>

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

@@ -7,7 +7,7 @@
     <title class="text1"></title>
     <!-- 公会信息设置 -->
     <link rel="stylesheet" href="../../common/css/reset.css">
-    <link rel="stylesheet" href="./css/guildInfoSet.css?v=1.0">
+    <link rel="stylesheet" href="./css/guildInfoSet.css?v=1.1">
 </head>
 
 <body>
@@ -68,5 +68,6 @@
 <script src="./local/en.js"></script>
 <script src="./local/zh.js"></script>
 <script src="./local/ar.js"></script>
+<script src="./local/tr.js"></script>
 <script src="./js/guildInfoSet.js"></script>
 <script src="../../common/local/langHandler.js"></script>

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

@@ -75,8 +75,9 @@
                 <span class="newtext1"></span>
             </div>
             <div style="display: none;" class="memberFlow2 FFEFE5">
-                <img src="./images/icon2.png" alt="">
-                <span class="newtext2"></span>
+                <b><img src="./images/icon2.png" alt="">
+                    <span class="newtext2"></span></b>
+                <img src="./images/why.png" alt="" class="why">
             </div>
             <div style="display: none;" class="guildInfoSet">
                 <img src="./images/icon3.png" alt="">
@@ -188,5 +189,6 @@
 <script src="./local/en.js"></script>
 <script src="./local/zh.js"></script>
 <script src="./local/ar.js"></script>
+<script src="./local/tr.js"></script>
 <script src="./js/index.js?v=1.11"></script>
 <script src="../../common/local/langHandler.js"></script>

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

@@ -58,5 +58,6 @@
 <script src="./local/en.js"></script>
 <script src="./local/zh.js"></script>
 <script src="./local/ar.js"></script>
+<script src="./local/tr.js"></script>
 <script src="./js/invitation.js?v=1.0"></script>
 <script src="../../common/local/langHandler.js"></script>

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

@@ -0,0 +1,187 @@
+let urlPrefix = getUrlPrefix()
+let browser = checkVersion()
+let env = EnvCheck();
+var url = getQueryString();
+if (env == 'test') {
+    new VConsole();
+}
+// 封裝layer消息提醒框
+let layerIndex
+var langReplace;
+var localLang;
+const showLoading = (content = langReplace(localLang.demoModule.layerIndex1)) => {
+    layer.open({
+        type: 2,
+        shadeClose: false,
+        content,
+        success(e) {
+            layerIndex = $(e).attr('index')
+        }
+    })
+}
+const hideLoading = (index) => {
+    layer.close(index)
+}
+const toastMsg = (content = langReplace(localLang.demoModule.layerIndex2), time = 2) => {
+    layer.open({
+        content,
+        time,
+        skin: 'msg'
+    })
+}
+var startDate = dateFormat(Number(url.timestamp), 'yyyy-MM-dd');
+var endDate = dateFormat(Number(url.timestamp), 'yyyy-MM-dd');
+var timeType;
+// 初始化函數
+$(function () {
+    getInfoFromClient();
+    fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言
+    setTimeout(function () {
+        // 頁面全屏
+        if (browser.app) {
+            if (browser.android) {
+                window.androidJsObj.initShowNav(false)
+            } else {
+                window.webkit.messageHandlers.initShowNav.postMessage(0)
+            }
+        };
+        // 頂部返回事件
+        $('.back img').click(() => {
+            window.history.back();
+        })
+        fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言
+        langReplace = window.lang.replace;
+        localLang = window.lang;
+        translateFun();
+        getDiamondIncome();
+        $('.time .start b').text(startDate);
+        $('.time .end b').text(endDate);
+    }, 100)
+})
+function translateFun() {
+    var langReplace = window.lang.replace;
+    var localLang = window.lang;
+    $('.text1').html(langReplace(localLang.agencyDiamondIncome.text1));
+    $('.text2').html(langReplace(localLang.agencyDiamondIncome.text2));
+    $('.text3').html(langReplace(localLang.agencyDiamondIncome.text3));
+    $('.text4').html(langReplace(localLang.agencyDiamondIncome.text4));
+    $('.text5').html(langReplace(localLang.agencyDiamondIncome.text5));
+    $('.text6').html(langReplace(localLang.agencyDiamondIncome.text6));
+    $('.text7').html(langReplace(localLang.agencyDiamondIncome.text7));
+}
+// 查询按钮
+$('.time .search').click(function(){
+    getDiamondIncome();
+})
+// 配置接口
+function getDiamondIncome() {
+    $('.data .box').remove();
+    showLoading()
+    networkRequest({
+        type: 'get',
+        url: urlPrefix + '/guild/income/getDiamondIncome',
+        data: {
+            startDate,
+            endDate,
+        },
+        success(res) {
+            if (res.code === 200) {
+                $('.diamonds span').text(res.data.totalDiamondNum);
+                var str = '';
+                res.data.memberIncomeList.forEach((res, i) => {
+                    str += `
+                    <div class="box">
+                        <img src="${res.avatar}" alt="" class="tx">
+                        <div class="user">
+                            <p>${res.nick}</p>
+                            <b>ID:${res.erbanNo}</b>
+                        </div>
+                        <div class="right">
+                            <p>${res.diamondNum}</p>
+                            <b>${langReplace(localLang.personal.text20)}</b>
+                        </div>
+                    </div>
+                `
+                });
+                $('.data').append(str);
+            } else {
+                toastMsg(res.message)
+            }
+            hideLoading(layerIndex)
+        },
+        error(err) {
+            hideLoading(layerIndex)
+            toastMsg(langReplace(localLang.demoModule.layerIndex3))
+        }
+    })
+}
+
+// 获取前8周时间
+function timestampToDate(timestamp) {
+    var date = new Date(timestamp);
+    return date.toString(); // 转换为字符串
+}
+function getLastEightWeeksTimestamps(newTime) {
+    console.log(timestampToDate(newTime));
+    const timestamps = [];
+    const now = newTime;
+
+    // 计算从今天往前 8 周的起点（56 天）
+    const startDate = new Date(now.getTime() - 56 * 24 * 60 * 60 * 1000);
+
+    // 从起点开始，每天增加到当前日期
+    for (let i = 0; i <= 56; i++) {
+        const currentDay = new Date(startDate.getTime() + i * 24 * 60 * 60 * 1000);
+        timestamps.push(dateFormat(currentDay.getTime(), "yyyy-MM-dd"));
+    }
+
+    return timestamps.reverse();
+}
+var str = '';
+getLastEightWeeksTimestamps(new Date()).forEach(res => {
+    str += `
+    <li>${res}</li>
+    `
+})
+$('.timeBox .timeBox_in ul').append(str);
+// 选择时间
+$('.timeBox .timeBox_in ul').on('click', 'li', function () {
+    var time = $(this).text();
+    $(this).addClass('act').siblings().removeClass('act');
+    if (timeType == 1) {
+        startDate = time;
+    } else {
+        endDate = time;
+    }
+})
+var whyStatus = true;
+$('h3 img').click(function () {
+    if (whyStatus) {
+        $('h3 div').show();
+    } else {
+        $('h3 div').hide();
+    }
+    whyStatus = !whyStatus;
+})
+// 选择开始时间
+$('.time .start').click(function () {
+    timeType = 1;
+    bodyScroolFun(true);
+    $('.timeBox').show();
+})
+// 选择结束时间
+$('.time .end').click(function () {
+    timeType = 2;
+    bodyScroolFun(true);
+    $('.timeBox').show();
+})
+// 确认时间按钮
+$('.timeBox .timeBox_in .but').click(function () {
+    if (timeType == 1) {
+        $('.time .start b').text(startDate);
+    } else {
+        $('.time .end b').text(endDate);
+    }
+    bodyScroolFun(false);
+    $('.timeBox').hide();
+})

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

@@ -61,7 +61,7 @@ $(function () {
     }, 100)
 })
 function translateFun() {
-    var langReplace = window.lang.replace;
+    var langReplace = window.lang.replace; 
     var localLang = window.lang;
     $('.text1').text(langReplace(localLang.diamondWithdraw.text1));
     $('.text2').text(langReplace(localLang.diamondWithdraw.text2));
@@ -69,6 +69,7 @@ function translateFun() {
     $('.text4').text(langReplace(localLang.diamondWithdraw.text4));
     $('.text5').text(langReplace(localLang.diamondWithdraw.text5));
     $('.text7').html(langReplace(localLang.diamondWithdraw.text7));
+    $('.text9').html(langReplace(localLang.diamondWithdraw.text9));
 }
 
 // 进入薪资页面弹窗按钮

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

@@ -65,6 +65,9 @@ $(function () {
     }, 100)
 })
 function translateFun() {
+    if (getQueryString().lang == "tr") {
+        $('.headerBox .headerBox_in div .why').hide();
+    }
     var langReplace = window.lang.replace;
     var localLang = window.lang;
     $('.text1').text(langReplace(localLang.demoModule.text1));
@@ -385,11 +388,16 @@ $('.guildInfoSet').click(function () {
 })
 // 我的收入
 $('.memberFlow').click(function (params) {
-    window.location.href = `./personal.html`
+    window.location.href = `./personal.html?roleTypes=${roleTypes}`
 })
 // 薪资账户
-$('.memberFlow2').click(function (params) {
+$('.memberFlow2 b').click(function (params) {
     window.location.href = `./salary_account.html`
+    return
+})
+$('.memberFlow2 .why').click(function () {
+    window.location.href = `./guide.html`
+    return
 })
 // 邀请成员
 $('.inveMember').click(function (params) {
@@ -407,4 +415,4 @@ $(`.myWages`).click(function (params) {
 // $('.guildList .top').on('blur', 'input', () => {
 //     console.log("失焦");
 //     $('.headerBox').css('margin','-0.4rem auto 0rem')
-// });
+// });

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

@@ -28,6 +28,7 @@ const toastMsg = (content = langReplace(localLang.demoModule.layerIndex2), time
         skin: 'msg'
     })
 }
+var timestamp;
 var roleTypes;
 var searTime;
 var guildNick;
@@ -56,6 +57,9 @@ $(function () {
         fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言
         langReplace = window.lang.replace;
         localLang = window.lang;
+        if(getQueryString().roleTypes == 1){
+            $('.page2 .agencyDiamondIncome').show();
+        }
         translateFun();
         getAccount();
     }, 100)
@@ -82,6 +86,7 @@ function translateFun() {
     $('.text17').text(langReplace(localLang.personal.text17));
     $('.text18').text(langReplace(localLang.personal.text18));
     $('.text19').text(langReplace(localLang.personal.text19));
+    $('.agencyDiamondIncometext1').text(langReplace(localLang.agencyDiamondIncome.text1));
 }
 // 配置接口
 function getAccount() {
@@ -91,6 +96,7 @@ function getAccount() {
         url: urlPrefix + '/guild/income/getIncome',
         success(res) {
             if (res.code === 200) {
+                timestamp = res.timestamp;
                 // 判断是否展示agency
                 // person
                 // 处理自己
@@ -98,7 +104,7 @@ function getAccount() {
                 var me = res.data.person.me;
                 $('.page1 .my .tx').attr('src', me.avatar);
                 $('.page1 .my .user p').text(me.nick);
-                $('.page1 .my .user b').text('ID:'+me.erbanNo);
+                $('.page1 .my .user b').text('ID:' + me.erbanNo);
                 // 处理当前
                 var curCycle = res.data.person.curCycle;
                 $('.page1 .incomeTitle i').text(curCycle.cycleDate);
@@ -116,7 +122,7 @@ function getAccount() {
                     var agency = res.data.agency
                     $('.page2 .agentSalary i').text(agency.curCycleInterval);
                     $('.page2 .agentSalary2 i').text(agency.curCycleInterval);
-                    $('.page2 .agentSalaryInfo .top b').text(`${agency.usdWage} ÜS`);
+                    $('.page2 .agentSalaryInfo .top b').html(`${agency.usdWage} <img src="./images/diamondss.png"/>`);
                     $('.page2 .agentSalaryInfo .bottom div .p1').text(agency.diamondNum);
                     $('.page2 .agentSalaryInfo .bottom div .p2').text(agency.diamondRatio * 100 + '%');
                     // 渲染列表
@@ -167,4 +173,8 @@ $('.page1 .diamond .withdraw').click(function () {
 // 跳转薪资账户页面
 $('.page1 .account').click(function () {
     window.location.href = `./salary_account.html`
+})
+// 跳转钻石中心
+$('.agencyDiamondIncome').click(function () {
+    window.location.href = `./agencyDiamondIncome.html?timestamp=${timestamp}`;
 })

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

@@ -211,7 +211,8 @@ langAr = {
         text4: `انتقل إلى حساب الراتب`,
         text5: `إلغاء`,
         text6: `الماس`,
-        text7: `تم سحب <b>0</b>ÜS بنجاح إلى حساب الراتب`
+        text7: `تم سحب <b>0</b>ÜS بنجاح إلى حساب الراتب`,
+        text9: ':بلدي الماس',
     },
     salary: {
         text1: `حساب الراتب`,
@@ -336,4 +337,13 @@ langAr = {
         <p>3 تدرج مكافآت العملات</p>`,
         text3: `./images/weeklyRewardsRule2-ar.png`,
     },
+    agencyDiamondIncome: {
+        text1: `إيرادات الألماس للوكالة`, // 阿拉伯文
+        text2: `بناءً على الوكالة، يمكنك البحث عن إيرادات الألماس في أي وقت.`, // 阿拉伯文
+        text3: `قد يؤدي خروج المستخدم من الوكالة إلى تغييرات في البيانات.`, // 阿拉伯文
+        text4: `إلى`, // 阿拉伯文
+        text5: `اختيار التاريخ`, // 阿拉伯文
+        text6: `تأكيد`, // 阿拉伯文
+        text7: `يبحث`,
+    }
 }