调整样式

view/molistar/home/css/index.css

@@ -62,6 +62,16 @@
     font-size: 0.25333rem;
     font-weight: bold;
   }
+  body .homePc .privacy,
+  html .homePc .privacy {
+    color: #fff;
+    position: absolute;
+    height: 0.5rem;
+    line-height: 0.5rem;
+    left: 6.4rem;
+    top: .3rem;
+    width: 3rem;
+  }
   body .homePc .pcIos,
   html .homePc .pcIos {
     width: 2.9rem;
@@ -94,7 +104,11 @@
   html .bootom p {
     margin-top: 0.1rem;
     font-size: 0.15rem;
-    color: #B8B7BF;
+    color: #fff;
+  }
+  body .bootom p a,
+  html .bootom p a {
+    color: #fff;
   }
 }
 

view/molistar/home/css/index.scss

@@ -224,7 +224,8 @@
                     margin-top: -0.01rem;
                 }
             }
-            .language{
+
+            .language {
                 color: #fff;
                 position: absolute;
                 height: 0.5rem;
@@ -235,6 +236,16 @@
                 font-weight: bold;
             }
 
+            .privacy {
+                color: #fff;
+                position: absolute;
+                height: 0.5rem;
+                line-height: 0.5rem;
+                left: 6.4rem;
+                top: .3rem;
+                width: 3rem;
+            }
+
             .pcIos {
                 width: 2.9rem;
                 height: 0.64rem;
@@ -271,7 +282,11 @@
                 margin-top: 0.1rem;
                 // margin-bottom: 0.1rem;
                 font-size: 0.15rem;
-                color: #B8B7BF;
+                color: #fff;
+
+                a {
+                    color: #fff;
+                }
             }
         }
     }
@@ -979,4 +994,5 @@
             }
         }
     }
-}
+}
+

view/molistar/home/index.html

@@ -28,13 +28,15 @@
                 <div class="diamound">
                     <img src="./images/diamond.png" alt=""> <b class="text3"></b>
                 </div>
+                <!-- 隐私政策 -->
+                <a class="privacy" href="../modules/rule/privacy-wap.html"></a>
                 <!-- 语言 -->
                 <div class="language"><b></b> ▼</div>
                 <div class="pcIos"></div>
                 <div class="pcAnd"></div>
             </div>
             <div class="bootom">
-                <p>Vele Network Technology Limited</p>
+                <p>Molistar Team</p>
             </div>
         </div>
     </div>
@@ -113,6 +115,10 @@
                     <span class="text6"></span>
                     <img src="./images/rightIcon.png" alt="">
                 </li>
+                <li>
+                    <a href=""><span class="text7"></span></a>
+                    <img src="./images/rightIcon.png" alt="">
+                </li>
             </ul>
         </div>
 

view/molistar/home/js/index.js

@@ -62,7 +62,7 @@ $(function () {
     ];
     setTimeout(function () {
         function getUserLanguage() {
-            console.log('ssss',navigator,navigator.language, navigator.userLanguage);
+            console.log('ssss', navigator, navigator.language, navigator.userLanguage);
             return navigator.language || navigator.userLanguage; // 兼容不同浏览器的方式
         }
         // var langCode = getLanguageCode(getUserLanguage());
@@ -91,8 +91,10 @@ $(function () {
         if (langCode == 'zh') {
             $('.language').html('<b>中文</b> ▼')
         } else if (langCode == 'ar') {
+            $('.privacy').css('left', '7.4rem')
             $('.language').html('<b>العربية</b> ▼')
         } else {
+            $('.privacy').css('left', '7.4rem')
             $('.language').html('<b>English</b> ▼')
         }
         history.replaceState(null, null, updateQueryStringParameter(window.location.href, 'lang', langCode));
@@ -114,6 +116,7 @@ function translateFun() {
     $('.text4').text(langReplace(localLang.demoModule.text4))
     $('.text5').text(langReplace(localLang.demoModule.text5))
     $('.text6').text(langReplace(localLang.demoModule.text6))
+    $('.text7').text(langReplace(localLang.demoModule.text7))
     $('.textss').text(langReplace(localLang.demoModule.textss))
     $('.homePc').attr('style', langReplace(localLang.demoModule.homePc))
     $('#img2').html(langReplace(localLang.demoModule.img2))
@@ -168,9 +171,11 @@ function translateFun() {
             index = 0;
         } else if (i == 2) {
             window.location = `${urlPrefix}/molistar/modules/h5Income/login.html`
-        } else {
+        } else if (i == 3) {
             $('.menu').css("height", "0%");
             $('.contactUs_pub').show();
+        } else {
+            location.href = `../modules/rule/privacy-wap.html`
         }
     })
     // 關閉聯繫我們彈窗
@@ -364,6 +369,6 @@ function handleResize() {
     location.reload()
     // 这里可以添加更多的逻辑，比如检查窗口的新尺寸
 }
- 
+
 // 监听窗口大小变化事件
 window.addEventListener('resize', handleResize);

view/molistar/home/local/ar.js

@@ -8,6 +8,7 @@ langAr = {
         text4: `الصفحة الرئيسية`,
         text5: `المحفظة`,
         text6: `اتصل بنا`,
+        text7: `سياسة الخصوصية `,
         textss: `الرجاء تحديد لغة.`,
         homePc: `background:url(./images/pcBgBig-ar.png) no-repeat;background-size:100% 100%;`,
         img2: `
@@ -49,7 +50,7 @@ langAr = {
         <img src="./images/downioad-ar.png" alt="" class="downioad animate__animated">
         <!-- <img src="./images/down.png" alt="" class="down"> -->
         <div class="bootom">
-            <p>Vele Network Technology Limited</p>
+            <p>Molistar Team</p>
         </div>`,
     }
 }

view/molistar/home/local/en.js

@@ -7,6 +7,7 @@ langEn = {
         text4: `Home`,
         text5: `Wallet`,
         text6: `Contact Us`,
+        text7: `Privacy Policy  `,
         textss: `Please select a language.`,
         homePc: `background:url(./images/pcBgBig-en.png) no-repeat;background-size:100% 100%;`,
         img2: `
@@ -48,7 +49,7 @@ langEn = {
         <img src="./images/downioad-en.png" alt="" class="downioad animate__animated">
         <!-- <img src="./images/down.png" alt="" class="down"> -->
         <div class="bootom">
-            <p>Vele Network Technology Limited</p>
+            <p>Molistar Team</p>
         </div>`,
     }
 }

view/molistar/home/local/zh.js

@@ -8,6 +8,7 @@ langZh = {
         text4: `首頁`,
         text5: `錢包`,
         text6: `聯繫我們`,
+        text7: `隱私政策 `,
         textss: `请选择语言`,
         homePc: `background:url(./images/pcBgBig.png) no-repeat;background-size:100% 100%;`,
         img2: `
@@ -46,7 +47,7 @@ langZh = {
             <img src="./images/downioad.png" alt="" class="downioad animate__animated">
             <!-- <img src="./images/down.png" alt="" class="down"> -->
             <div class="bootom">
-                <p>Vele Network Technology Limited</p>
+                <p>Molistar Team</p>
             </div>`,
     }
 }

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

@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Bank</title>
+    <link rel="stylesheet" href="../../common/css/reset.css">
+    <link rel="stylesheet" href="./css/BANK.css">
+</head>
+
+<body>
+    <!-- 頂部返回 -->
+    <div class="back">
+        <img src="./images/travel/back3.png" alt="">
+        <b class="">Bank</b>
+    </div>
+    <!-- 账户信息 -->
+    <div class="box currencyType">
+        <span></span>
+        <input type="text" disabled placeholder="Currency Type:USD">
+        <!-- <img src="./images/right.png" alt="" class="right"> -->
+    </div>
+    <p class="p "><span>*</span> <b class="p1"></b></p>
+    <div class="box country">
+        <input type="text" readonly placeholder="Country" class="text5">
+        <img src="./images/right.png" alt="" class="right">
+    </div>
+    <p class="p "><span>*</span> <b class="p2"></b></p>
+    <div class="box payeeAccountNo">
+        <input type="text" placeholder="payeeAccountNo" class="text6">
+    </div>
+    <p class="p "><span>*</span> <b class="p3"></b></p>
+    <div class="box bankName">
+        <input type="text" placeholder="Bank Name" class="text7"
+            onkeyup="this.value=this.value.replace(/[^a-zA-Z]/g,'')">
+    </div>
+    <p class="p "><span>*</span> <b class="p4"></b></p>
+    <div class="box sWIFTCode">
+        <input type="text" placeholder="SWIFT Code" class="text8"
+            onkeyup="this.value=this.value.replace(/[^a-zA-Z]/g,'')">
+    </div>
+    <p class="p 5"><span>*</span> <b class="p5"></b></p>
+    <div class="box payeeName">
+        <input type="text" placeholder="payeeName" class="text9"
+            onkeyup="this.value=this.value.replace(/[^a-zA-Z]/g,'')">
+    </div>
+    <p class="p "><span>*</span> <b class="p6"></b></p>
+    <div class="box Address">
+        <input type="text" placeholder="Address" class="text10"
+            onkeyup="this.value=this.value.replace(/[^a-zA-Z]/g,'')">
+    </div>
+    <!-- 按钮 -->
+    <div class="but">
+        <!-- 确认按钮 -->
+        <div class="ok text1"></div>
+        <!-- 解绑按钮 -->
+        <div class="determine text2"></div>
+    </div>
+    <!-- 选择弹窗 -->
+    <div class="pub">
+        <div class="pub_in">
+            <div class="title text3"></div>
+            <div class="soure text4"></div>
+            <div class="countryPub"></div>
+        </div>
+    </div>
+    <div class="null"></div>
+</body>
+<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/BANK.js"></script>
+<script src="../../common/local/langHandler.js"></script>
+
+</html>

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

@@ -0,0 +1,66 @@
+<!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/BANK.css">
+</head>
+
+<body>
+    <!-- 頂部返回 -->
+    <div class="back">
+        <img src="./images/travel/back3.png" alt="">
+        <b class="text1"></b>
+    </div>
+    <!-- 账户信息 -->
+    <div class="box currencyType">
+        <span></span>
+        <input type="text" disabled placeholder="Currency Type:USD" class="text6">
+        <!-- <img src="./images/right.png" alt="" class="right"> -->
+    </div>
+    <p class="p "><span>*</span> <b class="p1"></b></p>
+    <div class="box country">
+        <input type="text" readonly placeholder="Country" class="text7">
+        <img src="./images/right.png" alt="" class="right">
+    </div>
+    <p class="p "><span>*</span> <b class="p7"></b></p>
+    <div class="box payeeAccountNo">
+        <input type="text" placeholder="payeeAccountNo" class="text8">
+    </div>
+    <p class="p 5"><span>*</span> <b class="p5"></b></p>
+    <div class="box payeeName">
+        <input type="text" placeholder="payeeName" class="text9"
+            onkeyup="this.value=this.value.replace(/[^a-zA-Z]/g,'')">
+    </div>
+    <!-- 按钮 -->
+    <div class="but">
+        <!-- 确认按钮 -->
+        <div class="ok text2"></div>
+        <!-- 解绑按钮 -->
+        <div class="determine text3"></div>
+    </div>
+    <!-- 选择弹窗 -->
+    <div class="pub">
+        <div class="pub_in">
+            <div class="title text4"></div>
+            <div class="soure text5"></div>
+            <div class="countryPub"></div>
+        </div>
+    </div>
+</body>
+<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/PAYONNER.js"></script>
+<script src="../../common/local/langHandler.js"></script>
+
+</html>

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

@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>USDT</title>
+    <link rel="stylesheet" href="../../common/css/reset.css">
+    <link rel="stylesheet" href="./css/BANK.css">
+</head>
+
+<body>
+    <!-- 頂部返回 -->
+    <div class="back">
+        <img src="./images/travel/back3.png" alt="">
+        <b class="text2">USDT</b>
+    </div>
+    <!-- 账户信息 -->
+    <div class="box currencyType">
+        <span></span>
+        <input type="text" disabled placeholder="Currency Type:USD">
+        <!-- <img src="./images/right.png" alt="" class="right"> -->
+    </div>
+    <div class="box country">
+        <span>*</span>
+        <input type="text" readonly placeholder="Country">
+        <img src="./images/right.png" alt="" class="right">
+    </div>
+    <div class="box payeeAccountNo">
+        <span>*</span>
+        <input type="text" placeholder="payeeAccountNo">
+    </div>
+    <!-- 按钮 -->
+    <div class="but">
+        <!-- 确认按钮 -->
+        <div class="ok">Confirm</div>
+        <!-- 解绑按钮 -->
+        <div class="determine">Determine</div>
+    </div>
+    <!-- 选择弹窗 -->
+    <div class="pub">
+        <div class="pub_in">
+            <div class="title">Country</div>
+            <div class="soure">OK</div>
+            <div class="countryPub">asdasdasd</div>
+        </div>
+    </div>
+</body>
+<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/USDT.js"></script>
+<script src="../../common/local/langHandler.js"></script>
+
+</html>

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

@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title class="">Vodafone</title>
+    <link rel="stylesheet" href="../../common/css/reset.css">
+    <link rel="stylesheet" href="./css/BANK.css">
+</head>
+
+<body>
+    <!-- 頂部返回 -->
+    <div class="back">
+        <img src="./images/travel/back3.png" alt="">
+        <b class="">Vodafone</b>
+    </div>
+    <!-- 账户信息 -->
+    <div class="box currencyType">
+        <span></span>
+        <input type="text" disabled placeholder="Currency Type:USD">
+        <!-- <img src="./images/right.png" alt="" class="right"> -->
+    </div>
+    <p class="p "><span>*</span> <b class="p1"></b></p>
+    <div class="box country">
+        <input type="text" readonly placeholder="Country" class="text7">
+        <img src="./images/right.png" alt="" class="right" >
+    </div>
+    <p class="p "><span>*</span> <b class="p2"></b></p>
+    <div class="box payeeAccountNo">
+        <input type="text" placeholder="payeeAccountNo" class="text8">
+    </div>
+    <!-- 按钮 -->
+    <div class="but">
+        <!-- 确认按钮 -->
+        <div class="ok text2">Confirm</div>
+        <!-- 解绑按钮 -->
+        <div class="determine text3">Determine</div>
+    </div>
+    <!-- 选择弹窗 -->
+    <div class="pub">
+        <div class="pub_in">
+            <div class="title text4">Country</div>
+            <div class="soure text5">OK</div>
+            <div class="countryPub"></div>
+        </div>
+    </div>
+</body>
+<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/VODAFONE.js"></script>
+<script src="../../common/local/langHandler.js"></script>
+
+</html>

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

@@ -0,0 +1,232 @@
+html,
+body {
+  width: 100%;
+  height: 100%;
+  background: #fff;
+  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: 54%;
+}
+
+.box {
+  width: 9.2rem;
+  height: 1.49333rem;
+  border-radius: 0.21333rem;
+  background: #F2F3F7;
+  margin: 0 auto 0.32rem;
+  position: relative;
+  box-sizing: border-box;
+  padding: 0 0.26667rem;
+}
+
+.box span {
+  color: #ED4343;
+  font-size: 0.37333rem;
+  font-weight: 600;
+  height: 100%;
+  line-height: 1.49333rem;
+  display: block;
+  float: left;
+  margin: 0 0.26667rem;
+}
+
+.box input {
+  display: block;
+  float: left;
+  width: 7rem;
+  height: 100%;
+  font-size: 0.37333rem;
+  font-weight: 400;
+  outline: none;
+  border: 0;
+  background: none;
+  font-weight: bold;
+}
+
+.box input::placeholder {
+  color: #7B7B7D;
+  font-weight: 400;
+}
+
+.box .right {
+  display: block;
+  width: 0.56rem;
+  height: 0.56rem;
+  float: right;
+  margin: 0.48rem 0.26667rem 0;
+}
+
+.p {
+  width: 9.2rem;
+  height: 0.53333rem;
+  line-height: 0.53333rem;
+  margin: 0 auto 0.21333rem;
+}
+
+.p span {
+  color: #ED4343;
+  font-size: 0.37333rem;
+  font-weight: 600;
+  height: 100%;
+  display: block;
+  float: left;
+  margin: 0 0.10667rem;
+}
+
+.p b {
+  font-size: 0.37333rem;
+  color: #313131;
+  font-weight: 500;
+}
+
+.currencyType {
+  margin-top: 3.1rem;
+}
+
+.but {
+  width: 9.2rem;
+  display: flex;
+  justify-content: center;
+  margin: 0 auto 0.45333rem;
+}
+
+.but .ok {
+  width: 4.45333rem;
+  height: 1.22667rem;
+  border-radius: 1.22667rem;
+  line-height: 1.22667rem;
+  color: #FFFFFF;
+  font-size: 0.42667rem;
+  font-weight: 500;
+  text-align: center;
+  background: #04D5C6;
+  margin: 0 0.14667rem;
+}
+
+.but .determine {
+  width: 4.45333rem;
+  height: 1.22667rem;
+  border-radius: 1.22667rem;
+  line-height: 1.22667rem;
+  color: #FFFFFF;
+  font-size: 0.42667rem;
+  font-weight: 500;
+  text-align: center;
+  background: #FF6A6A;
+  margin: 0 0.14667rem;
+}
+
+.pub {
+  position: fixed;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 999;
+  display: none;
+}
+
+.pub .pub_in {
+  width: 10rem;
+  height: auto;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: 0;
+  background: #fff;
+  border-radius: 0.42667rem 0.42667rem 0 0;
+  box-sizing: border-box;
+  padding-top: 1.49333rem;
+  padding-bottom: 0.26667rem;
+}
+
+.pub .pub_in .title {
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  color: #313131;
+  font-size: 0.42667rem;
+  font-weight: 500;
+  top: 0.32rem;
+  height: 0.58667rem;
+  line-height: 0.58667rem;
+}
+
+.pub .pub_in .soure {
+  z-index: 2;
+  color: #04D5C6;
+  font-size: 0.42667rem;
+  font-weight: 500;
+  position: absolute;
+  right: 0.42667rem;
+  top: 0.37333rem;
+}
+
+.pub .pub_in .countryPub {
+  width: 100%;
+  height: 0.85333rem;
+  line-height: 0.85333rem;
+  text-align: center;
+  color: #7B7B7D;
+  font-size: 0.4rem;
+  font-weight: 400;
+}
+
+.pub .pub_in .act {
+  background: #F4F4F4;
+  color: #313131;
+}
+
+.arabic .back img {
+  right: 0.2rem;
+  left: unset;
+  transform: rotate(180deg);
+}
+
+.arabic .box span {
+  float: right;
+}
+
+.arabic .box input {
+  float: right;
+}
+
+.arabic .box .right {
+  float: left;
+  transform: rotate(180deg);
+}
+
+.arabic .pub .pub_in .soure {
+  right: auto;
+  left: 0.42667rem;
+}
+
+.arabic .p span {
+  float: right;
+}
+
+.null {
+  height: 6rem;
+}

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

@@ -0,0 +1,244 @@
+@function px2rem($px) {
+    @return $px / 75+rem;
+}
+
+html,
+body {
+    width: 100%;
+    height: 100%;
+    background: #fff;
+    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: 54%;
+    }
+}
+
+.box {
+    width: px2rem(690);
+    height: px2rem(112);
+    border-radius: px2rem(16);
+    background: #F2F3F7;
+    margin: 0 auto px2rem(24);
+    position: relative;
+    box-sizing: border-box;
+    padding: 0 px2rem(20);
+
+    span {
+        color: #ED4343;
+        font-size: px2rem(28);
+        font-weight: 600;
+        height: 100%;
+        line-height: px2rem(112);
+        display: block;
+        float: left;
+        margin: 0 px2rem(20);
+    }
+
+    input {
+        display: block;
+        float: left;
+        width: 7rem;
+        height: 100%;
+        font-size: px2rem(28);
+        font-weight: 400;
+        outline: none;
+        border: 0;
+        background: none;
+        font-weight: bold;
+
+        &::placeholder {
+            color: #7B7B7D;
+            font-weight: 400;
+        }
+    }
+
+    .right {
+        display: block;
+        width: px2rem(42);
+        height: px2rem(42);
+        float: right;
+        margin: px2rem(36) px2rem(20) 0;
+    }
+}
+
+.p {
+    width: px2rem(690);
+    height: px2rem(40);
+    line-height: px2rem(40);
+    margin: 0 auto px2rem(16);
+
+    span {
+        color: #ED4343;
+        font-size: px2rem(28);
+        font-weight: 600;
+        height: 100%;
+        display: block;
+        float: left;
+        margin: 0 px2rem(8);
+    }
+
+    b {
+        font-size: px2rem(28);
+        color: #313131;
+        font-weight: 500;
+
+    }
+}
+
+.currencyType {
+    margin-top: 3.1rem;
+}
+
+.but {
+    width: px2rem(690);
+    display: flex;
+    justify-content: center;
+    margin: 0 auto px2rem(34);
+
+    .ok {
+        width: px2rem(334);
+        height: px2rem(92);
+        border-radius: px2rem(92);
+        line-height: px2rem(92);
+        color: #FFFFFF;
+        font-size: px2rem(32);
+        font-weight: 500;
+        text-align: center;
+        background: #04D5C6;
+        margin: 0 px2rem(11);
+    }
+
+    .determine {
+        width: px2rem(334);
+        height: px2rem(92);
+        border-radius: px2rem(92);
+        line-height: px2rem(92);
+        color: #FFFFFF;
+        font-size: px2rem(32);
+        font-weight: 500;
+        text-align: center;
+        background: #FF6A6A;
+        margin: 0 px2rem(11);
+    }
+}
+
+.pub {
+    position: fixed;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    background: rgba(0, 0, 0, .5);
+    z-index: 999;
+    display: none;
+
+    .pub_in {
+        width: px2rem(750);
+        height: auto;
+        position: absolute;
+        left: 50%;
+        transform: translateX(-50%);
+        bottom: 0;
+        background: #fff;
+        border-radius: px2rem(32) px2rem(32) 0 0;
+        box-sizing: border-box;
+        padding-top: px2rem(112);
+        padding-bottom: px2rem(20);
+
+        .title {
+            position: absolute;
+            left: 50%;
+            transform: translateX(-50%);
+            color: #313131;
+            font-size: px2rem(32);
+            font-weight: 500;
+            top: px2rem(24);
+            height: px2rem(44);
+            line-height: px2rem(44);
+        }
+
+        .soure {
+            z-index: 2;
+            color: #04D5C6;
+            font-size: px2rem(32);
+            font-weight: 500;
+            position: absolute;
+            right: px2rem(32);
+            top: px2rem(28);
+        }
+
+        .countryPub {
+            width: 100%;
+            height: px2rem(64);
+            line-height: px2rem(64);
+            text-align: center;
+            color: #7B7B7D;
+            font-size: px2rem(30);
+            font-weight: 400;
+        }
+
+        .act {
+            background: #F4F4F4;
+            color: #313131;
+        }
+    }
+}
+
+
+.arabic {
+    .back img {
+        right: px2rem(15);
+        left: unset;
+        transform: rotate(180deg);
+    }
+
+    .box {
+        span {
+            float: right;
+        }
+
+        input {
+            float: right;
+        }
+
+        .right {
+            float: left;
+            transform: rotate(180deg);
+        }
+    }
+
+    .pub .pub_in .soure {
+        right: auto;
+        left: px2rem(32);
+    }
+
+    .p {
+        span {
+            float: right;
+        }
+    }
+}
+
+.null {
+    height: 6rem;
+}

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

@@ -118,6 +118,43 @@ ul li div span {
   margin-top: 0.26667rem;
 }
 
+ul .actLi {
+  height: 2.45333rem;
+  position: relative;
+  overflow: hidden;
+}
+
+ul .actLi p,
+ul .actLi b {
+  margin-top: 0.66667rem;
+}
+
+ul .actLi i {
+  font-style: normal;
+  position: absolute;
+  top: 0;
+  right: 0;
+  height: 0.50667rem;
+  line-height: 0.50667rem;
+  padding: 0 0.21333rem;
+  border-radius: 0px 0.26667rem 0px 0.26667rem;
+  text-align: center;
+  color: #FFFFFF;
+  font-size: 0.32rem;
+}
+
+ul .actLi .sp0 {
+  background: #FCAC3A;
+}
+
+ul .actLi .sp1 {
+  background: #04D5C6;
+}
+
+ul .actLi .sp2 {
+  background: #FF605A;
+}
+
 .arLang .nav .back {
   right: 0.4rem;
   left: unset;

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

@@ -124,6 +124,43 @@ ul {
       // }
     }
   }
+
+  .actLi {
+    height: px2rem(92);
+    position: relative;
+    overflow: hidden;
+
+    p,
+    b {
+      margin-top: px2rem(25);
+    }
+
+    i {
+      font-style: normal;
+      position: absolute;
+      top: 0;
+      right: 0;
+      height: px2rem(19);
+      line-height: px2rem(19);
+      padding: 0 px2rem(8);
+      border-radius: 0px px2rem(10) 0px px2rem(10);
+      text-align: center;
+      color: #FFFFFF;
+      font-size: px2rem(12);
+    }
+
+    .sp0 {
+      background: #FCAC3A;
+    }
+
+    .sp1 {
+      background: #04D5C6;
+    }
+
+    .sp2 {
+      background: #FF605A;
+    }
+  }
 }
 
 .arLang {

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

@@ -193,6 +193,12 @@ html {
   width: 0.42667rem;
   height: 0.42667rem;
   margin-top: 0.05333rem;
+}
+
+.transfer_method li .wenhao,
+.transfer_dollars li .wenhao {
+  width: 0.58667rem;
+  height: 0.58667rem;
   display: inline-block;
 }
 
@@ -240,23 +246,234 @@ html {
 .transfer_method .agent_settlement .pop,
 .transfer_dollars .official_withdraw .pop,
 .transfer_dollars .agent_settlement .pop {
-  width: 4.8rem;
-  height: 1.12rem;
-  background: url(../images/pop.png) no-repeat;
-  background-size: 100% 100%;
+  min-width: 5.76rem;
   position: absolute;
-  top: -0.42667rem;
-  left: 3.52rem;
+  top: -0.4rem;
+  left: 2.9rem;
   font-size: 0.32rem;
   line-height: 0.42667rem;
   color: #ffffff;
-  padding: 0.10667rem 0.21333rem 0;
+  padding: 0.21333rem;
+  background: #04D5C6;
+  border-radius: 0.21333rem;
 }
 
 .transfer_dollars {
   margin-bottom: 2.13333rem;
 }
 
+.withdrawalAccount {
+  width: 9.2rem;
+  height: 1.49333rem;
+  line-height: 1.49333rem;
+  box-sizing: border-box;
+  background: #F2F3F7;
+  border-radius: 0.21333rem;
+  margin: 0.26667rem auto 0.26667rem;
+  padding: 0 0.53333rem;
+  display: none;
+}
+
+.withdrawalAccount .left {
+  color: #313131;
+  font-size: 0.37333rem;
+  font-weight: 600;
+  float: left;
+}
+
+.withdrawalAccount .left b {
+  color: #ED4343;
+  margin-right: 0.10667rem;
+}
+
+.withdrawalAccount .right {
+  color: #7B7B7D;
+  font-size: 0.37333rem;
+  float: right;
+}
+
+.withdrawalAccount .right img {
+  display: inline-block;
+  width: 0.56rem;
+  height: 0.56rem;
+  margin-top: 0.48rem;
+}
+
+.selectAccount {
+  position: fixed;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  z-index: 999;
+  background: rgba(0, 0, 0, 0.5);
+  display: none;
+}
+
+.selectAccount .selectAccount_in {
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: 0;
+  width: 10rem;
+  min-height: 6.10667rem;
+  background: #fff;
+  border-radius: 0.42667rem 0.42667rem 0rem 0rem;
+}
+
+.selectAccount .selectAccount_in .title {
+  width: 100%;
+  text-align: center;
+  color: #313131;
+  font-size: 0.42667rem;
+  margin-top: 0.34667rem;
+  margin-bottom: 0.34667rem;
+  font-weight: 600;
+}
+
+.selectAccount .selectAccount_in .accountBox {
+  margin: 0 auto;
+  width: 9.14667rem;
+}
+
+.selectAccount .selectAccount_in .accountBox .account {
+  width: 100%;
+  height: 1.06667rem;
+  line-height: 1.06667rem;
+  background: #F4F4F4;
+  border-radius: 0.21333rem;
+  margin-bottom: 0.42667rem;
+  box-sizing: border-box;
+  padding: 0 0.32rem;
+}
+
+.selectAccount .selectAccount_in .accountBox .account .sel {
+  width: 0.48rem;
+  height: 0.48rem;
+  margin-top: 0.29333rem;
+  margin-right: 0.13333rem;
+  display: block;
+  float: left;
+}
+
+.selectAccount .selectAccount_in .accountBox .account b,
+.selectAccount .selectAccount_in .accountBox .account span {
+  color: #313131;
+  font-size: 0.37333rem;
+  font-weight: 400;
+  float: left;
+}
+
+.selectAccount .selectAccount_in .accountBox .account .eid {
+  display: block;
+  float: right;
+  margin-top: 0.24rem;
+  width: 0.58667rem;
+  height: 0.58667rem;
+}
+
+.pubWithdrawal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  z-index: 999;
+  background: rgba(0, 0, 0, 0.5);
+  display: none;
+}
+
+.pubWithdrawal .pubWithdrawal_in {
+  width: 9.14667rem;
+  min-height: 10.72rem;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  background: #fff;
+  border-radius: 0.42667rem;
+}
+
+.pubWithdrawal .pubWithdrawal_in .title {
+  width: 100%;
+  text-align: center;
+  color: #313131;
+  font-size: 0.45333rem;
+  font-weight: 500;
+  margin-top: 0.53333rem;
+  margin-bottom: 0.37333rem;
+}
+
+.pubWithdrawal .pubWithdrawal_in .boxw {
+  width: 8.08rem;
+  height: 0.53333rem;
+  line-height: 0.53333rem;
+  margin: 0 auto 0.53333rem;
+  display: flex;
+  justify-content: space-between;
+  overflow: hidden;
+}
+
+.pubWithdrawal .pubWithdrawal_in .boxw .left {
+  color: #7B7B7D;
+  font-size: 0.37333rem;
+  font-weight: 500;
+}
+
+.pubWithdrawal .pubWithdrawal_in .boxw .left b,
+.pubWithdrawal .pubWithdrawal_in .boxw .left p {
+  color: #7B7B7D;
+  font-size: 0.37333rem;
+  font-weight: 500;
+}
+
+.pubWithdrawal .pubWithdrawal_in .boxw .right {
+  color: #313131;
+  font-size: 0.37333rem;
+  font-weight: 500;
+}
+
+.pubWithdrawal .pubWithdrawal_in .box3 {
+  height: auto;
+}
+
+.pubWithdrawal .pubWithdrawal_in .box3 b {
+  margin-bottom: 0.16rem;
+  display: block;
+}
+
+.pubWithdrawal .pubWithdrawal_in .text {
+  color: #7B7B7D;
+  font-size: 0.37333rem;
+  width: 8.08rem;
+  margin: 0 auto 0.45333rem;
+  font-weight: 400;
+}
+
+.pubWithdrawal .pubWithdrawal_in .ok {
+  width: 8.08rem;
+  height: 1.22667rem;
+  line-height: 1.22667rem;
+  border-radius: 1.22667rem;
+  background: #04D5C6;
+  margin: 0 auto 0.32rem;
+  color: #FFFFFF;
+  font-size: 0.42667rem;
+  text-align: center;
+}
+
+.pubWithdrawal .pubWithdrawal_in .close {
+  width: 8.08rem;
+  height: 1.22667rem;
+  line-height: 1.22667rem;
+  border-radius: 1.22667rem;
+  background: #F2F3F7;
+  margin: 0 auto 0;
+  color: #7B7B7D;
+  font-size: 0.42667rem;
+  text-align: center;
+}
+
 .confirm {
   width: 9.17333rem;
   height: 1.06667rem;
@@ -576,6 +793,61 @@ html {
   color: #7b7b7d;
 }
 
+.success {
+  position: fixed;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 9999;
+  display: none;
+}
+
+.success .success_in {
+  width: 9.14667rem;
+  min-height: 4.64rem;
+  background: #fff;
+  border-radius: 0.42667rem;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+}
+
+.success .success_in .title {
+  width: 100%;
+  text-align: center;
+  color: #313131;
+  font-size: 0.45333rem;
+  height: 0.64rem;
+  margin-top: 0.4rem;
+  margin-bottom: 0.37333rem;
+  font-weight: 500;
+}
+
+.success .success_in p {
+  width: 8.08rem;
+  margin: 0 auto 0.37333rem;
+  color: #7B7B7D;
+  font-size: 0.37333rem;
+  font-weight: 400;
+  line-height: 0.53333rem;
+}
+
+.success .success_in .but {
+  width: 8.08rem;
+  height: 1.22667rem;
+  line-height: 1.22667rem;
+  text-align: center;
+  color: #fff;
+  font-size: 0.42667rem;
+  font-weight: 500;
+  margin: 0 auto;
+  background: #04D5C6;
+  border-radius: 0.66667rem;
+}
+
 .arabic .nav .back {
   right: 0.4rem;
   left: unset;
@@ -584,7 +856,8 @@ html {
 
 .arabic .transfer_method .official_withdraw .pop {
   left: unset;
-  right: 3.52rem;
+  right: 3.2rem;
+  top: -0.8rem;
 }
 
 .arabic .my_salary p img {
@@ -601,9 +874,16 @@ html {
   padding-left: unset;
 }
 
-.arabic .transfer_method .official_withdraw .pop, .arabic .transfer_method .agent_settlement .pop, .arabic .transfer_dollars .official_withdraw .pop, .arabic .transfer_dollars .agent_settlement .pop {
-  background: url(../images/pop-ar.png) no-repeat;
-  background-size: 100% 100%;
-  left: auto;
-  right: 3.52rem;
+.arabic .pubWithdrawal .pubWithdrawal_in {
+  height: 11.6rem;
+}
+
+.arabic .pubWithdrawal .pubWithdrawal_in .boxw .right {
+  float: left;
+  white-space: nowrap;
+}
+
+.english .transfer_method .official_withdraw .pop {
+  top: -0.8rem;
+  left: 2.9rem;
 }

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

@@ -1,5 +1,5 @@
-@function px2rem($px, $rem: 37.5) {
-  @return $px / $rem +rem;
+@function px2rem($px) {
+  @return $px / 37.5+rem;
 }
 
 body,
@@ -189,6 +189,11 @@ html {
       width: px2rem(16);
       height: px2rem(16);
       margin-top: px2rem(2);
+    }
+
+    .wenhao {
+      width: px2rem(22);
+      height: px2rem(22);
       display: inline-block;
     }
 
@@ -228,17 +233,19 @@ html {
     // display: none;
 
     .pop {
-      width: px2rem(180);
-      height: px2rem(42);
-      background: url(../images/pop.png) no-repeat;
-      background-size: 100% 100%;
+      min-width: px2rem(216);
+      // height: px2rem(42);
+      // background: url(../images/pop.png) no-repeat;
+      // background-size: 100% 100%;
       position: absolute;
-      top: px2rem(-16);
-      left: px2rem(132);
+      top: -0.4rem;
+      left: 2.9rem;
       font-size: px2rem(12);
       line-height: px2rem(16);
       color: #ffffff;
-      padding: px2rem(4) px2rem(8) 0;
+      padding: px2rem(8);
+      background: #04D5C6;
+      border-radius: px2rem(8);
     }
   }
 }
@@ -247,6 +254,221 @@ html {
   margin-bottom: px2rem(80);
 }
 
+.withdrawalAccount {
+  width: px2rem(345);
+  height: px2rem(56);
+  line-height: px2rem(56);
+  box-sizing: border-box;
+  background: #F2F3F7;
+  border-radius: px2rem(8);
+  margin: px2rem(10) auto px2rem(10);
+  padding: 0 px2rem(20);
+  display: none;
+
+  .left {
+    color: #313131;
+    font-size: px2rem(14);
+    font-weight: 600;
+    float: left;
+
+    b {
+      color: #ED4343;
+      margin-right: px2rem(4);
+    }
+  }
+
+  .right {
+    color: #7B7B7D;
+    font-size: px2rem(14);
+    float: right;
+
+    img {
+      display: inline-block;
+      width: px2rem(21);
+      height: px2rem(21);
+      margin-top: px2rem(18);
+    }
+  }
+}
+
+.selectAccount {
+  position: fixed;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  z-index: 999;
+  background: rgba(0, 0, 0, 0.5);
+  display: none;
+
+  .selectAccount_in {
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%);
+    bottom: 0;
+    width: px2rem(375);
+    min-height: px2rem(229);
+    background: #fff;
+    border-radius: px2rem(16) px2rem(16) px2rem(0) px2rem(0);
+
+    .title {
+      width: 100%;
+      text-align: center;
+      color: #313131;
+      font-size: px2rem(16);
+      margin-top: px2rem(13);
+      margin-bottom: px2rem(13);
+      font-weight: 600;
+    }
+
+    .accountBox {
+      margin: 0 auto;
+      width: px2rem(343);
+
+      .account {
+        width: 100%;
+        height: px2rem(40);
+        line-height: px2rem(40);
+        background: #F4F4F4;
+        border-radius: px2rem(8);
+        margin-bottom: px2rem(16);
+        box-sizing: border-box;
+        padding: 0 px2rem(12);
+
+        .sel {
+          width: px2rem(18);
+          height: px2rem(18);
+          margin-top: px2rem(11);
+          margin-right: px2rem(5);
+          display: block;
+          float: left;
+        }
+
+        b,
+        span {
+          color: #313131;
+          font-size: px2rem(14);
+          font-weight: 400;
+          float: left;
+        }
+
+        .eid {
+          display: block;
+          float: right;
+          margin-top: px2rem(9);
+          width: px2rem(22);
+          height: px2rem(22);
+        }
+      }
+    }
+  }
+}
+
+.pubWithdrawal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  z-index: 999;
+  background: rgba(0, 0, 0, 0.5);
+  display: none;
+
+  // display: none;
+  .pubWithdrawal_in {
+    width: px2rem(343);
+    min-height: px2rem(402);
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    background: #fff;
+    border-radius: px2rem(16);
+
+    .title {
+      width: 100%;
+      text-align: center;
+      color: #313131;
+      font-size: px2rem(17);
+      font-weight: 500;
+      margin-top: px2rem(20);
+      margin-bottom: px2rem(14);
+    }
+
+    .boxw {
+      width: px2rem(303);
+      height: px2rem(20);
+      line-height: px2rem(20);
+      margin: 0 auto px2rem(20);
+      display: flex;
+      justify-content: space-between;
+      overflow: hidden;
+
+      .left {
+        color: #7B7B7D;
+        font-size: px2rem(14);
+        font-weight: 500;
+
+        b,
+        p {
+          color: #7B7B7D;
+          font-size: px2rem(14);
+          font-weight: 500;
+        }
+      }
+
+      .right {
+        color: #313131;
+        font-size: px2rem(14);
+        font-weight: 500;
+      }
+    }
+
+    .box3 {
+      height: auto;
+
+      b {
+        margin-bottom: px2rem(6);
+        display: block;
+      }
+    }
+
+    .text {
+      color: #7B7B7D;
+      font-size: px2rem(14);
+      width: px2rem(303);
+      margin: 0 auto px2rem(17);
+      font-weight: 400;
+    }
+
+    .ok {
+      width: px2rem(303);
+      height: px2rem(46);
+      line-height: px2rem(46);
+      border-radius: px2rem(46);
+      background: #04D5C6;
+      margin: 0 auto px2rem(12);
+      color: #FFFFFF;
+      font-size: px2rem(16);
+      text-align: center;
+    }
+
+    .close {
+      width: px2rem(303);
+      height: px2rem(46);
+      line-height: px2rem(46);
+      border-radius: px2rem(46);
+      background: #F2F3F7;
+      margin: 0 auto 0;
+      color: #7B7B7D;
+      font-size: px2rem(16);
+      text-align: center;
+
+    }
+  }
+
+}
+
 .confirm {
   width: px2rem(344);
   height: px2rem(40);
@@ -410,6 +632,7 @@ html {
       }
     }
   }
+
   // .agent_pop_in{
   //   width: px2rem(580);
   //   height: px2rem(988);
@@ -527,6 +750,61 @@ html {
   }
 }
 
+.success {
+  position: fixed;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 9999;
+  display: none;
+
+  .success_in {
+    width: px2rem(343);
+    min-height: px2rem(174);
+    background: #fff;
+    border-radius: px2rem(16);
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+
+    .title {
+      width: 100%;
+      text-align: center;
+      color: #313131;
+      font-size: px2rem(17);
+      height: px2rem(24);
+      margin-top: px2rem(15);
+      margin-bottom: px2rem(14);
+      font-weight: 500;
+    }
+
+    p {
+      width: px2rem(303);
+      margin: 0 auto px2rem(14);
+      color: #7B7B7D;
+      font-size: px2rem(14);
+      font-weight: 400;
+      line-height: px2rem(20);
+    }
+
+    .but {
+      width: px2rem(303);
+      height: px2rem(46);
+      line-height: px2rem(46);
+      text-align: center;
+      color: #fff;
+      font-size: px2rem(16);
+      font-weight: 500;
+      margin: 0 auto;
+      background: #04D5C6;
+      border-radius: px2rem(25);
+    }
+  }
+}
+
 .arabic {
   .nav {
     .back {
@@ -538,7 +816,8 @@ html {
 
   .transfer_method .official_withdraw .pop {
     left: unset;
-    right: 3.52rem;
+    right: 3.2rem;
+    top: -0.8rem;
   }
 
   .my_salary p img {
@@ -556,10 +835,29 @@ html {
       padding-left: unset;
     }
   }
-  .transfer_method .official_withdraw .pop, .transfer_method .agent_settlement .pop, .transfer_dollars .official_withdraw .pop, .transfer_dollars .agent_settlement .pop{
-    background: url(../images/pop-ar.png) no-repeat;
-    background-size: 100% 100%;
-    left: auto;
-    right: 3.52rem;
+
+  // .transfer_method .official_withdraw .pop,
+  // .transfer_method .agent_settlement .pop,
+  // .transfer_dollars .official_withdraw .pop,
+  // .transfer_dollars .agent_settlement .pop {
+  //   background: url(../images/pop-ar.png) no-repeat;
+  //   background-size: 100% 100%;
+  //   left: auto;
+  //   right: 3.52rem;
+  // }
+  .pubWithdrawal .pubWithdrawal_in {
+    height: 11.6rem;
+
+    .boxw .right {
+      float: left;
+      white-space: nowrap;
+    }
+  }
+}
+
+.english {
+  .transfer_method .official_withdraw .pop {
+    top: -0.8rem;
+    left: 2.9rem;
   }
 }

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

@@ -0,0 +1,221 @@
+const urlData = getQueryString();
+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 fields = {};
+$(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();
+        get()
+    }, 100);
+
+});
+function translateFun() {
+    langReplace = window.lang.replace;
+    localLang = window.lang;
+    $('.text1').text(langReplace(localLang.bank.text1));
+    $('.text2').text(langReplace(localLang.bank.text2));
+    $('.text3').text(langReplace(localLang.bank.text3));
+    $('.text4').text(langReplace(localLang.bank.text4));
+    $('.text5').attr('placeholder', langReplace(localLang.bank.text5));
+    $('.text6').attr('placeholder', langReplace(localLang.bank.text6));
+    $('.text7').attr('placeholder', langReplace(localLang.bank.text7));
+    $('.text8').attr('placeholder', langReplace(localLang.bank.text8));
+    $('.text9').attr('placeholder', langReplace(localLang.bank.text9));
+    $('.text10').attr('placeholder', langReplace(localLang.bank.text10));
+    $('.p1').text(langReplace(localLang.pTitle.p1));
+    $('.p2').text(langReplace(localLang.pTitle.p2));
+    $('.p3').text(langReplace(localLang.pTitle.p3));
+    $('.p4').text(langReplace(localLang.pTitle.p4));
+    $('.p5').text(langReplace(localLang.pTitle.p5));
+    $('.p6').text(langReplace(localLang.pTitle.p6));
+}
+// 获取
+function get() {
+    showLoading();
+    networkRequest({
+        type: "GET",
+        url: urlPrefix + "/guild/usd/withdrawAccount/get",
+        data: { type: getQueryString().type },
+        success: function (res) {
+            if (res.code == 200) {
+                // 回显数据
+                $('.currencyType input').val(langReplace(localLang.payonner.text6) + res.data.currency);
+                fields = res.data.fields;
+                if (fields.country == '') {
+                    $('.but .determine').hide();
+                    $('.but .ok').show();
+                    $('.box input').attr('disabled', false)
+                } else {
+                    $('.but .determine').show();
+                    $('.but .ok').hide();
+                    $('.box input').attr('disabled', true)
+                }
+                $('.currencyType input').attr('disabled', true)
+                $('.country input').val(fields.country);
+                $('.payeeAccountNo input').val(fields.bank_account);
+                $('.bankName input').val(fields.bank_name);
+                $('.sWIFTCode input').val(fields.swift_code);
+                $('.payeeName input').val(fields.full_name);
+                $('.Address input').val(fields.address);
+                // 渲染国家
+                $('.pub .pub_in .countryPub').remove();
+                var str = '';
+                res.data.countryOptionalList.forEach(res => {
+                    str += `
+                        <div country='${res.value}' name="${res.name}" class="countryPub">${res.name}</div>
+                    `
+                })
+                $('.pub .pub_in').append(str);
+            } else {
+                toastMsg(res.message);
+            }
+            hideLoading(layerIndex);
+        },
+        error: function (res) {
+            console.log(res, "报错啦");
+            hideLoading(layerIndex);
+        },
+    });
+}
+// 选择国家
+$('.country').click(function () {
+    $('.pub').show();
+})
+// 关闭选择国家
+$('.pub').click(function (params) {
+    $('.pub').hide();
+})
+// 选中国家
+var nameval;
+$('.pub .pub_in').on('click', '.countryPub', function (params) {
+    $(this).addClass('act').siblings().removeClass('act');
+    nameval = $(this).attr('name');
+    var country = $(this).attr('country');
+    fields.country = country;
+    return false;
+})
+// 确认选中国家
+$('.pub .pub_in .soure').click(function (params) {
+    $('.country input').val(nameval);
+    $('.pub').hide();
+})
+// 确认绑定按钮
+$('.but .ok').click(function (params) {
+    console.log(fields);
+    var obj = {}
+    obj.country = fields.country;
+    obj.bank_account = $('.payeeAccountNo input').val();
+    obj.bank_name = $('.bankName input').val();
+    obj.swift_code = $('.sWIFTCode input').val();
+    obj.full_name = $('.payeeName input').val();
+    obj.address = $('.Address input').val();
+    if (obj.country && obj.bank_account && obj.bank_name && obj.swift_code && obj.full_name && obj.address != '') {
+        fields = obj;
+        var objJson = {
+            uid: pubInfo.uid,
+            type: getQueryString().type,
+            fields,
+        }
+        update(JSON.stringify(objJson));
+    } else {
+        toastMsg(langReplace(localLang.payonner.text10));
+    }
+})
+// 绑定更新信息
+function update(obj) {
+    showLoading();
+    networkRequest({
+        type: "post",
+        url: urlPrefix + "/guild/usd/withdrawAccount/bound",
+        contentType: 'application/json;charset=UTF-8',
+        data: obj,
+        success: function (res) {
+            if (res.code == 200) {
+                get();
+                toastMsg('success');
+                location.href = './salary_account.html'
+            } else {
+                toastMsg(res.message);
+            }
+            hideLoading(layerIndex);
+        },
+        error: function (res) {
+            hideLoading(layerIndex);
+        },
+    });
+}
+// 解绑
+$('.but .determine').click(function () {
+    var objJson = {
+        uid: pubInfo.uid,
+        type: getQueryString().type,
+    }
+    unbound(JSON.stringify(objJson));
+})
+// 解绑
+function unbound(obj) {
+    showLoading();
+    networkRequest({
+        type: "post",
+        url: urlPrefix + "/guild/usd/withdrawAccount/unbound",
+        contentType: 'application/json;charset=UTF-8',
+        data: obj,
+        success: function (res) {
+            if (res.code == 200) {
+                get();
+                toastMsg('success');
+            } else {
+                toastMsg(res.message);
+            }
+            hideLoading(layerIndex);
+        },
+        error: function (res) {
+            hideLoading(layerIndex);
+        },
+    });
+}

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

@@ -0,0 +1,212 @@
+const urlData = getQueryString();
+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 fields = {};
+$(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();
+        get()
+    }, 100);
+
+});
+function translateFun() {
+    langReplace = window.lang.replace;
+    localLang = window.lang;
+    $('.text1').text(langReplace(localLang.payonner.text1));
+    $('.text2').text(langReplace(localLang.payonner.text2));
+    $('.text3').text(langReplace(localLang.payonner.text3));
+    $('.text4').text(langReplace(localLang.payonner.text4));
+    $('.text5').text(langReplace(localLang.payonner.text5));
+    $('.text6').attr('placeholder', langReplace(localLang.payonner.text6));
+    $('.text7').attr('placeholder', langReplace(localLang.payonner.text7));
+    $('.text8').attr('placeholder', langReplace(localLang.pTitle.p7));
+    $('.text9').attr('placeholder', langReplace(localLang.payonner.text9));
+    $('.p1').text(langReplace(localLang.pTitle.p1));
+    $('.p7').text(langReplace(localLang.pTitle.p7));
+    $('.p5').text(langReplace(localLang.pTitle.p5));
+
+}
+// 获取
+function get() {
+    showLoading();
+    networkRequest({
+        type: "GET",
+        url: urlPrefix + "/guild/usd/withdrawAccount/get",
+        data: { type: getQueryString().type },
+        success: function (res) {
+            if (res.code == 200) {
+                // 回显数据
+                $('.currencyType input').val(langReplace(localLang.payonner.text6) + res.data.currency);
+                fields = res.data.fields;
+                if (fields.country == '') {
+                    $('.but .determine').hide();
+                    $('.but .ok').show();
+                    $('.box input').attr('disabled', false)
+                } else {
+                    $('.but .determine').show();
+                    $('.but .ok').hide();
+                    $('.box input').attr('disabled', true)
+                }
+                $('.currencyType input').attr('disabled', true)
+                $('.country input').val(fields.country);
+                $('.payeeAccountNo input').val(fields.bank_account);
+                $('.payeeName input').val(fields.full_name);
+                // 渲染国家
+                $('.pub .pub_in .countryPub').remove();
+                var str = '';
+                res.data.countryOptionalList.forEach(res => {
+                    str += `
+                    <div country='${res.value}' name="${res.name}" class="countryPub">${res.name}</div>
+                    `
+                })
+                $('.pub .pub_in').append(str);
+            } else {
+                toastMsg(res.message);
+            }
+            hideLoading(layerIndex);
+        },
+        error: function (res) {
+            console.log(res, "报错啦");
+            hideLoading(layerIndex);
+        },
+    });
+}
+// 选择国家
+$('.country').click(function () {
+    $('.pub').show();
+})
+// 关闭选择国家
+$('.pub').click(function (params) {
+    $('.pub').hide();
+})
+// 选中国家
+var nameTitle
+$('.pub .pub_in').on('click', '.countryPub', function name(params) {
+    $(this).addClass('act').siblings().removeClass('act');
+    nameTitle = $(this).attr('name');
+    var country = $(this).attr('country');
+    fields.country = country;
+    return false;
+})
+// 确认选中国家
+$('.pub .pub_in .soure').click(function name(params) {
+    $('.country input').val(nameTitle);
+    $('.pub').hide();
+})
+// 确认绑定按钮
+$('.but .ok').click(function (params) {
+    console.log(fields);
+    var obj = {}
+    obj.country = fields.country;
+    obj.bank_account = $('.payeeAccountNo input').val();
+    obj.full_name = $('.payeeName input').val();
+    if (obj.country && obj.bank_account && obj.full_name) {
+        fields = obj;
+        var objJson = {
+            uid: pubInfo.uid,
+            type: getQueryString().type,
+            fields,
+        }
+        update(JSON.stringify(objJson));
+    } else {
+        toastMsg(langReplace(localLang.payonner.text10));
+    }
+})
+// 绑定更新信息
+function update(obj) {
+    showLoading();
+    networkRequest({
+        type: "post",
+        url: urlPrefix + "/guild/usd/withdrawAccount/bound",
+        contentType: 'application/json;charset=UTF-8',
+        data: obj,
+        success: function (res) {
+            if (res.code == 200) {
+                get();
+                toastMsg('success');
+                location.href = './salary_account.html'
+            } else {
+                toastMsg(res.message);
+            }
+            hideLoading(layerIndex);
+        },
+        error: function (res) {
+            hideLoading(layerIndex);
+        },
+    });
+}
+// 解绑
+$('.but .determine').click(function () {
+    var objJson = {
+        uid: pubInfo.uid,
+        type: getQueryString().type,
+    }
+    unbound(JSON.stringify(objJson));
+})
+// 解绑
+function unbound(obj) {
+    showLoading();
+    networkRequest({
+        type: "post",
+        url: urlPrefix + "/guild/usd/withdrawAccount/unbound",
+        contentType: 'application/json;charset=UTF-8',
+        data: obj,
+        success: function (res) {
+            if (res.code == 200) {
+                get();
+                toastMsg('success');
+            } else {
+                toastMsg(res.message);
+            }
+            hideLoading(layerIndex);
+        },
+        error: function (res) {
+            hideLoading(layerIndex);
+        },
+    });
+}

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

@@ -0,0 +1,206 @@
+const urlData = getQueryString();
+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 fields = {};
+$(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();
+        get()
+    }, 100);
+
+});
+function translateFun() {
+    langReplace = window.lang.replace;
+    localLang = window.lang;
+    $('.text2').text(langReplace(localLang.payonner.text2));
+    $('.text3').text(langReplace(localLang.payonner.text3));
+    $('.text4').text(langReplace(localLang.payonner.text4));
+    $('.text5').text(langReplace(localLang.payonner.text5));
+    $('.text7').attr('placeholder', langReplace(localLang.payonner.text7));
+    $('.text8').attr('placeholder', langReplace(localLang.payonner.text8));
+    $('.p1').text(langReplace(localLang.pTitle.p1));
+    $('.p2').text(langReplace(localLang.pTitle.p2));
+
+}
+// 获取
+function get() {
+    showLoading();
+    networkRequest({
+        type: "GET",
+        url: urlPrefix + "/guild/usd/withdrawAccount/get",
+        data: { type: getQueryString().type },
+        success: function (res) {
+            if (res.code == 200) {
+                // 回显数据
+                $('.currencyType input').val(langReplace(localLang.payonner.text6) + res.data.currency);
+                fields = res.data.fields;
+                if (fields.country == '') {
+                    $('.but .determine').hide();
+                    $('.but .ok').show();
+                    $('.box input').attr('disabled', false)
+                } else {
+                    $('.but .determine').show();
+                    $('.but .ok').hide();
+                    $('.box input').attr('disabled', true)
+                }
+                $('.currencyType input').attr('disabled', true)
+                $('.country input').val(fields.country);
+                $('.payeeAccountNo input').val(fields.bank_account);
+                // 渲染国家
+                $('.pub .pub_in .countryPub').remove();
+                var str = '';
+                res.data.countryOptionalList.forEach(res => {
+                    str += `
+                    <div country='${res.value}' name="${res.name}" class="countryPub">${res.name}</div>
+                    `
+                })
+                $('.pub .pub_in').append(str);
+            } else {
+                toastMsg(res.message);
+            }
+            hideLoading(layerIndex);
+        },
+        error: function (res) {
+            console.log(res, "报错啦");
+            hideLoading(layerIndex);
+        },
+    });
+}
+// 选择国家
+$('.country').click(function () {
+    $('.pub').show();
+})
+// 关闭选择国家
+$('.pub').click(function (params) {
+    $('.pub').hide();
+})
+// 选中国家
+var nameTitle;
+$('.pub .pub_in').on('click', '.countryPub', function name(params) {
+    $(this).addClass('act').siblings().removeClass('act');
+    nameTitle = $(this).attr('name');
+    var country = $(this).attr('country');
+    fields.country = country;
+    return false;
+})
+// 确认选中国家
+$('.pub .pub_in .soure').click(function name(params) {
+    $('.country input').val(nameTitle);
+    $('.pub').hide();
+})
+// 确认绑定按钮
+$('.but .ok').click(function (params) {
+    console.log(fields);
+    var obj = {}
+    obj.country = fields.country;
+    obj.bank_account = $('.payeeAccountNo input').val();
+    if (obj.country && obj.bank_account) {
+        fields = obj;
+        var objJson = {
+            uid: pubInfo.uid,
+            type: getQueryString().type,
+            fields,
+        }
+        update(JSON.stringify(objJson));
+    } else {
+        toastMsg(langReplace(localLang.payonner.text10));
+    }
+})
+// 绑定更新信息
+function update(obj) {
+    showLoading();
+    networkRequest({
+        type: "post",
+        url: urlPrefix + "/guild/usd/withdrawAccount/bound",
+        contentType: 'application/json;charset=UTF-8',
+        data: obj,
+        success: function (res) {
+            if (res.code == 200) {
+                get();
+                toastMsg('success');
+                location.href = './salary_account.html'
+            } else {
+                toastMsg(res.message);
+            }
+            hideLoading(layerIndex);
+        },
+        error: function (res) {
+            hideLoading(layerIndex);
+        },
+    });
+}
+// 解绑
+$('.but .determine').click(function () {
+    var objJson = {
+        uid: pubInfo.uid,
+        type: getQueryString().type,
+    }
+    unbound(JSON.stringify(objJson));
+})
+// 解绑
+function unbound(obj) {
+    showLoading();
+    networkRequest({
+        type: "post",
+        url: urlPrefix + "/guild/usd/withdrawAccount/unbound",
+        contentType: 'application/json;charset=UTF-8',
+        data: obj,
+        success: function (res) {
+            if (res.code == 200) {
+                get();
+                toastMsg('success');
+            } else {
+                toastMsg(res.message);
+            }
+            hideLoading(layerIndex);
+        },
+        error: function (res) {
+            hideLoading(layerIndex);
+        },
+    });
+}

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

@@ -98,16 +98,18 @@ function getData() {
                 list.forEach(item => {
                     // tradeType 1 收入 2支出
                     // if (item.tradeType == 1) {
-                    str += `<li>
-                            <div>
-                                    <p>${item.type == 1 ? `${langReplace(localLang.bill.text5)}` : item.type == 2 ? `${langReplace(localLang.bill.text6)}` : item.type == 3 ? `${langReplace(localLang.bill.text7)}` : item.type == 4 ? `ID:${type == 1 ? item.target.erbanNo : item.me.erbanNo} ${langReplace(localLang.bill.text8)} ID: ${type == 1 ? item.me.erbanNo : item.target.erbanNo}` : `${langReplace(localLang.bill.text9)}`}</p>
-                                    <b dir="ltr">${type == 1 ? '+ ' + item.operateUsdNum.toLocaleString() : item.operateUsdNum.toLocaleString()} ÜS</b>
-                            </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>
-                            </div>
-                        </li>`
+                    str += `
+                            <li class="${item.type == 5 || item.type == 6 ? 'actLi' : ''}">
+                                <div>
+                                        ${(item.type == 5 || item.type == 6) ? `<i class="sp${item.status}">${(item.status == 0 ? langReplace(localLang.bill.text10) : item.status == 1 ? langReplace(localLang.bill.text11) : langReplace(localLang.bill.text12))}</i>` : ''}
+                                        <p>${item.type == 1 ? `${langReplace(localLang.bill.text5)}` : item.type == 2 ? `${langReplace(localLang.bill.text6)}` : item.type == 3 ? `${langReplace(localLang.bill.text7)}` : item.type == 4 ? `ID:${type == 1 ? item.target.erbanNo : item.me.erbanNo} ${langReplace(localLang.bill.text8)} ID: ${type == 1 ? item.me.erbanNo : item.target.erbanNo}` : `${langReplace(localLang.bill.text9)}`}</p>
+                                        <b dir="ltr">${type == 1 ? '+ ' + item.operateUsdNum.toLocaleString() : item.operateUsdNum.toLocaleString()} ÜS</b>
+                                </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>
+                                </div>
+                            </li>`
                     //     } else {
                     //         str += `<li>
                     //       <div>

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

@@ -46,6 +46,9 @@ var transfer_dollars_ArrType;
 var typeTabType = '';
 var ratio;
 var usGold;
+var accountListName;
+var accountObj = {};
+var withdrawRate;
 $(function () {
   getInfoFromClient();
   fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言
@@ -90,6 +93,21 @@ $(function () {
     $('.text16').text(langReplace(localLang.salary.text16));
     $('.text17').html(langReplace(localLang.salary.text17));
     $('.text18').html(langReplace(localLang.salary.text18));
+    $('.textnew1').html(langReplace(localLang.salary.textnew1));
+    $('.textnew2').html(langReplace(localLang.salary.textnew2));
+    $('.textnew3').html(langReplace(localLang.salary.textnew3));
+    $('.textnew4').html(langReplace(localLang.salary.textnew4));
+    $('.textnew5').html(langReplace(localLang.salary.textnew5));
+    $('.textnew6').html(langReplace(localLang.salary.textnew6));
+    $('.textnew7').html(langReplace(localLang.salary.textnew7));
+    $('.textnew8').html(langReplace(localLang.salary.textnew8));
+    $('.textnew9').html(langReplace(localLang.salary.textnew9));
+    $('.textnew10').html(langReplace(localLang.salary.textnew10));
+    $('.textnew11').html(langReplace(localLang.salary.textnew11));
+    $('.textnew12').html(langReplace(localLang.salary.textnew12));
+    $('.textnew15').html(langReplace(localLang.salary.textnew15));
+    $('.textnew16').html(langReplace(localLang.salary.textnew16));
+    $('.textnew17').html(langReplace(localLang.salary.textnew17));
   }
 });
 // 获取usd操作的功能标签tab
@@ -129,6 +147,20 @@ function getTab() {
           })
           $('.agent_pop .wrap').append(agent_popStr);
           $('.agent_pop .sure').attr('uid', rechargeUserList[0].uid);
+          // 渲染账户列表
+          var accountListStr = '';
+          withdrawRate = res.data.withdrawAccountVo.withdrawRate;
+          $('.selectAccount .selectAccount_in .accountBox .account').remove();
+          res.data.withdrawAccountVo.accountList.forEach(res => {
+            accountListStr += `
+                  <div class="account">
+                    <img style="display:${res.hasBound ? 'block' : 'none'}" src="./images/not.png" alt="" class="sel" name=${res.name} type=${res.type} obj='${JSON.stringify(res)}'>
+                    <b>${res.name}</b><span>${res.hasBound ? '' : '(Unbound)'}</span>
+                    <img  src="./images/eidIcon.png" alt="" class="eid" type=${res.type}>
+                  </div>
+            `
+          })
+          $('.selectAccount .selectAccount_in .accountBox').append(accountListStr);
         }
         // 当前可提现余额
         usGold = res.data.guildUsdNum
@@ -146,7 +178,7 @@ function getTab() {
           tabStr += `<div tabKey=${res.tabKey} class="item ${i == 0 ? 'act' : ''}">${res.tabKey == 'personal' ? langReplace(localLang.salary.text4) : langReplace(localLang.salary.text5)}</div>`
         })
         $('.tab').append(tabStr);
-        typeTabType =  res.data.typeTab[0].tabKey
+        typeTabType = res.data.typeTab[0].tabKey
         typeTabFun(typeTabType);
       } else {
         toastMsg(res.message)
@@ -175,6 +207,7 @@ function typeTabFun(type) {
   transfer_dollars_Arr = {};
   $('.transfer_method li').remove();
   $('.transfer_dollars li').remove();
+  $('.withdrawalAccount').hide();
   var str = '';
   var arr = type == 'personal' ? tabPersonalArr[0] : tabAgentArr[0];
   // 处理方式
@@ -207,14 +240,16 @@ function typeTabFun(type) {
           </li>
       `
     } else if (res.type == 5) {
+      $('.withdrawalAccount').show();
       str += `
           <li class="official_withdraw ${i == 0 ? 'li_act' : ''}" type="${res.type}" ratio="${res.ratio}">
             <p>
               <img src="./images/dollar.png" class="dollar" alt="">
               <e>${langReplace(localLang.salary.text20)}</e>
+              <img class="wenhao" src="./images/wenhao.png" />
             </p>
-            <div class="pop">
-            ${langReplace(localLang.salary.text21)}
+            <div class="pop" style="display:none">
+             ${langReplace(localLang.salary.text21)}
             </div>
           </li>
       `
@@ -225,7 +260,7 @@ function typeTabFun(type) {
               <img src="./images/dollar.png" class="dollar" alt="">
               <e>${langReplace(localLang.salary.text22)}</e>
             </p>
-            <div class="pop">
+            <div class="pop" style="display:none">
             ${langReplace(localLang.salary.text21)}
             </div>
           </li>
@@ -249,6 +284,7 @@ function typeTabFun(type) {
 }
 // 处理金额
 function dollarsFun(type) {
+  $('.withdrawalAccount').hide();
   $('.transfer_dollars li').remove();
   var str2 = '';
   if (transfer_dollars_Arr[type].canCustom) {
@@ -268,6 +304,9 @@ function dollarsFun(type) {
       $('.president_pop .btn_wrap .sure').attr('guildusdnum', res.guildUsdNum);
       $('.agent_pop .btn_wrap .sure').attr('guildusdnum', res.guildUsdNum);
     }
+    if (res.type == 5) {
+      $('.withdrawalAccount').show();
+    }
     if (res.type == 2) {
       str2 += `
         <li class="${i == 0 ? 'li_act' : ''}" guildusdnum=${res.guildUsdNum}>
@@ -350,6 +389,12 @@ $('.transfer_method').on('click', 'li', function () {
   transfer_dollars_ArrType = type;
   dollarsFun(transfer_dollars_ArrType);
 })
+$('.transfer_method').on('click', 'li .wenhao', function () {
+  $('.pop').show();
+})
+$('.transfer_method').on('click', 'li .pop', function () {
+  $('.pop').hide();
+})
 // 选择金额方式
 $('.transfer_dollars').on('click', 'li', function () {
   $(this).addClass('li_act').siblings().removeClass('li_act');
@@ -458,6 +503,26 @@ function operateValue(than) {
   } else if (type == 4) {
     $('.president_pop').show();
     bodyScroolFun(true);
+  } else if (type == 5) {
+    if (accountListName) {
+      $('.pubWithdrawal .pubWithdrawal_in .ok').attr('guildusdnum', guildUsdNum);
+      $('.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 span').text(accountObj.usdRatio);
+        $('.pubWithdrawal .pubWithdrawal_in .box4 .right').text(`${((than.attr('guildUsdNum')) - (than.attr('guildUsdNum') * withdrawRate)) * 50} ${accountObj.currency}`);
+      } else {
+        $('.pubWithdrawal .pubWithdrawal_in .box3 .left p').hide();
+        $('.pubWithdrawal .pubWithdrawal_in .box4 .right').text(`${((than.attr('guildUsdNum')) - (than.attr('guildUsdNum') * withdrawRate))} ${accountObj.currency}`);
+      }
+      $('.pubWithdrawal .pubWithdrawal_in .box1 .right').text(`${than.attr('guildUsdNum')} USD`);
+      $('.pubWithdrawal .pubWithdrawal_in .box2 .right').text(withdrawRate * 100 + '%');
+      $('.pubWithdrawal .pubWithdrawal_in .box3 .right').text(`${than.attr('guildUsdNum') * withdrawRate} USD`);
+      $('.pubWithdrawal').show();
+    } else {
+      toastMsg(langReplace(localLang.salary.textnew13))
+    }
   } else {
     var obj = {
       guildUsdNum,
@@ -467,6 +532,26 @@ function operateValue(than) {
     operate(obj)
   }
 }
+// 确认提现按钮
+$('.pubWithdrawal .pubWithdrawal_in .ok').click(function () {
+  var guildUsdNum = $(this).attr('guildUsdNum');
+  var type = $(this).attr('type');
+  var accountType = $(this).attr('accountType');
+  var obj = {
+    guildUsdNum,
+    accountType,
+    type,
+  };
+  if ($(this).attr('accountType') == 'VODAFONE' && $(this).attr('guildUsdNum') > 1000) {
+    toastMsg(langReplace(localLang.salary.textnew14))
+  } else {
+    operate(obj)
+  }
+})
+// 取消提现按钮
+$('.pubWithdrawal .pubWithdrawal_in .close').click(function () {
+  $('.pubWithdrawal').hide();
+})
 // 确认提交接口
 function operate(obj) {
   showLoading()
@@ -478,7 +563,12 @@ function operate(obj) {
       if (res.code === 200) {
         getTab();
         // window.location.href = `./salary_account.html?type=${obj.type}&createTime=${dateFormat(res.data.createTime,'yyyy/MM/dd hh:mm:ss')}&guildUsdNum=${res.data.guildUsdNum}`
-        window.location.href = `./successful.html?type=${obj.type}&data=${JSON.stringify(res.data)}`
+        if (obj.type == 5) {
+          $('.pubWithdrawal').hide();
+          $('.success').show();
+        } else {
+          window.location.href = `./successful.html?type=${obj.type}&data=${JSON.stringify(res.data)}`
+        }
       } else {
         toastMsg(res.message)
       }
@@ -489,4 +579,34 @@ function operate(obj) {
       toastMsg(langReplace(localLang.demoModule.layerIndex3))
     }
   })
-}
+}
+// 打开账户按钮
+$('.withdrawalAccount').click(function name(params) {
+  $('.selectAccount').show();
+})
+// 关闭账户按钮
+$('.selectAccount').click(function () {
+  $('.selectAccount').hide();
+})
+// 选择账户按钮
+$('.selectAccount .selectAccount_in .accountBox').on('click', ' .account', function () {
+  return false;
+})
+// 选择账户按钮
+$('.selectAccount .selectAccount_in .accountBox').on('click', ' .account .sel', function () {
+  $('.selectAccount .selectAccount_in .accountBox .account .sel').attr("src", './images/not.png');
+  $(this).attr("src", './images/yes.png');
+  accountListName = $(this).attr("name");
+  accountObj = JSON.parse($(this).attr('obj'));
+  $('.withdrawalAccount .right b').text(accountListName);
+  $('.selectAccount').hide();
+})
+// 选择账户编辑
+$('.selectAccount .selectAccount_in .accountBox').on('click', ' .account .eid', function () {
+  var type = $(this).attr('type');
+  location.href = `./${type}.html?type=${type}`
+})
+// 关闭成功按钮
+$('.success .success_in .but').click(function () {
+  $('.success').hide();
+})

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

@@ -225,11 +225,28 @@ langAr = {
         text18: `(نسبة التبادل 1:<b>7000</b>)`,
         text19: `تبادل العملات`,
         text20: `السحب الرسمي`,
-        text21: `يمكن التسوية في الأول و 16 من كل شهر`,
+        text21: `تفتح قناة السحب في اليومين الأول والثاني من كل شهر.`,
         text22: `تسوية الوكيل`,
         text23: `تسوية وكلاء الشحن`,
         text24: `يرجى إدخال المبلغ المراد استرداده`,
-        text25: `عملات`
+        text25: `عملات`,
+        textnew1: `حساب السحب`,
+        textnew2: `غير مرتبط`,
+        textnew3: `اختر الحساب`,
+        textnew4: `سحب`,
+        textnew5: `مبلغ السحب`,
+        textnew6: `معدل رسوم المعالجة`,
+        textnew7: `رسوم المعالجة`,
+        textnew8: `سعر الصرف من الدولار الأمريكي إلى الجنيه المصري: 1:`,
+        textnew9: `المبلغ المقدر`,
+        textnew10: `ملاحظة: قد يتأثر المبلغ المتوقع الوصول بسعر صرف البنك وما إلى ذلك.`,
+        textnew11: `سحب`,
+        textnew12: `إلغاء`,
+        textnew13: `يرجى اختيار حساب السحب`,
+        textnew14: `أكثر من الحد الأقصى للمبلغ القابل للتحويل.`,
+        textnew15: `نجاح`,
+        textnew16: `وقت معالجة طلبات السحب يكون من اليوم الثالث إلى العاشر من كل شهر.`,
+        textnew17: `موافق`,
     },
     bill: {
         text1: `الفاتورة`,
@@ -241,6 +258,9 @@ langAr = {
         text7: `تحويل الراتب إلى عملات`,
         text8: `تحويل الراتب`,
         text9: `راتب الوكيل`,
+        text10: `قيد المراجعة`,
+        text11: `تم الإصدار`,
+        text12: `مرفوض`,
     },
     success: {
         text1: `التسوية ناجحة`,
@@ -259,5 +279,38 @@ langAr = {
         text14: `حساب التسوية`,
         text15: `الوقت`,
         text16: `طلب`
+    },
+    payonner: {
+        text1: `Payonner`,
+        text2: `تأكيد`,
+        text3: `إلغاء الربط`,
+        text4: `البلد`,
+        text5: `موافق`,
+        text6: `نوع العملة:`,
+        text7: `البلد`,
+        text8: `رقم حساب المستلم`,
+        text9: `اسم المستلم`,
+        text10: `لا يمكن ترك الحقول الإلزامية فارغة`,
+    },
+    bank: {
+        text1: `تأكيد`,
+        text2: `إلغاء الربط`,
+        text3: `البلد`,
+        text4: `موافق`,
+        text5: `البلد`,
+        text6: `رقم حساب المستلم`,
+        text7: `اسم البنك`,
+        text8: `رمز SWIFT`,
+        text9: `اسم المستلم`,
+        text10: `العنوان`,
+    },
+    pTitle: {
+        p1: `البلد`,
+        p2: `رقم حساب المستلم`,
+        p3: `اسم البنك (أدخل الإنجليزية فقط)`,
+        p4: `رمز SWIFT (أدخل الإنجليزية فقط)`,
+        p5: `اسم المستلم (أدخل الإنجليزية فقط)`,
+        p6: `العنوان (أدخل الإنجليزية فقط)`,
+        p7: `حساب المستلم (صيغة البريد الإلكتروني)`,  
     }
 }

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

@@ -222,12 +222,29 @@ langEn = {
         text17: `Can be exchanged for <b>0</b> gold coin`,
         text18: `(Exchange at a ratio of 1:<b>7000</b>)`,
         text19: `Exchange coins`,
-        text20: `Official withdraw`,
-        text21: `Settlement available on the 1st and 16th of each month`,
+        text20: `Withdraw`,
+        text21: `The withdrawal channel opens on the 1st and 2nd of every month.`,
         text22: `Agent settlement`,
         text23: `Recharge agent settlement`,
         text24: `Please enter the amount to be redeemed`,
         text25: `Coins`,
+        textnew1: `Withdrawal account`,
+        textnew2: `Unbound`,
+        textnew3: `Select Account`,
+        textnew4: `Withdrawal`,
+        textnew5: `Withdrawal amount `,
+        textnew6: `Handling Fee rate`,
+        textnew7: `Handling Fee`,
+        textnew8: `USD to EGP exchange rate: 1:`,
+        textnew9: `Estimated amount`,
+        textnew10: `Note: Estimated arrival amount may be affected by bank exchange rate, etc.`,
+        textnew11: `Withdraw`,
+        textnew12: `Cancel`,
+        textnew13: `Please select a withdrawal account`,
+        textnew14: `More than the maximum transferable amount.`,
+        textnew15: `Success`,
+        textnew16: `The processing time for withdrawal requests is from the 3rd to the 10th of every month.`,
+        textnew17: `OK`,
     },
     bill: {
         text1: `Bill`,
@@ -239,6 +256,10 @@ langEn = {
         text7: `Salary exchange for coins`,
         text8: `Salary transfer`,
         text9: `Agent salary`,
+        text10: `In Review  `,
+        text11: `Issued`,
+        text12: `Rejected`,
+        text13: ``,
     },
     success: {
         text1: `Settlement successful`,
@@ -258,4 +279,37 @@ langEn = {
         text15: `Time`,
         text16: `Order`,
     },
+    payonner: {
+        text1: `Payonner `,
+        text2: `Confirm`,
+        text3: `Unbind `,
+        text4: `Country`,
+        text5: `OK`,
+        text6: `Currency Type:`,
+        text7: `Country`,
+        text8: `payeeAccountNo`,
+        text9: `payeeName`,
+        text10: `Mandatory fields cannot be blank`,
+    },
+    bank: {
+        text1: `Confirm`,
+        text2: `Unbind `,
+        text3: `Country`,
+        text4: `OK`,
+        text5: `Country`,
+        text6: `payeeAccountNo`,
+        text7: `Bank Name`,
+        text8: `SWIFT Code`,
+        text9: `payeeName`,
+        text10: `Address`,
+    },
+    pTitle: {
+        p1: `Country`,
+        p2: `payeeAccountNo`,
+        p3: `Bank Name(Only Enter English)`,
+        p4: `SWIFT Code(Only Enter English)`,
+        p5: `payeeName(Only Enter English)`,
+        p6: `Address(Only Enter English)`,
+        p7: `payeeAccount(E-mail fomat)`,
+    }
 }

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

@@ -226,11 +226,28 @@ langZh = {
         text18: `(兌換比例為 1:<b>7000</b>)`,
         text19: `兌換硬幣`,
         text20: `官方提現`,
-        text21: `每月的 1 日和 16 日可結算`,
+        text21: `提款通道每月1日和2日開放。`,
         text22: `代理結算`,
         text23: `充值代理結算`,
         text24: `請輸入要贖回的金額`,
-        text25: `金幣`
+        text25: `金幣`,
+        textnew1: `提款賬戶`,
+        textnew2: `未綁定`,
+        textnew3: `選擇賬戶`,
+        textnew4: `提款`,
+        textnew5: `提款金額`,
+        textnew6: `手續費率`,
+        textnew7: `手續費`,
+        textnew8: `美元兌埃及鎊匯率：1：`,
+        textnew9: `預估金額`,
+        textnew10: `注意：預估到賬金額可能會受銀行匯率等影響。`,
+        textnew11: `提款`,
+        textnew12: `取消`,
+        textnew13: `請選擇提款賬戶`,
+        textnew14: `超過最大可轉賬金額。`,
+        textnew15: `成功`,
+        textnew16: `提款申請的處理時間為每月3日至10日。`,
+        textnew17: `確定`,
     },
     bill: {
         text1: `賬單`,
@@ -242,6 +259,9 @@ langZh = {
         text7: `薪資兌換為硬幣`,
         text8: `薪資轉賬`,
         text9: `代理薪資`,
+        text10: `審核中`,
+        text11: `已發放`,
+        text12: `已拒絕`,
     },
     success: {
         text1: `結算成功`,
@@ -261,4 +281,37 @@ langZh = {
         text15: `時間`,
         text16: `訂單`
     },
+    payonner: {
+        text1: `Payonner`,
+        text2: `確認`,
+        text3: `解绑`,
+        text4: `國家`,
+        text5: `確定`,
+        text6: `貨幣類型：`,
+        text7: `國家`,
+        text8: `收款人賬號`,
+        text9: `收款人姓名`,
+        text10: `必填字段不能為空`,
+    },
+    bank: {
+        text1: `確認`,
+        text2: `解绑`,
+        text3: `國家`,
+        text4: `確定`,
+        text5: `國家`,
+        text6: `收款人賬號`,
+        text7: `銀行名稱`,
+        text8: `SWIFT 代碼`,
+        text9: `收款人姓名`,
+        text10: `地址`,
+    },
+    pTitle: {
+        p1: `國家`,
+        p2: `收款人賬號`,
+        p3: `銀行名稱(僅輸入英文)`,
+        p4: `SWIFT 代碼(僅輸入英文)`,
+        p5: `收款人姓名(僅輸入英文)`,
+        p6: `地址(僅輸入英文)`,
+        p7: `收款人賬號（電子郵件格式）`,  
+    }
 }

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

@@ -70,6 +70,12 @@
       </div>
     </li> -->
   </ul>
+  <!-- 绑定账户 -->
+  <div class="withdrawalAccount">
+    <div class="left"><b>*</b><span class="textnew1"></span></div>
+    <!-- textnew2 -->
+    <div class="right"><b class=""> </b><img src="./images/right.png" alt=""></div>
+  </div>
   <!-- 转增金额 -->
   <div class="transfer_dollars_tit">
     <div class="title text7"></div>
@@ -157,6 +163,58 @@
     </div>
   </div>
 
+  <!-- 选择账户弹窗 -->
+  <div class="selectAccount">
+    <div class="selectAccount_in">
+      <div class="title textnew3"></div>
+      <div class="accountBox">
+        <!-- <div class="account">
+          <img src="./images/not.png" alt="" class="sel">
+          <b>Vodafone</b><span>(Unbound)</span>
+          <img src="./images/eidIcon.png" alt="" class="eid">
+        </div> -->
+      </div>
+    </div>
+  </div>
+
+  <!-- 确认提现账户弹窗 -->
+  <div class="pubWithdrawal">
+    <div class="pubWithdrawal_in">
+      <div class="title textnew4"></div>
+      <div class="boxw box1">
+        <div class="left textnew5"></div>
+        <div class="right">0USD</div>
+      </div>
+      <div class="boxw box2">
+        <div class="left textnew6"></div>
+        <div class="right">6%</div>
+      </div>
+      <div class="boxw box3">
+        <div class="left">
+          <b class="textnew7"></b>
+          <p><strong class="textnew8"></strong><span>50</span></p>
+        </div>
+        <div class="right">0USD</div>
+      </div>
+      <div class="boxw box4">
+        <div class="left textnew9"></div>
+        <div class="right">0USD</div>
+      </div>
+      <div class="text textnew10"></div>
+      <div class="ok textnew11"></div>
+      <div class="close textnew12 "></div>
+    </div>
+  </div>
+
+  <!-- 提现账户成功弹窗 -->
+  <div class="success">
+    <div class="success_in">
+      <div class="title textnew15">Success</div>
+      <p class="textnew16">The processing time for withdrawal requests is from the 3rd to the 10th of every month.</p>
+      <div class="but textnew17">OK</div>
+    </div>
+  </div>
+
   <script src="../../common/js/jquery-3.2.1.min.js"></script>
   <script src="../../common/js/flexible.js"></script>
   <script src="../../common/js/vconsole.min.js"></script>

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

@@ -4,7 +4,7 @@ body {
   height: 17.78667rem;
   background: #F5F7F9;
   box-sizing: border-box;
-  padding: 1.73333rem 0rem 0 0;
+  padding: 2.13333rem 0rem 0 0;
 }
 
 .back {

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

@@ -8,7 +8,7 @@ body {
     height: px2rem(1334);
     background: #F5F7F9;
     box-sizing: border-box;
-    padding: px2rem(130) px2rem(0) 0 0;
+    padding: px2rem(160) px2rem(0) 0 0;
 }
 
 .back {

view/molistar/modules/guildAr/css/incomeStatistics.css

@@ -0,0 +1,338 @@
+body {
+  width: 100%;
+  height: 17.78667rem;
+  background: #fff;
+  padding-top: 2.56rem;
+}
+
+.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;
+  top: 1.33333rem;
+  left: 0.42667rem;
+  z-index: 2;
+}
+
+.back b {
+  width: 100%;
+  text-align: center;
+  position: absolute;
+  left: 0;
+  top: 1.33333rem;
+  height: 0.58667rem;
+  line-height: 0.58667rem;
+  color: #313131;
+  font-size: 0.42667rem;
+  font-weight: 500;
+}
+
+.income {
+  width: 9.14667rem;
+  height: 3.01333rem;
+  background: #F2F3F7;
+  border-radius: 0.21333rem;
+  margin: 0 auto 0.37333rem;
+  box-sizing: border-box;
+  padding: 0.32rem 0.32rem;
+}
+
+.income .time {
+  width: 100%;
+  height: 0.48rem;
+  margin-bottom: 0.24rem;
+}
+
+.income .time b {
+  display: inline-block;
+  color: #04D5C6;
+  font-size: 0.34667rem;
+  font-weight: 500;
+  vertical-align: middle;
+}
+
+.income .time img {
+  display: inline-block;
+  width: 0.48rem;
+  height: 0.48rem;
+  margin: 0 0.10667rem;
+  vertical-align: middle;
+}
+
+.income h3 {
+  width: 100%;
+  height: 0.53333rem;
+  line-height: 0.53333rem;
+  color: #313131;
+  font-size: 0.37333rem;
+  font-weight: 600;
+  margin-bottom: 0.29333rem;
+}
+
+.income .gold {
+  width: 100%;
+  height: 0.74667rem;
+  line-height: 0.74667rem;
+}
+
+.income .gold img {
+  display: inline-block;
+  width: 0.74667rem;
+  height: 0.74667rem;
+  vertical-align: middle;
+}
+
+.income .gold b {
+  display: inline-block;
+  vertical-align: middle;
+  color: #313131;
+  font-size: 0.64rem;
+  font-weight: 600;
+  margin: 0 0.10667rem;
+}
+
+.tab {
+  width: 9.14667rem;
+  height: 0.58667rem;
+  line-height: 0.58667rem;
+  margin: 0 auto 0.26667rem;
+}
+
+.tab div {
+  margin-right: 0.82667rem;
+  float: left;
+  color: #313131;
+  font-size: 0.42667rem;
+  font-weight: 600;
+}
+
+.tab .act {
+  color: #04D5C6;
+}
+
+.titleInfo {
+  width: 9.14667rem;
+  height: 1.01333rem;
+  line-height: 1.01333rem;
+  color: #313131;
+  font-size: 0.37333rem;
+  font-weight: 500;
+  display: flex;
+  justify-content: space-between;
+  margin: 0 auto 0;
+  background: #E4F6F1;
+  padding: 0 0.69333rem;
+  box-sizing: border-box;
+}
+
+.titleInfo div {
+  text-align: center;
+  width: 33%;
+}
+
+.titleInfoAct {
+  padding: 0;
+}
+
+.userInfo {
+  width: 9.14667rem;
+  margin: 0 auto 1.6rem;
+  display: none;
+}
+
+.userInfo li {
+  width: 100%;
+  height: 1.6rem;
+  overflow: hidden;
+  box-sizing: border-box;
+  padding: 0 0.61333rem 0 0.32rem;
+}
+
+.userInfo li .tx {
+  width: 1.09333rem;
+  height: 1.09333rem;
+  position: relative;
+  margin-top: 0.24rem;
+  float: left;
+  margin-right: 0.10667rem;
+}
+
+.userInfo li .tx img {
+  width: 100%;
+  height: 100%;
+  display: block;
+  border-radius: 50%;
+}
+
+.userInfo li .tx span {
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 0.77333rem;
+  min-width: 0.61333rem;
+  height: 0.37333rem;
+  line-height: 0.37333rem;
+  text-align: center;
+  color: #fff;
+  font-size: 0.26667rem;
+  font-weight: 500;
+  background: #04D5C6;
+  border-radius: 0.37333rem;
+}
+
+.userInfo li .user {
+  float: left;
+  width: 1.86667rem;
+  height: 1.09333rem;
+  margin-top: 0.24rem;
+  margin-right: 0.24rem;
+}
+
+.userInfo li .user p {
+  color: #313131;
+  font-size: 0.37333rem;
+  font-weight: 600;
+  margin-top: 0.12rem;
+  margin-bottom: 0.2rem;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.userInfo li .user b {
+  color: #7B7B7D;
+  font-size: 0.34667rem;
+  font-weight: 400;
+}
+
+.userInfo li .incomes {
+  width: 2.42667rem;
+  height: 100%;
+  text-align: center;
+  color: #313131;
+  font-size: 0.34667rem;
+  font-weight: 400;
+  margin-top: 0.66667rem;
+  float: left;
+}
+
+.userInfo li .duration {
+  width: 1.73333rem;
+  text-align: center;
+  height: 100%;
+  color: #313131;
+  font-size: 0.34667rem;
+  font-weight: 400;
+  margin-top: 0.66667rem;
+  float: right;
+}
+
+.userInfo .act {
+  background: #F2F3F7;
+}
+
+.dayDate {
+  width: 9.14667rem;
+  height: 1.01333rem;
+  line-height: 1.01333rem;
+  margin: 0 auto 0;
+}
+
+.dayDate li {
+  color: #313131;
+  font-size: 0.37333rem;
+  font-weight: 500;
+  display: flex;
+  justify-content: space-between;
+  padding: 0 0.69333rem;
+  box-sizing: border-box;
+}
+
+.dayDate li div {
+  text-align: center;
+  width: 33%;
+}
+
+.dayDate .act {
+  background: #F2F3F7;
+}
+
+.cycle {
+  position: fixed;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  z-index: 999;
+  background: rgba(0, 0, 0, 0.5);
+  display: none;
+}
+
+.cycle .cycle_in {
+  width: 100%;
+  height: 7.01333rem;
+  left: 0;
+  bottom: 0;
+  border-radius: 0.42667rem 0.42667rem 0 0;
+  background: #fff;
+  position: absolute;
+}
+
+.cycle .cycle_in ul {
+  width: 100%;
+  text-align: center;
+  margin-top: 0.53333rem;
+  height: 5.5rem;
+  overflow-y: scroll;
+}
+
+.cycle .cycle_in ul::-webkit-scrollbar {
+  display: none;
+}
+
+.cycle .cycle_in ul li {
+  height: 0.8rem;
+  line-height: 0.8rem;
+  color: #7B7B7D;
+  font-weight: 400;
+  font-size: 0.37333rem;
+}
+
+.cycle .cycle_in ul .act {
+  background: #F4F4F4;
+  color: #313131;
+}
+
+.arabic .userInfo li .tx {
+  float: right;
+  margin-right: 0;
+  margin-left: 0.10667rem;
+}
+
+.arabic .userInfo li .user {
+  float: right;
+  margin-right: 0;
+  margin-left: 0.24rem;
+}
+
+.arabic .userInfo li .incomes {
+  float: right;
+}
+
+.arabic .userInfo li .duration {
+  float: left;
+}

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

@@ -0,0 +1,347 @@
+@function px2rem($px) {
+    @return $px / 75+rem;
+}
+
+body {
+    width: 100%;
+    height: px2rem(1334);
+    background: #fff;
+    padding-top: px2rem(192);
+}
+
+.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;
+        top: px2rem(100);
+        left: px2rem(32);
+        z-index: 2;
+    }
+
+    b {
+        width: 100%;
+        text-align: center;
+        position: absolute;
+        left: 0;
+        top: px2rem(100);
+        height: px2rem(44);
+        line-height: px2rem(44);
+        color: #313131;
+        font-size: px2rem(32);
+        font-weight: 500;
+    }
+}
+
+.income {
+    width: px2rem(686);
+    height: px2rem(226);
+    background: #F2F3F7;
+    border-radius: px2rem(16);
+    margin: 0 auto px2rem(28);
+    box-sizing: border-box;
+    padding: px2rem(24) px2rem(24);
+
+    .time {
+        width: 100%;
+        height: px2rem(36);
+        margin-bottom: px2rem(18);
+
+        b {
+            display: inline-block;
+            color: #04D5C6;
+            font-size: px2rem(26);
+            font-weight: 500;
+            vertical-align: middle;
+        }
+
+        img {
+            display: inline-block;
+            width: px2rem(36);
+            height: px2rem(36);
+            margin: 0 px2rem(8);
+            vertical-align: middle;
+        }
+    }
+
+    h3 {
+        width: 100%;
+        height: px2rem(40);
+        line-height: px2rem(40);
+        color: #313131;
+        font-size: px2rem(28);
+        font-weight: 600;
+        margin-bottom: px2rem(22);
+    }
+
+    .gold {
+        width: 100%;
+        height: px2rem(56);
+        line-height: px2rem(56);
+
+        img {
+            display: inline-block;
+            width: px2rem(56);
+            height: px2rem(56);
+            vertical-align: middle;
+        }
+
+        b {
+            display: inline-block;
+            vertical-align: middle;
+            color: #313131;
+            font-size: px2rem(48);
+            font-weight: 600;
+            margin: 0 px2rem(8);
+        }
+    }
+}
+
+.tab {
+    width: px2rem(686);
+    height: px2rem(44);
+    line-height: px2rem(44);
+    margin: 0 auto px2rem(20);
+
+    div {
+        margin-right: px2rem(62);
+        float: left;
+        color: #313131;
+        font-size: px2rem(32);
+        font-weight: 600;
+    }
+
+    .act {
+        color: #04D5C6;
+    }
+}
+
+.titleInfo {
+    width: px2rem(686);
+    height: px2rem(76);
+    line-height: px2rem(76);
+    color: #313131;
+    font-size: px2rem(28);
+    font-weight: 500;
+    display: flex;
+    justify-content: space-between;
+    margin: 0 auto 0;
+    background: #E4F6F1;
+    padding: 0 px2rem(52);
+    box-sizing: border-box;
+
+    div {
+        text-align: center;
+        width: 33%;
+    }
+}
+.titleInfoAct{
+    padding: 0;
+}
+
+.userInfo {
+    width: px2rem(686);
+    margin: 0 auto px2rem(120);
+    display: none;
+
+    li {
+        width: 100%;
+        height: px2rem(120);
+        overflow: hidden;
+        box-sizing: border-box;
+        padding: 0 px2rem(46) 0 px2rem(24);
+
+        .tx {
+            width: px2rem(82);
+            height: px2rem(82);
+            position: relative;
+            margin-top: px2rem(18);
+            float: left;
+            margin-right: px2rem(8);
+
+            img {
+                width: 100%;
+                height: 100%;
+                display: block;
+                border-radius: 50%;
+            }
+
+            span {
+                position: absolute;
+                left: 50%;
+                transform: translateX(-50%);
+                top: px2rem(58);
+                min-width: px2rem(46);
+                height: px2rem(28);
+                line-height: px2rem(28);
+                text-align: center;
+                color: #fff;
+                font-size: px2rem(20);
+                font-weight: 500;
+                background: #04D5C6;
+                border-radius: px2rem(28);
+            }
+        }
+
+        .user {
+            float: left;
+            width: px2rem(140);
+            height: px2rem(82);
+            margin-top: px2rem(18);
+            margin-right: px2rem(18);
+
+            p {
+                color: #313131;
+                font-size: px2rem(28);
+                font-weight: 600;
+                margin-top: px2rem(9);
+                margin-bottom: px2rem(15);
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+
+            }
+
+            b {
+                color: #7B7B7D;
+                font-size: px2rem(26);
+                font-weight: 400;
+            }
+        }
+
+        .incomes {
+            width: px2rem(182);
+            height: 100%;
+            text-align: center;
+            color: #313131;
+            font-size: px2rem(26);
+            font-weight: 400;
+            margin-top: px2rem(50);
+            float: left;
+        }
+
+        .duration {
+            width: px2rem(130);
+            text-align: center;
+            height: 100%;
+            color: #313131;
+            font-size: px2rem(26);
+            font-weight: 400;
+            margin-top: px2rem(50);
+            float: right;
+        }
+    }
+
+    .act {
+        background: #F2F3F7;
+    }
+}
+
+.dayDate {
+    width: px2rem(686);
+    height: px2rem(76);
+    line-height: px2rem(76);
+    margin: 0 auto 0;
+    // display: none;
+
+    li {
+        color: #313131;
+        font-size: px2rem(28);
+        font-weight: 500;
+        display: flex;
+        justify-content: space-between;
+        padding: 0 px2rem(52);
+        box-sizing: border-box;
+
+        div {
+            text-align: center;
+            width: 33%;
+        }
+    }
+
+    .act {
+        background: #F2F3F7;
+    }
+}
+
+.cycle {
+    position: fixed;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    z-index: 999;
+    background: rgba(0, 0, 0, .5);
+    display: none;
+
+    .cycle_in {
+        width: 100%;
+        height: px2rem(526);
+        left: 0;
+        bottom: 0;
+        border-radius: px2rem(32) px2rem(32) 0 0;
+        background: #fff;
+        position: absolute;
+
+        ul {
+            width: 100%;
+            text-align: center;
+            margin-top: px2rem(40);
+            height: 5.5rem;
+            overflow-y: scroll;
+
+            &::-webkit-scrollbar {
+                display: none;
+            }
+
+            li {
+                height: px2rem(60);
+                line-height: px2rem(60);
+                color: #7B7B7D;
+                font-weight: 400;
+                font-size: px2rem(28);
+            }
+
+            .act {
+                background: #F4F4F4;
+                color: #313131;
+            }
+        }
+    }
+}
+
+.arabic {
+    .userInfo li {
+        .tx {
+            float: right;
+            margin-right: 0;
+            margin-left: 0.10667rem;
+        }
+
+        .user {
+            float: right;
+            margin-right: 0;
+            margin-left: 0.24rem;
+        }
+
+        .incomes {
+            float: right;
+        }
+
+        .duration {
+            float: left;
+        }
+    }
+}

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

@@ -1,8 +1,7 @@
 html,
 body {
   width: 100%;
-  height: 17.78667rem;
-  background: #e4e4e7;
+  background: #fff;
 }
 
 .back {
@@ -11,7 +10,7 @@ body {
   line-height: 0.58667rem;
   position: fixed;
   left: 0;
-  top: 0.93333rem;
+  top: 1.46667rem;
   text-align: center;
   color: #FFFFFF;
   font-size: 0.50667rem;
@@ -37,21 +36,21 @@ body {
 
 .header {
   width: 10rem;
-  height: 8.98667rem;
+  height: 5.86667rem;
   background: url(../images/header.png) no-repeat;
-  background-size: 100% 100%;
+  background-size: cover;
   position: relative;
   margin: 0 auto 0rem;
 }
 
 .header .tx {
-  width: 2.64rem;
-  height: 2.53333rem;
+  width: 2.05333rem;
+  height: 2.05333rem;
   position: absolute;
-  left: 50%;
-  transform: translateX(-50%);
-  top: 1.85333rem;
+  left: 0.45333rem;
+  top: 2.88rem;
   border-radius: 50%;
+  border: 0.02667rem solid #FFE8A9;
 }
 
 .header .ts {
@@ -62,36 +61,33 @@ body {
   left: 50%;
   transform: translateX(-50%);
   z-index: 2;
+  display: none;
 }
 
 .header .nick {
-  width: 80%;
+  width: 55%;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
-  text-align: center;
   color: #fff;
   font-size: 0.53333rem;
   font-weight: bold;
   position: absolute;
-  left: 50%;
-  transform: translateX(-50%);
-  top: 4.85333rem;
+  top: 3.22667rem;
+  left: 2.93333rem;
 }
 
 .header .id {
-  width: 80%;
+  width: 55%;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
-  text-align: center;
   color: #fff;
   font-size: 0.34667rem;
   font-weight: 500;
   position: absolute;
-  left: 50%;
-  transform: translateX(-50%);
-  top: 5.64rem;
+  top: 4.10667rem;
+  left: 2.93333rem;
 }
 
 .header .guildNick {
@@ -106,50 +102,197 @@ body {
   display: none;
 }
 
-.header .headerBox {
-  width: 8.86667rem;
-  display: flex;
-  justify-content: center;
-  flex-wrap: wrap;
-  position: absolute;
-  top: 6.37333rem;
-  left: 50%;
-  transform: translateX(-50%);
-}
-
-.header .headerBox div {
-  width: 3.62667rem;
-  height: 0.74667rem;
-  line-height: 0.74667rem;
-  color: #fff;
-  font-size: 0.34667rem;
+.header .inveMember {
+  min-width: 1.57333rem;
+  height: 0.72rem;
+  border-radius: 0.72rem;
+  line-height: 0.72rem;
   text-align: center;
-  background: linear-gradient(90deg, rgba(128, 146, 255, 0.8) 0%, rgba(108, 208, 255, 0.8) 100%);
-  border-radius: 0.18667rem;
-  margin-bottom: 0.33333rem;
+  background: linear-gradient(90deg, #7CDD9B, #62D0A8);
+  color: #fff;
+  font-size: 0.37333rem;
+  position: absolute;
+  top: 3.54667rem;
+  right: 0.42667rem;
+  z-index: 5;
+  padding: 0 0.13333rem;
+}
+
+.header .inveMember img {
+  display: inline-block;
+  width: 0.50667rem;
+  height: 0.56rem;
+  vertical-align: middle;
+  margin-top: -0.1rem;
+  display: none;
+}
+
+.header .inveMember span {
+  display: block;
+}
+
+.headerBox {
+  width: 10rem;
+  border-radius: 0.26667rem;
+  margin: -0.4rem auto 0rem;
+  position: relative;
+  background: #fff;
   overflow: hidden;
-  white-space: nowrap;
-  margin: 0 auto 0.33333rem;
 }
 
-.header .headerBox div img {
-  width: 0.42667rem;
-  height: 0.42667rem;
-  margin-right: 0.17333rem;
-  float: left;
-  margin-top: 0.16rem;
-  margin-left: 0.38667rem;
+.headerBox .headerBox_in {
+  width: 9.14667rem;
+  max-height: 3.06667rem;
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  margin: 0.32rem auto 0;
 }
 
-.header .headerBox div span {
+.headerBox .headerBox_in div {
+  width: 4.45333rem;
+  height: 1.38667rem;
+  line-height: 1.38667rem;
+  margin-bottom: 0.24rem;
+  background: #F2F3F7;
+  border-radius: 0.32rem;
+  text-align: left;
+  box-sizing: border-box;
+  padding: 0 0.13333rem;
+}
+
+.headerBox .headerBox_in div img {
+  display: inline-block;
+  width: 0.69333rem;
+  height: 0.69333rem;
+  vertical-align: middle;
+}
+
+.headerBox .headerBox_in div span {
+  display: inline-block;
+  color: #313131;
+  font-size: 0.4rem;
+  vertical-align: middle;
+}
+
+.headerBox .headerBox_in .incomeStatistics {
+  background: #E3F2FF;
+}
+
+.headerBox .headerBox_in .E3F2FF {
+  background: #E3F2FF;
+}
+
+.headerBox .headerBox_in .FFEFE5 {
+  background: #FFEFE5;
+}
+
+.agencylevel {
+  width: 10rem;
+  height: 3.62667rem;
+  margin: 0.34667rem auto 0;
+  display: none;
+}
+
+.agencylevel .top {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 0 0.33333rem;
+  height: 0.66667rem;
+  line-height: 0.66667rem;
+  margin-top: 0.41333rem;
+  position: relative;
+}
+
+.agencylevel .top span {
   float: left;
+  width: 0.10667rem;
+  height: 0.45333rem;
+  background: #04D5C6;
+  border-radius: 9.22667rem;
+  margin: 0.10667rem 0.13333rem 0;
+  display: block;
+}
+
+.agencylevel .top b {
+  float: left;
+  font-size: 0.48rem;
+  color: #313131;
+  font-weight: bold;
+  display: block;
+  margin-right: 0.09333rem;
+}
+
+.agencylevel .top i {
+  display: block;
+  font-size: 0.48rem;
+  color: #313131;
+  float: left;
+  font-style: normal;
+}
+
+.agencylevel .agencylevelInfo {
+  width: 9.14667rem;
+  height: 2.69333rem;
+  background: #EBFFF6;
+  border-radius: 0.21333rem;
+  margin: 0.26667rem auto 0;
+  box-sizing: border-box;
+  padding: 0.24rem;
+}
+
+.agencylevel .agencylevelInfo h3 {
+  width: 100%;
+  display: block;
+  color: #313131;
+  font-size: 0.34667rem;
+  margin-bottom: 0.26667rem;
+  font-weight: 600;
+}
+
+.agencylevel .agencylevelInfo h3 b {
+  color: #313131;
+  font-size: 0.34667rem;
+}
+
+.agencylevel .agencylevelInfo h4 {
+  color: #7B7B7D;
+  font-weight: 400;
+  margin-bottom: 0.26667rem;
+}
+
+.agencylevel .agencylevelInfo .line {
+  width: 8.66667rem;
+  height: 0.13333rem;
+  position: relative;
+  background: #B2E8D0;
+  border-radius: 0.13333rem;
+  overflow: hidden;
+  margin-bottom: 0.26667rem;
+}
+
+.agencylevel .agencylevelInfo .line .line_in {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 10%;
+  background: #04D5C6;
+  height: 100%;
+}
+
+.agencylevel .agencylevelInfo .bottom {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  color: #7B7B7D;
+  font-size: 0.32rem;
+  font-weight: 400;
 }
 
 .guildList {
-  width: 9.25333rem;
-  height: 11rem;
+  width: 10rem;
   border-radius: 0.26667rem;
-  margin: -0.3rem auto 0rem;
+  margin: 0rem auto 0;
   position: relative;
   background: #fff;
   overflow: hidden;
@@ -159,16 +302,26 @@ body {
   width: 100%;
   box-sizing: border-box;
   padding: 0 0.33333rem;
-  height: 0.4rem;
-  line-height: 0.4rem;
+  height: 0.66667rem;
+  line-height: 0.66667rem;
   margin-top: 0.41333rem;
   position: relative;
 }
 
+.guildList .top span {
+  float: left;
+  width: 0.10667rem;
+  height: 0.45333rem;
+  background: #04D5C6;
+  border-radius: 9.22667rem;
+  margin: 0.10667rem 0.13333rem 0;
+  display: block;
+}
+
 .guildList .top b {
   float: left;
-  font-size: 0.32rem;
-  color: #333;
+  font-size: 0.48rem;
+  color: #313131;
   font-weight: bold;
   display: block;
   margin-right: 0.09333rem;
@@ -176,8 +329,8 @@ body {
 
 .guildList .top i {
   display: block;
-  color: #666;
-  font-size: 0.29333rem;
+  font-size: 0.48rem;
+  color: #313131;
   float: left;
   font-style: normal;
 }
@@ -188,7 +341,7 @@ body {
   width: 0.42667rem;
   height: 0.42667rem;
   position: absolute;
-  left: 3.68rem;
+  left: 6.45rem;
   top: 51%;
   transform: translateY(-50%);
   z-index: 2;
@@ -199,17 +352,14 @@ body {
   border: none;
   outline: none;
   background: #F5F7F9;
-  width: 5.4rem;
+  width: 3.46667rem;
   height: 0.66667rem;
   border-radius: 0.66667rem;
   box-sizing: border-box;
   padding-left: 0.72rem;
-  position: absolute;
-  left: 3.49333rem;
-  top: 50%;
-  transform: translateY(-50%);
   color: #333;
   display: none;
+  float: right;
 }
 
 .guildList .top input::placeholder {
@@ -219,8 +369,8 @@ body {
 
 .guildList ul {
   width: 100%;
-  height: 11rem;
-  margin: 0.52rem auto 0;
+  height: 10.7rem;
+  margin: 0.25333rem auto 0;
   overflow-y: scroll;
 }
 
@@ -229,24 +379,27 @@ body {
 }
 
 .guildList ul li {
-  width: 100%;
-  height: 1.33333rem;
+  width: 9.14667rem;
+  height: 1.94667rem;
   box-sizing: border-box;
   overflow: hidden;
-  margin-bottom: 0.44rem;
+  margin: 0 auto 0.44rem;
   position: relative;
   box-sizing: border-box;
   padding-left: 0.13333rem;
+  background: #F2F3F7;
+  border-radius: 0.32rem;
 }
 
 .guildList ul li .tx {
-  width: 1.06667rem;
-  height: 1.06667rem;
-  border-radius: 1.06667rem;
+  width: 1.46667rem;
+  height: 1.46667rem;
+  border-radius: 50%;
   float: left;
   margin-right: 0.14667rem;
   margin-left: 0.13333rem;
   display: block;
+  margin-top: 0.24rem;
 }
 
 .guildList ul li .user {
@@ -260,13 +413,13 @@ body {
   font-weight: bold;
   display: inline-block;
   margin-right: 0.10667rem;
-  margin-bottom: 0.18667rem;
-  width: 2.7rem;
+  margin-bottom: 0.06667rem;
+  max-width: 2.7rem;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
   box-sizing: border-box;
-  padding-top: 0.10667rem;
+  padding-top: 0.6rem;
 }
 
 .guildList ul li .user b {
@@ -279,7 +432,7 @@ body {
   width: 0.24rem;
   height: 0.24rem;
   display: inline-block;
-  margin-top: 0.16rem;
+  margin-top: 0.6rem;
   margin-right: 0.10667rem;
 }
 
@@ -288,16 +441,17 @@ body {
   display: inline-block;
   width: 0.96rem;
   height: 0.48rem;
+  margin-top: 0.49333rem;
 }
 
 .guildList ul li .but {
   width: 1.17333rem;
   height: 0.56rem;
-  background: #62D0A8;
+  background: #CDCED6;
   border-radius: 0.56rem;
   position: absolute;
   right: 0.34667rem;
-  top: 0.09333rem;
+  top: 0.69rem;
   text-align: center;
   color: #fff;
   line-height: 0.56rem;
@@ -306,33 +460,33 @@ body {
 }
 
 .guildList ul li .chairman {
-  width: 1.04rem;
-  height: 0.34667rem;
-  line-height: 0.34667rem;
-  border-radius: 0.34667rem;
+  width: 1.2rem;
+  height: 0.45333rem;
+  line-height: 0.45333rem;
+  border-radius: 0.45333rem;
   text-align: center;
-  color: #333;
+  color: #fff;
   font-size: 0.29333rem;
   font-weight: 400;
   position: absolute;
-  left: 0.26667rem;
-  top: 0.94667rem;
-  background: linear-gradient(90deg, #FFEB67, #FFFCE7);
+  left: 0.37333rem;
+  top: 1.30667rem;
+  background: #04D5C6;
   display: none;
 }
 
 .guildList ul li .administrator {
-  width: 1.04rem;
-  height: 0.34667rem;
-  line-height: 0.34667rem;
-  border-radius: 0.34667rem;
+  width: 1.2rem;
+  height: 0.45333rem;
+  line-height: 0.45333rem;
+  border-radius: 0.45333rem;
   text-align: center;
-  color: #333;
+  color: #fff;
   font-size: 0.29333rem;
   font-weight: 400;
   position: absolute;
-  left: 0.26667rem;
-  top: 0.94667rem;
+  left: 0.37333rem;
+  top: 1.30667rem;
   background: linear-gradient(-90deg, #FBE1FF, #F090FF);
   display: none;
 }
@@ -394,33 +548,25 @@ body {
   color: #fff;
 }
 
-.inveMember {
-  width: 4.08rem;
-  height: 1.28rem;
-  border-radius: 1.28rem;
-  line-height: 1.22667rem;
-  text-align: center;
-  background: linear-gradient(90deg, #7CDD9B, #62D0A8);
-  color: #fff;
-  font-size: 0.45333rem;
-  position: fixed;
-  left: 50%;
-  transform: translateX(-50%);
-  z-index: 5;
-  bottom: 1.06667rem;
+.arabic .back img {
+  left: auto;
+  right: 0.24rem;
+  transform: rotate(180deg);
 }
 
-.inveMember img {
-  display: inline-block;
-  width: 0.50667rem;
-  height: 0.56rem;
-  vertical-align: middle;
-  margin-top: -0.1rem;
+.arabic .header .tx {
+  left: auto;
+  right: 0.45333rem;
 }
 
-.inveMember span {
-  display: inline-block;
-  vertical-align: middle;
+.arabic .header .nick {
+  left: auto;
+  right: 2.93333rem;
+}
+
+.arabic .header .id {
+  left: auto;
+  right: 2.93333rem;
 }
 
 .arabic .guildList .top img {
@@ -438,7 +584,7 @@ body {
 
 .arabic .guildList ul li .chairman,
 .arabic .guildList ul li .administrator {
-  right: 0.1rem;
+  right: 0.37333rem;
   left: auto;
 }
 
@@ -459,6 +605,10 @@ body {
   float: right;
 }
 
+.arabic .headerBox .headerBox_in div span {
+  font-size: 0.33333rem;
+}
+
 .english .header .headerBox {
   width: 8rem;
 }
@@ -471,6 +621,15 @@ body {
   font-size: 0.21333rem;
 }
 
+.arabic .header .inveMember {
+  right: auto;
+  left: 0.42667rem;
+}
+
+.arabic .headerBox .headerBox_in div {
+  text-align: right;
+}
+
 .arabic .header .headerBox {
   width: 8rem;
 }
@@ -482,3 +641,32 @@ body {
 .arabic .header .headerBox div span {
   font-size: 0.29333rem;
 }
+
+.arabic .guildList .top b {
+  float: right;
+}
+
+.arabic .guildList .top i {
+  float: right;
+}
+
+.arabic .guildList .top input {
+  float: left;
+}
+
+.arabic .guildList .top img {
+  right: 6.3rem;
+  left: auto;
+  transform: rotate(100deg);
+  top: 0.1rem;
+}
+
+.arabic .guildList .top span {
+  float: right;
+  display: block;
+}
+
+.arabic .agencylevel .agencylevelInfo .line .line_in {
+  left: auto;
+  right: 0;
+}

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

@@ -5,8 +5,8 @@
 html,
 body {
     width: 100%;
-    height: px2rem(1334);
-    background: #e4e4e7;
+    // height: px2rem(1334);
+    background: #fff;
 }
 
 .back {
@@ -15,7 +15,7 @@ body {
     line-height: px2rem(44);
     position: fixed;
     left: 0;
-    top: px2rem(70);
+    top: px2rem(110);
     text-align: center;
     color: #FFFFFF;
     font-size: px2rem(38);
@@ -42,20 +42,20 @@ body {
 
 .header {
     width: px2rem(750);
-    height: px2rem(674);
+    height: px2rem(440);
     background: url(../images/header.png) no-repeat;
-    background-size: 100% 100%;
+    background-size: cover;
     position: relative;
     margin: 0 auto px2rem(0);
 
     .tx {
-        width: px2rem(198);
-        height: px2rem(190);
+        width: px2rem(154);
+        height: px2rem(154);
         position: absolute;
-        left: 50%;
-        transform: translateX(-50%);
-        top: px2rem(139);
+        left: px2rem(34);
+        top: px2rem(216);
         border-radius: 50%;
+        border: px2rem(2) solid #FFE8A9;
     }
 
     .ts {
@@ -66,117 +66,35 @@ body {
         left: 50%;
         transform: translateX(-50%);
         z-index: 2;
+        display: none;
     }
 
     .nick {
-        width: 80%;
+        width: 55%;
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;
-        text-align: center;
         color: #fff;
         font-size: px2rem(40);
         font-weight: bold;
         position: absolute;
-        left: 50%;
-        transform: translateX(-50%);
-        top: px2rem(364);
+        top: px2rem(242);
+        left: px2rem(220);
     }
 
     .id {
-        width: 80%;
+        width: 55%;
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;
-        text-align: center;
         color: #fff;
         font-size: px2rem(26);
         font-weight: 500;
         position: absolute;
-        left: 50%;
-        transform: translateX(-50%);
-        top: px2rem(423);
+        top: px2rem(308);
+        left: px2rem(220);
     }
 
-    // .adminSet {
-    //     padding: px2rem(0) px2rem(16);
-    //     box-sizing: border-box;
-    //     height: px2rem(44);
-    //     line-height: px2rem(44);
-    //     color: #fff;
-    //     font-size: px2rem(32);
-    //     font-weight: 400;
-    //     background: linear-gradient(90deg, rgba(82, 59, 85, 0.98), rgba(21, 5, 16, 0.98));
-    //     border-radius: px2rem(44) 0px 0px px2rem(44);
-    //     position: absolute;
-    //     right: 0;
-    //     top: px2rem(184);
-    //     display: none;
-    // }
-
-    // .guildInfoSet {
-    //     padding: px2rem(0) px2rem(16);
-    //     box-sizing: border-box;
-    //     height: px2rem(44);
-    //     line-height: px2rem(44);
-    //     color: #fff;
-    //     font-size: px2rem(32);
-    //     font-weight: 400;
-    //     background: linear-gradient(90deg, rgba(82, 59, 85, 0.7), rgba(21, 5, 16, 0.7));
-    //     border-radius: px2rem(44) 0px 0px px2rem(44);
-    //     position: absolute;
-    //     right: 0;
-    //     top: px2rem(239);
-    //     display: none;
-    // }
-
-    // .memberFlow {
-    //     width: px2rem(208);
-    //     height: px2rem(56);
-    //     line-height: px2rem(56);
-    //     text-align: center;
-    //     color: #fff;
-    //     font-size: px2rem(32);
-    //     font-weight: 400;
-    //     background: linear-gradient(90deg, rgba(128, 146, 255, .6) 0%, rgba(108, 208, 255, .6) 100%);
-    //     border-radius: px2rem(14);
-    //     position: absolute;
-    //     left: px2rem(156);
-    //     top: px2rem(466);
-    //     display: none;
-    // }
-
-    // .memberFlowMy {
-    //     width: px2rem(208);
-    //     height: px2rem(56);
-    //     line-height: px2rem(56);
-    //     text-align: center;
-    //     color: #fff;
-    //     font-size: px2rem(32);
-    //     font-weight: 400;
-    //     background: linear-gradient(90deg, rgba(128, 146, 255, .6) 0%, rgba(108, 208, 255, .6) 100%);
-    //     border-radius: px2rem(14) 0 0 px2rem(14);
-    //     position: absolute;
-    //     right: px2rem(0);
-    //     top: px2rem(218);
-    //     display: none;
-    // }
-
-    // .inveMember {
-    //     width: px2rem(208);
-    //     height: px2rem(56);
-    //     line-height: px2rem(56);
-    //     text-align: center;
-    //     color: #fff;
-    //     font-size: px2rem(32);
-    //     font-weight: 400;
-    //     background: linear-gradient(90deg, rgba(128, 146, 255, .6) 0%, rgba(108, 208, 255, .6) 100%);
-    //     border-radius: px2rem(14);
-    //     position: absolute;
-    //     right: px2rem(156);
-    //     top: px2rem(466);
-    //     display: none;
-    // }
 
     .guildNick {
         width: 100%;
@@ -190,52 +108,200 @@ body {
         display: none;
     }
 
-    .headerBox {
-        width: px2rem(665);
-        display: flex;
-        justify-content: center;
-        flex-wrap: wrap;
+    .inveMember {
+        min-width: px2rem(118);
+        height: px2rem(54);
+        border-radius: px2rem(54);
+        line-height: px2rem(54) ;
+        text-align: center;
+        background: linear-gradient(90deg, #7CDD9B, #62D0A8);
+        color: #fff;
+        font-size: px2rem(28);
         position: absolute;
-        top: px2rem(478);
-        // left: px2rem(93);
-        left: 50%;
-        transform: translateX(-50%);
+        top: px2rem(266);
+        right: px2rem(32);
+        z-index: 5;
+        padding: 0 px2rem(10);
+
+        img {
+            display: inline-block;
+            width: px2rem(38);
+            height: px2rem(42);
+            vertical-align: middle;
+            margin-top: -0.1rem;
+            display: none;
+        }
+
+        span {
+            display: block;
+        }
+    }
+}
+
+.headerBox {
+    width: px2rem(750);
+    border-radius: px2rem(20);
+    margin: px2rem(-30) auto px2rem(0);
+    position: relative;
+    background: #fff;
+    overflow: hidden;
+
+    .headerBox_in {
+        width: px2rem(686);
+        max-height: px2rem(230);
+        display: flex;
+        justify-content: space-between;
+        flex-wrap: wrap;
+        margin: px2rem(24) auto 0;
 
         div {
-            width: px2rem(272);
-            height: px2rem(56);
-            line-height: px2rem(56);
-            color: #fff;
-            font-size: px2rem(26);
-            text-align: center;
-            background: linear-gradient(90deg, rgba(128, 146, 255, .8) 0%, rgba(108, 208, 255, .8) 100%);
-            border-radius: px2rem(14);
-            margin-bottom: px2rem(25);
-            overflow: hidden;
-            white-space: nowrap;
-            margin: 0 auto px2rem(25);
+            width: px2rem(334);
+            height: px2rem(104);
+            line-height: px2rem(104);
+            margin-bottom: px2rem(18);
+            background: #F2F3F7;
+            border-radius: px2rem(24);
+            text-align: left;
+            box-sizing: border-box;
+            padding: 0 px2rem(10);
 
             img {
-                width: px2rem(32);
-                height: px2rem(32);
-                margin-right: px2rem(13);
-                float: left;
-                margin-top: px2rem(12);
-                margin-left: px2rem(29);
+                display: inline-block;
+                width: px2rem(52);
+                height: px2rem(52);
+                // margin-top: px2rem(30);
+                vertical-align: middle;
             }
 
             span {
-                float: left;
+                display: inline-block;
+                color: #313131;
+                font-size: px2rem(30);
+                vertical-align: middle;
             }
         }
+        .incomeStatistics{
+            background: #E3F2FF;
+        }
+
+        .E3F2FF {
+            background: #E3F2FF;
+        }
+
+        .FFEFE5 {
+            background: #FFEFE5;
+        }
+    }
+}
+
+.agencylevel {
+    width: px2rem(750);
+    height: px2rem(272);
+    margin: px2rem(26) auto 0;
+    display: none;
+
+    .top {
+        width: 100%;
+        box-sizing: border-box;
+        padding: 0 px2rem(25);
+        height: px2rem(50);
+        line-height: px2rem(50);
+        margin-top: px2rem(31);
+        position: relative;
+
+        span {
+            float: left;
+            width: px2rem(8);
+            height: px2rem(34);
+            background: #04D5C6;
+            border-radius: px2rem(692);
+            margin: px2rem(8) px2rem(10) 0;
+            display: block;
+        }
+
+        b {
+            float: left;
+            font-size: px2rem(36);
+            color: #313131;
+            font-weight: bold;
+            display: block;
+            margin-right: px2rem(7);
+        }
+
+        i {
+            display: block;
+            font-size: px2rem(36);
+            color: #313131;
+            float: left;
+            font-style: normal;
+        }
+    }
+
+    .agencylevelInfo {
+        width: px2rem(686);
+        height: px2rem(202);
+        background: #EBFFF6;
+        border-radius: px2rem(16);
+        margin: px2rem(20) auto 0;
+        box-sizing: border-box;
+        padding: px2rem(18);
+
+        h3 {
+            width: 100%;
+            display: block;
+            color: #313131;
+            font-size: px2rem(26);
+            margin-bottom: px2rem(20);
+            font-weight: 600;
+
+            b {
+                color: #313131;
+                font-size: px2rem(26);
+            }
+        }
+
+        h4 {
+            color: #7B7B7D;
+            font-weight: 400;
+            margin-bottom: px2rem(20);
+        }
+
+        .line {
+            width: px2rem(650);
+            height: px2rem(10);
+            position: relative;
+            background: #B2E8D0;
+            border-radius: px2rem(10);
+            overflow: hidden;
+            margin-bottom: px2rem(20);
+
+            .line_in {
+                position: absolute;
+                top: 0;
+                left: 0;
+                width: 10%;
+                background: #04D5C6;
+                height: 100%;
+            }
+        }
+
+        .bottom {
+            width: 100%;
+            display: flex;
+            justify-content: space-between;
+            color: #7B7B7D;
+            font-size: px2rem(24);
+            font-weight: 400;
+        }
     }
 }
 
 .guildList {
-    width: px2rem(694);
-    height: 11rem;
+    width: px2rem(750);
+    // height: 11rem;
+    // height: 6.7rem;
     border-radius: px2rem(20);
-    margin: -0.3rem auto px2rem(0);
+    margin: px2rem(0) auto 0;
     position: relative;
     background: #fff;
     overflow: hidden;
@@ -244,16 +310,26 @@ body {
         width: 100%;
         box-sizing: border-box;
         padding: 0 px2rem(25);
-        height: px2rem(30);
-        line-height: px2rem(30);
+        height: px2rem(50);
+        line-height: px2rem(50);
         margin-top: px2rem(31);
         position: relative;
+
         // margin-left: px2rem(-13);
+        span {
+            float: left;
+            width: px2rem(8);
+            height: px2rem(34);
+            background: #04D5C6;
+            border-radius: px2rem(692);
+            margin: px2rem(8) px2rem(10) 0;
+            display: block;
+        }
 
         b {
             float: left;
-            font-size: px2rem(24);
-            color: #333;
+            font-size: px2rem(36);
+            color: #313131;
             font-weight: bold;
             display: block;
             margin-right: px2rem(7);
@@ -261,8 +337,8 @@ body {
 
         i {
             display: block;
-            color: #666;
-            font-size: px2rem(22);
+            font-size: px2rem(36);
+            color: #313131;
             float: left;
             font-style: normal;
         }
@@ -273,7 +349,7 @@ body {
             width: px2rem(32);
             height: px2rem(32);
             position: absolute;
-            left: 3.68rem;
+            left: 6.45rem;
             top: 51%;
             transform: translateY(-50%);
             z-index: 2;
@@ -284,17 +360,18 @@ body {
             border: none;
             outline: none;
             background: #F5F7F9;
-            width: 5.4rem;
+            width: px2rem(260);
             height: px2rem(50);
             border-radius: px2rem(50);
             box-sizing: border-box;
             padding-left: px2rem(54);
-            position: absolute;
-            left: 3.49333rem;
-            top: 50%;
-            transform: translateY(-50%);
+            // position: absolute;
+            // left: 3.7rem;
+            // top: 50%;
+            // transform: translateY(-50%);
             color: #333;
             display: none;
+            float: right;
 
             &::placeholder {
                 color: #BCBDCB;
@@ -305,8 +382,9 @@ body {
 
     ul {
         width: 100%;
-        height: 11rem;
-        margin: px2rem(39) auto 0;
+        height: 10.7rem;
+        // height: 6.7rem;
+        margin: px2rem(19) auto 0;
         overflow-y: scroll;
 
         &::-webkit-scrollbar {
@@ -314,23 +392,26 @@ body {
         }
 
         li {
-            width: 100%;
-            height: px2rem(100);
+            width: px2rem(686);
+            height: px2rem(146);
             box-sizing: border-box;
             overflow: hidden;
-            margin-bottom: px2rem(33);
+            margin: 0 auto px2rem(33);
             position: relative;
             box-sizing: border-box;
             padding-left: px2rem(10);
+            background: #F2F3F7;
+            border-radius: px2rem(24);
 
             .tx {
-                width: px2rem(80);
-                height: px2rem(80);
-                border-radius: px2rem(80);
+                width: px2rem(110);
+                height: px2rem(110);
+                border-radius: 50%;
                 float: left;
                 margin-right: px2rem(11);
                 margin-left: px2rem(10);
                 display: block;
+                margin-top: px2rem(18)
             }
 
             .user {
@@ -343,13 +424,13 @@ body {
                     font-weight: bold;
                     display: inline-block;
                     margin-right: px2rem(8);
-                    margin-bottom: px2rem(14);
-                    width: 2.7rem;
+                    margin-bottom: px2rem(5);
+                    max-width: 2.7rem;
                     overflow: hidden;
                     white-space: nowrap;
                     text-overflow: ellipsis;
                     box-sizing: border-box;
-                    padding-top: px2rem(8);
+                    padding-top: px2rem(45);
                 }
 
                 b {
@@ -362,7 +443,7 @@ body {
                     width: px2rem(18);
                     height: px2rem(18);
                     display: inline-block;
-                    margin-top: px2rem(12);
+                    margin-top: px2rem(45);
                     margin-right: px2rem(8);
                 }
 
@@ -371,17 +452,18 @@ body {
                     display: inline-block;
                     width: px2rem(72);
                     height: px2rem(36);
+                    margin-top: px2rem(37);
                 }
             }
 
             .but {
                 width: px2rem(88);
                 height: px2rem(42);
-                background: #62D0A8;
+                background: #CDCED6;
                 border-radius: px2rem(42);
                 position: absolute;
                 right: px2rem(26);
-                top: px2rem(7);
+                top: 0.69rem;
                 text-align: center;
                 color: #fff;
                 line-height: px2rem(42);
@@ -390,33 +472,33 @@ body {
             }
 
             .chairman {
-                width: px2rem(78);
-                height: px2rem(26);
-                line-height: px2rem(26);
-                border-radius: px2rem(26);
+                width: px2rem(90);
+                height: px2rem(34);
+                line-height: px2rem(34);
+                border-radius: px2rem(34);
                 text-align: center;
-                color: #333;
+                color: #fff;
                 font-size: px2rem(22);
                 font-weight: 400;
                 position: absolute;
-                left: px2rem(20);
-                top: px2rem(71);
-                background: linear-gradient(90deg, #FFEB67, #FFFCE7);
+                left: px2rem(28);
+                top: px2rem(98);
+                background: #04D5C6;
                 display: none;
             }
 
             .administrator {
-                width: px2rem(78);
-                height: px2rem(26);
-                line-height: px2rem(26);
-                border-radius: px2rem(26);
+                width: px2rem(90);
+                height: px2rem(34);
+                line-height: px2rem(34);
+                border-radius: px2rem(34);
                 text-align: center;
-                color: #333;
+                color: #fff;
                 font-size: px2rem(22);
                 font-weight: 400;
                 position: absolute;
-                left: px2rem(20);
-                top: px2rem(71);
+                left: px2rem(28);
+                top: px2rem(98);
                 background: linear-gradient(-90deg, #FBE1FF, #F090FF);
                 display: none;
             }
@@ -481,36 +563,29 @@ body {
     }
 }
 
-.inveMember {
-    width: px2rem(306);
-    height: px2rem(96);
-    border-radius: px2rem(96);
-    line-height: px2rem(92);
-    text-align: center;
-    background: linear-gradient(90deg, #7CDD9B, #62D0A8);
-    color: #fff;
-    font-size: px2rem(34);
-    position: fixed;
-    left: 50%;
-    transform: translateX(-50%);
-    z-index: 5;
-    bottom: px2rem(80);
-
-    img {
-        display: inline-block;
-        width: px2rem(38);
-        height: px2rem(42);
-        vertical-align: middle;
-        margin-top: -0.1rem;
-    }
-
-    span {
-        display: inline-block;
-        vertical-align: middle;
-    }
-}
 
 .arabic {
+    .back img {
+        left: auto;
+        right: 0.24rem;
+        transform: rotate(180deg);
+    }
+
+    .header .tx {
+        left: auto;
+        right: 0.45333rem;
+    }
+
+    .header .nick {
+        left: auto;
+        right: 2.93333rem;
+    }
+
+    .header .id {
+        left: auto;
+        right: 2.93333rem;
+    }
+
     .guildList .top img {
         right: px2rem(30);
     }
@@ -526,7 +601,7 @@ body {
 
     .guildList ul li .chairman,
     .guildList ul li .administrator {
-        right: 0.1rem;
+        right: px2rem(28);
         left: auto;
     }
 
@@ -547,6 +622,10 @@ body {
         float: right;
     }
 
+    .headerBox .headerBox_in div span {
+        font-size: px2rem(25);
+    }
+
 }
 
 .english {
@@ -561,9 +640,22 @@ body {
             }
         }
     }
+
+    .headerBox .headerBox_in .guildInfoSet span,
+    .headerBox .headerBox_in .adminSet span {
+        // font-size: px2rem(20);
+    }
 }
 
 .arabic {
+    .header .inveMember {
+        right: auto;
+        left: px2rem(32);
+    }
+    .headerBox .headerBox_in div{
+        text-align: right;
+    }
+
     .header .headerBox {
         width: 8rem;
 
@@ -575,4 +667,33 @@ body {
             }
         }
     }
+
+    .guildList .top b {
+        float: right;
+    }
+
+    .guildList .top i {
+        float: right;
+    }
+
+    .guildList .top input {
+        float: left;
+    }
+
+    .guildList .top img {
+        right: 6.3rem;
+        left: auto;
+        transform: rotate(100deg);
+        top: 0.1rem;
+    }
+
+    .guildList .top span {
+        float: right;
+        display: block;
+    }
+
+    .agencylevel .agencylevelInfo .line .line_in {
+        left: auto;
+        right: 0;
+    }
 }

view/molistar/modules/guildAr/incomeStatistics.html

@@ -0,0 +1,86 @@
+<!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/incomeStatistics.css?v1.0">
+</head>
+
+<body>
+    <!-- 頂部返回 -->
+    <div class="back">
+        <img src="./images/travel/backB.png" alt="">
+        <b class="text1"></b>
+    </div>
+    <!-- 我的收益 -->
+    <div class="income">
+        <div class="time">
+            <b></b> <img src="./images/xia.png" alt="">
+        </div>
+        <h3 class="text2"></h3>
+        <div class="gold">
+            <img src="./images/goldBig.png" alt="">
+            <b>0</b>
+        </div>
+    </div>
+    <!-- tab切换 -->
+    <div class="tab">
+        <div class="act text3"></div>
+        <div class="Member text4"></div>
+    </div>
+    <!-- 信息标题 -->
+    <div class="titleInfo">
+        <div class="text5"></div>
+        <div class="text6"></div>
+        <div class="text7"></div>
+    </div>
+    <!-- 成员数据 -->
+    <ul class="userInfo">
+        <li>
+            <div class="tx">
+                <img src="./images/logo.png" alt="">
+                <span></span>
+            </div>
+            <div class="user">
+                <p>名字</p>
+                <b>ID:0</b>
+            </div>
+            <div class="incomes">0</div>
+            <div class="duration">0h0m0s</div>
+        </li>
+    </ul>
+    <!-- 每日数据 -->
+    <ul class="dayDate">
+        <li>
+            <div>08.00</div>
+            <div>0</div>
+            <div>0h00m00s</div>
+        </li>
+    </ul>
+    <!-- 选择周期 -->
+    <div class="cycle">
+        <div class="cycle_in">
+            <ul>
+                <li class="act">2024.08.01-2024.08.17</li>
+                <li>2024.08.01-2024.08.18</li>
+            </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="./js/incomeStatistics.js?v=1.1"></script>
+<script src="../../common/local/langHandler.js"></script>

view/molistar/modules/guildAr/index.html

@@ -23,6 +23,11 @@
         <!-- 工会长昵称 -->
         <div class="nick"></div>
         <div class="id"></div>
+        <!-- 邀请成员 -->
+        <div class="inveMember">
+            <img src="./images/inveMemberIcon.png" alt="">
+            <span class="text6">邀请成员</span>
+        </div>
         <!-- 工会昵称 -->
         <!-- 公会:公会昵称 -->
         <!-- <div class="guildNick"></div> -->
@@ -38,7 +43,7 @@
         <!-- 邀请成员 -->
         <!-- <div class="inveMember text6"></div> -->
 
-        <div class="headerBox">
+        <!-- <div class="headerBox">
             <div class="memberFlow">
                 <img src="./images/icon1.png" alt="">
                 <span class="texts1"></span>
@@ -59,11 +64,47 @@
                 <img src="./images/icon2.png" alt="">
                 <span class="texts5"></span>
             </div>
+        </div> -->
+    </div>
+    <!-- 信息入口 -->
+    <div class="headerBox">
+        <div class="headerBox_in">
+            <div class="incomeStatistics" style="width: 100%;">
+                <img src="./images/icon33.png" alt="">
+                <span class="newText1"></span>
+            </div>
+            <div class="guildInfoSet">
+                <img src="./images/icon11.png" alt="">
+                <span class="newText2"></span>
+            </div>
+            <div class="adminSet">
+                <img src="./images/icon22.png" alt="">
+                <span class="newText3"></span>
+            </div>
+        </div>
+    </div>
+    <!-- Agency level -->
+    <div class="agencylevel">
+        <div class="top">
+            <span></span>
+            <b class="newtext5"></b>
+        </div>
+        <div class="agencylevelInfo">
+            <h3><strong class="newtext6"></strong> <b></b></h3>
+            <h4><strong class="newtext7"></strong> <b></b></h4>
+            <div class="line">
+                <div class="line_in"></div>
+            </div>
+            <div class="bottom">
+                <div></div>
+                <div></div>
+            </div>
         </div>
     </div>
     <!-- 公会成员列表 -->
     <div class="guildList">
         <div class="top">
+            <span></span>
             <b class="text8"></b><i>(0)</i>
             <img src="./images/fdj.png" alt="">
             <input class="text16" type="number" placeholder="">
@@ -95,11 +136,6 @@
             </div>
         </div>
     </div>
-    <!-- 邀请成员 -->
-    <div class="inveMember">
-        <img src="./images/inveMemberIcon.png" alt="">
-        <span class="text6">邀请成员</span>
-    </div>
 </body>
 
 </html>

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

@@ -44,7 +44,7 @@ $(function () {
         };
         // 頂部返回事件
         $('.back .backs').click(() => {
-            window.location.href = document.referrer;
+            window.history.back();
         })
         fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言
         langReplace = window.lang.replace;

view/molistar/modules/guildAr/js/incomeStatistics.js

@@ -0,0 +1,181 @@
+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 roleTypes = getQueryString().roleTypes;
+var index = 1;
+var totalGoldIncome = [];
+// 初始化函數
+$(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();
+        income();
+    }, 100)
+})
+function translateFun() {
+    var langReplace = window.lang.replace;
+    var localLang = window.lang;
+    $('.text1').text(langReplace(localLang.incomeStatistics.text1));
+    // $('.text2').text(langReplace(localLang.incomeStatistics.text2));
+    $('.text3').text(langReplace(localLang.incomeStatistics.text3));
+    $('.text4').text(langReplace(localLang.incomeStatistics.text4));
+    $('.text5').text(langReplace(localLang.incomeStatistics.text5));
+    $('.text6').text(langReplace(localLang.incomeStatistics.text6));
+    $('.text7').text(langReplace(localLang.incomeStatistics.text7));
+    $('.text8').text(langReplace(localLang.incomeStatistics.text8));
+    $('.text9').text(langReplace(localLang.incomeStatistics.text9));
+    if (roleTypes != 1) {
+        $('.Member').hide();
+    } else {
+        // $('.income h3').text(langReplace(localLang.incomeStatistics.text22));
+    }
+    $('.income h3').text(langReplace(localLang.incomeStatistics.text222));
+}
+//接口
+function income(startDate, endDate) {
+    $('ul li').remove();
+    networkRequest({
+        type: 'get',
+        url: urlPrefix + '/family/income',
+        data: { startDate, endDate },
+        success(res) {
+            if (res.code === 200) {
+                // 处理当前周期渲染
+                $('.income .time b').text(`${res.data.curCycleDate.startDate}-${res.data.curCycleDate.endDate}`);
+                // 渲染日收益统计
+                var dailyIncomeListStr = '';
+                res.data.dailyIncome.dailyIncomeList.forEach((res, i) => {
+                    dailyIncomeListStr += `
+                            <li class="${(i + 1) % 2 === 0 ? 'act' : ''}">
+                                <div>${res.date}</div>
+                                <div>${res.goldIncome}</div>
+                                <div>${res.micRemainTime}</div>
+                            </li>
+                    `
+                })
+                $('.dayDate').append(dailyIncomeListStr);
+                // 渲染成员收益统计
+                var memberIncomeStr = '';
+                if (res.data.memberIncome) {
+                    totalGoldIncome[1] = res.data.memberIncome.totalGoldIncome;
+                    res.data.memberIncome.memberIncomeList.forEach((res, i) => {
+                        memberIncomeStr += `
+                            <li class="${(i + 1) % 2 === 0 ? 'act' : ''}">
+                                <div class="tx">
+                                    <img src="${res.member.avatar}" alt="">
+                                    <span style="display:${pubInfo.uid == res.member.uid ? 'block' : 'none'}">${langReplace(localLang.incomeStatistics.text8)}</span>
+                                </div>
+                                <div class="user">
+                                    <p>${res.member.nick}</p>
+                                    <b>ID:${res.member.erbanNo}</b>
+                                </div>
+                                <div class="incomes">${res.goldIncome}</div>
+                                <div class="duration">${res.micRemainTime}</div>
+                            </li>
+                    `
+                    })
+                    $('.userInfo').append(memberIncomeStr);
+                }
+                // 渲染周期
+                var str = '';
+                res.data.cycleDateList.forEach((val, i) => {
+                    str += `
+                        <li startDate="${val.startDate}" endDate="${val.endDate}" class="${`${startDate}-${endDate}` == `${val.startDate}-${val.endDate}` ? 'act' : ''}">${val.intervalFormatter}</li>
+                    `
+                })
+                $('.cycle .cycle_in ul').append(str);
+                // 首次处理
+                $('.titleInfo div').eq(0).text(index == 1 ? langReplace(localLang.incomeStatistics.text5) : langReplace(localLang.incomeStatistics.text9));
+                totalGoldIncome[0] = res.data.dailyIncome.totalGoldIncome;
+                $('.income .gold b').text(totalGoldIncome[index - 1]);
+            } else {
+                toastMsg(res.message)
+            }
+            hideLoading(layerIndex)
+        },
+        error(err) {
+            hideLoading(layerIndex)
+            toastMsg(langReplace(localLang.demoModule.layerIndex3))
+        }
+    })
+
+}
+// tab切换
+$('.tab div').click(function () {
+    index = $(this).index() + 1;
+    $(this).addClass('act').siblings().removeClass('act');
+    $('.dayDate,.userInfo').hide();
+    $('.income .gold b').text(totalGoldIncome[index - 1]);
+    if (index == 1) {
+        $('.titleInfo').removeClass('titleInfoAct');
+        $('.titleInfo div').eq(0).text(langReplace(localLang.incomeStatistics.text5));
+        $('.dayDate').show();
+        $('.income h3').text(langReplace(localLang.incomeStatistics.text222));
+    } else {
+        $('.titleInfo').addClass('titleInfoAct');
+        $('.titleInfo div').eq(0).text(langReplace(localLang.incomeStatistics.text9));
+        $('.userInfo').show();
+        $('.income h3').text(langReplace(localLang.incomeStatistics.text22));
+    }
+})
+// 打开周期选择
+$('.income .time').click(function () {
+    $('.cycle').show();
+})
+// 选择周期按钮
+$('.cycle .cycle_in ul').on('click', ' li', function () {
+    var text = $(this).text();
+    var startDate = $(this).attr('startDate');
+    var endDate = $(this).attr('endDate');
+    // $(this).addClass('act').siblings().removeClass('act');
+    $('.cycle').hide();
+    $('.income .time b').text(text);
+    income(startDate, endDate);
+})
+// 关闭
+$('.cycle').click(function () {
+    $('.cycle').hide();
+})

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

@@ -83,6 +83,9 @@ function translateFun() {
     $('.texts3').text(langReplace(localLang.demoModule.texts3));
     $('.texts4').text(langReplace(localLang.demoModule.texts4));
     $('.texts5').text(langReplace(localLang.demoModule.texts5));
+    $('.newText1').text(langReplace(localLang.demoModule.newText1));
+    $('.newText2').text(langReplace(localLang.demoModule.newText2));
+    $('.newText3').text(langReplace(localLang.demoModule.newText3));
 }
 // 判断公会身份函数
 function guildFun(type) {
@@ -90,22 +93,22 @@ function guildFun(type) {
     if (type == 1) {
         $('.guildList .top img').show()
         $('.guildList .top input').show()
-        $('.header .headerBox .myWages').hide()
+        $('.headerBox .myWages').hide()
     }
     // 管理员
     else if (type == 2) {
-        $('.header .headerBox .guildInfoSet').hide();
-        $('.header .headerBox .adminSet').hide();
+        $('.headerBox .guildInfoSet').hide();
+        $('.headerBox .adminSet').hide();
         $('.guildList .top input').show()
         $('.memberFlow2').hide()
     }
     // 普通成员
     else if (type == 3) {
-        $('.header .headerBox .guildInfoSet').hide();
-        $('.header .headerBox .adminSet').hide();
-        $('.header .headerBox .memberFlow').hide();
-        $('.header .memberFlowMy').show()
-        $('.header .guildNick').show()
+        $('.headerBox .guildInfoSet').hide();
+        $('.headerBox .adminSet').hide();
+        $('.headerBox .memberFlow').hide();
+        $('.memberFlowMy').show()
+        $('.guildNick').show()
         $('.guildList .top input').show()
         $('.memberFlow2').hide();
 
@@ -126,8 +129,7 @@ function get() {
                 roleTypes = res.data.roleType;
                 guildFun(roleTypes);
                 if (res.data.wageEnable == false) {
-                    $('.memberFlow2').hide()
-                    $('.header .headerBox .myWages').hide()
+                    // $('.memberFlow2').hide();
                 }
                 $('.text2').text(res.data.name)
                 // 渲染基本信息
@@ -282,11 +284,11 @@ $('.pub .pub_in .butBox .close').click(function () {
     $('.pub').hide();
 })
 // 管理员设置
-$('.header .adminSet').click(function () {
+$('.adminSet').click(function () {
     window.location.href = `./adminSet2.html?roleTypes=${roleTypes}`
 })
 // 公会信息设置
-$('.header .guildInfoSet').click(function () {
+$('.guildInfoSet').click(function () {
     window.location.href = `./guildInfoSet.html?guildNick=${guildNick}&backgroundUrl=${backgroundUrl}&payoneer=${payoneer}&usdt=${usdt}&payPal=${payPal}`
 })
 // 金币收入统计
@@ -294,7 +296,7 @@ $('.header .memberFlow').click(function (params) {
     window.location.href = `./memberFlow.html`
 })
 // 工资收入统计
-$('.header .memberFlow2').click(function (params) {
+$('.memberFlow2').click(function (params) {
     window.location.href = `./memberFlow2.html`
 })
 // 邀请成员
@@ -304,4 +306,8 @@ $('.inveMember').click(function (params) {
 // 我的工资
 $(`.myWages`).click(function (params) {
     window.location.href = `./memberFlow222.html?familyMemberId=${familyMemberId}`
+})
+// 硬币收入统计
+$(`.incomeStatistics`).click(function (params) {
+    window.location.href = `./incomeStatistics.html?roleTypes=${roleTypes}`
 })

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

@@ -26,6 +26,9 @@ langAr = {
         texts3: "إعدادات معلومات الوكالة",
         texts4: "إعدادات مشرف الوكالة",
         texts5: "راتبي",
+        newText1: `إحصائيات دخل العملة`,
+        newText2: `الوكالة`,
+        newText3: `المسؤول`,
     },
     adminSet: {
         text1: `إعدادات المشرف`,
@@ -115,7 +118,7 @@ langAr = {
         text15: `تفاصيل`,
         text16: `تفاصيل`,
         text17: `الشهر الحالي `,
-        textss:`إجمالي راتب العملات الذهبية:`
+        textss: `إجمالي راتب العملات الذهبية:`
     },
     memberFlow22: {
         text1: `الراتب الشهري للأعضاء `,
@@ -163,5 +166,18 @@ langAr = {
         ok: 'تأكيد',
         close: 'إلغاء',
         departed: 'غادر',
+    },
+    incomeStatistics: {
+        text1: `إحصائيات الدخل`,
+        text2: `إجمالي دخل العملات`,
+        text22: `دخل الوكالة`,
+        text222: `الدخل الشخصي`,
+        text3: `البيانات الشخصية`,
+        text4: `بيانات الأعضاء`,
+        text5: `التاريخ`,
+        text6: `دخل العملات`,
+        text7: `المدة`,
+        text8: `أنا`,
+        text9: `عضو`,
     }
 }

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

@@ -18,12 +18,15 @@ langEn = {
         text13: `Admin`,
         text14: `Delete`,
         text15: `Are you sure you want to remove this person?`,
-        text16: `Enter MoliStar ID to Search`,
+        text16: `MoliStar ID`,
         texts1: "Coin Income Statistics",
         texts2: "Salary Income Statistics",
         texts3: "Agency Settings",
         texts4: "Administrator Settings",
         texts5: "My Salary",
+        newText1: `Coin Income Statistics`,
+        newText2: `Agency`,
+        newText3: `Administrator`,
     },
     adminSet: {
         text1: `Administrator`,
@@ -113,7 +116,7 @@ langEn = {
         text15: `View`,
         text16: `Details`,
         text17: `Current`,
-        textss:'Total Coin Salary：'
+        textss: 'Total Coin Salary：'
     },
     memberFlow22: {
         text1: `Member Salary`,
@@ -161,5 +164,18 @@ langEn = {
         ok: 'Confirm',
         close: 'Cancel',
         departed: 'Departed',
+    },
+    incomeStatistics:{
+        text1:`Income Statistics`,
+        text2:`Total Coins Income`,
+        text22:`Agnecy Income`,
+        text222:`Personal Income`,
+        text3:`Personal Data`,
+        text4:`Member Data`,
+        text5:`Date`,
+        text6:`Coins Income`,
+        text7:`Duration`,
+        text8:`Me`,
+        text9:`Member`,
     }
 }

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

@@ -26,6 +26,9 @@ langZh = {
         texts3: `公會信息設置`,
         texts4: `公會管理員設置`,
         texts5: `我的工資`,
+        newText1: `幣收入統計`,
+        newText2: `機構`,
+        newText3: `管理員`,
     },
     adminSet: {
         text1: `管理員設置`,
@@ -165,4 +168,17 @@ langZh = {
         departed: '已离开',
         placeholder: '请添加',
     },
+    incomeStatistics: {
+        text1: `收入統計`,
+        text2: `總幣收入`,
+        text22:`公會收入`,  
+        text222:`個人收入`,  
+        text3:`個人資料`,  
+        text4: `會員數據`,
+        text5: `日期`,
+        text6: `幣收入`,
+        text7: `持續時間`,
+        text8: `我`,
+        text9: `會員`,
+    }
 }

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.3bf26cf8aefc192127a20f8ba996bfe9.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.90cb57975173c57d4e84.js></script><script type=text/javascript src=./static/js/vendor.ef63a6e67767f10f7bb6.js></script><script type=text/javascript src=./static/js/app.e8e410dbf357b49f1bc2.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.e8f91c8f89231ddcc6daca50f174298c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.88b78acf469d0acf38e9.js></script><script type=text/javascript src=./static/js/vendor.ef63a6e67767f10f7bb6.js></script><script type=text/javascript src=./static/js/app.7ca308c825d5ae771d3f.js></script></body></html>

view/molistar/modules/myincome/static/js/manifest.88b78acf469d0acf38e9.js

@@ -1,2 +1,2 @@
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[d]);return u};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"9b42e162ef90c3d92a52",1:"c2ef46c6dcac24931ba4",2:"17debe0f6011a97521e8",3:"a4c2cd2893242b26adcb",4:"1c8935faedda18361064",5:"f435e0adfd15f2f66756",6:"0e7ac399b5d59483b7f2",7:"770781e704ff5805cd00",8:"4218eb5becaddd649623",9:"d02156509389fc441584",10:"8520f094936f10a3326e",11:"a5e798e367bdaa3003e9",12:"014c35f45254c9a43fa6"}[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.90cb57975173c57d4e84.js.map
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[d]);return u};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"9b42e162ef90c3d92a52",1:"c2ef46c6dcac24931ba4",2:"17debe0f6011a97521e8",3:"a4c2cd2893242b26adcb",4:"1c8935faedda18361064",5:"29aedabb66ce105db013",6:"0e7ac399b5d59483b7f2",7:"770781e704ff5805cd00",8:"4218eb5becaddd649623",9:"d02156509389fc441584",10:"8520f094936f10a3326e",11:"a5e798e367bdaa3003e9",12:"014c35f45254c9a43fa6"}[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.88b78acf469d0acf38e9.js.map

view/molistar/modules/rule/cpRule.html

@@ -0,0 +1,116 @@
+<!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="./style/cpRule.css">
+</head>
+
+<body>
+    <h2 class="text2"></h2>
+    <h3 class="text3"></h3>
+    <img src="./images/rule1.png" alt="" class="img1">
+    <img src="./images/rule2.png" alt="" class="img2">
+    <h2 class="text4"></h2>
+    <h3 class="text5"></h3>
+    <img src="./images/rule3.png" alt="" class="img3">
+    <h2 class="text6"></h2>
+    <img src="./images/rule4.png" alt="" class="img4">
+    <h2 class="text7"></h2>
+    <img src="./images/rule5.png" alt="" class="img5">
+    <h2 class="text8"></h2>
+    <img src="./images/rule6.png" alt="" class="img6">
+    <h2 class="text9"></h2>
+    <img src="./images/rule7.png" alt="" class="img7">
+    <h2 class="text10"></h2>
+    <img src="./images/rule8.png" alt="" class="img8">
+    <h2 class="text11"></h2>
+    <h3 class="text12"></h3>
+    <h2 class="text13"></h2>
+    <img src="./images/rule9.png" alt="" class="img9">
+    <h2 class="text14"></h2>
+    <img src="./images/rule10.png" alt="" class="img10">
+    <h2 class="text15"></h2>
+    <img src="./images/rule11.png" alt="" class="img11">
+    <!-- <h2 class="text16"></h2>
+    <img src="./images/rule12.png" alt="" class="img12"> -->
+    <h2 class="text17"></h2>
+    <div class="imgBox">
+        <img src="./images/simg1.png" alt="">
+        <img src="./images/simg2.png" alt="">
+    </div>
+    <!-- <h2 class="text18"></h2>
+    <div class="imgBox">
+        <img src="./images/simg3.png" alt="">
+        <img src="./images/simg4.png" alt="">
+    </div> -->
+    <h2 class="text19"></h2>
+    <div class="imgBox">
+        <img src="./images/simg3.png" alt="">
+        <img src="./images/simg4.png" alt="">
+    </div>
+    <h2 class="text20"></h2>
+    <div class="imgBox">
+        <img src="./images/simg5.png" alt="">
+        <img src="./images/simg6.png" alt="">
+    </div>
+    <h2 class="text21"></h2>
+    <h3 class="text22"></h3>
+    <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="../../common/local/langHandler.js"></script>
+<script>
+    var langReplace;
+    var localLang;
+    // 初始化函數
+    $(function () {
+        getInfoFromClient();
+        fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言
+        setTimeout(function () {
+            fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言
+            langReplace = window.lang.replace;
+            localLang = window.lang;
+            translateFun();
+        }, 100)
+    })
+    function translateFun() {
+        var langReplace = window.lang.replace;
+        var localLang = window.lang;
+        $('.text1').text(langReplace(localLang.cpRule.text1));
+        $('.text2').text(langReplace(localLang.cpRule.text2));
+        $('.text3').text(langReplace(localLang.cpRule.text3));
+        $('.text4').text(langReplace(localLang.cpRule.text4));
+        $('.text5').text(langReplace(localLang.cpRule.text5));
+        $('.text6').text(langReplace(localLang.cpRule.text6));
+        $('.text7').text(langReplace(localLang.cpRule.text7));
+        $('.text8').text(langReplace(localLang.cpRule.text8));
+        $('.text9').text(langReplace(localLang.cpRule.text9));
+        $('.text10').text(langReplace(localLang.cpRule.text10));
+        $('.text11').text(langReplace(localLang.cpRule.text11));
+        $('.text12').text(langReplace(localLang.cpRule.text12));
+        $('.text13').text(langReplace(localLang.cpRule.text13));
+        $('.text14').text(langReplace(localLang.cpRule.text14));
+        $('.text15').text(langReplace(localLang.cpRule.text15));
+        $('.text16').text(langReplace(localLang.cpRule.text16));
+        $('.text17').text(langReplace(localLang.cpRule.text17));
+        $('.text18').text(langReplace(localLang.cpRule.text18));
+        $('.text19').text(langReplace(localLang.cpRule.text19));
+        $('.text20').text(langReplace(localLang.cpRule.text20));
+        $('.text21').text(langReplace(localLang.cpRule.text21));
+        $('.text22').html(langReplace(localLang.cpRule.text22));
+    }
+</script>

view/molistar/modules/rule/sdk.html

@@ -59,8 +59,84 @@
     }
 </style>
 
-<body id="sdk_body">
-   
+<!-- <body id="sdk_body"> -->
+
+<body>
+    <p class="title">MoliStar Third-party SDK Directory</p>
+    <p>To ensure the realization ofcertain independent functions and to enable you to use and enjoy more services and
+        functions, we embed third-party SDKs in the application.We will carefully evaluate the purpose of using such
+        SDKs.</p>
+    <p>Please understand that the functions and services of thirdparty SDKs are constantly updated and developed. The
+        types of data they handle and other content may change due to functional or policy adjustments. Please refer to
+        the relevant introduction of personal information publicly disclosed by the third party.</p>
+    <figure class="wp-block-table">
+        <table border class="has-fixed-layout">
+            <tbody>
+                <tr>
+                    <th>SDK Name</th>
+                    <th>Purpose of Use</th>
+                    <th>Types of Personal Information</th>
+                    <th>Third-party Privacy Policy Link</th>
+                </tr>
+                <tr>
+                    <td>NetEase Yidun</td>
+                    <td>Implementing UGC Content Filtering Functionality</td>
+                    <td>WiFi network status, network status, operator information, change network connection status,
+                        phone status, external storage of the reader, obtain MAC address</td>
+                    <td>https://dun.163.com/clause/privacy</td>
+                </tr>
+                <tr>
+                    <td>NetEase Cloud IM SDK</td>
+                    <td>Collect and send end-user voice information</td>
+                    <td>Networkaccess, Wi-Fi access status, device information, storage card content, obtain IMEI
+                        information, obtain lMSI information, obtain MAC obtain APNS Token, operator type, obtain
+                        application information installed by the system</td>
+                    <td>https://commsease.com/en/clauses?serviceType=3</td>
+                </tr>
+                <tr>
+                    <td>Tencent Cloud Object Storage</td>
+                    <td>Upload user avatar, publish dynamic content</td>
+                    <td>Network access, read/write external storage</td>
+                    <td>https://privacy.qq.com/document/preview/e822b3b07d36440db40abf7afa48574e</td>
+                </tr>
+                <tr>
+                    <td>Agora</td>
+                    <td>Provide real-time audio and video cloud services</td>
+                    <td>Recording microphone permission, camera permission, phone status, Wi-Fi status access, network
+                        status, operator information, Bluetooth access, network access, modify audio settings,
+                        read/write external storage, keep device awake</td>
+                    <td>https://www.agora.io/cn/privacy-policy</td>
+                </tr>
+                <tr>
+                    <td>Tencent Cloud TRTC SDK</td>
+                    <td>Provide real-time audio and video cloud services</td>
+                    <td>Manufacturer of the device, device model, system version, network type, screen resolution, CPU
+                        information, IP address, network permissions, storage permissions, microphone permissions, audio
+                        permissions, Bluetooth permissions, camera permissions, phone permissions</td>
+                    <td>https://trtc.io/document/48827</td>
+                </tr>
+                <tr>
+                    <td>SudMGP</td>
+                    <td>Provide interactive gaming-related services</td>
+                    <td>Personal information types, device cache count, invocation of device speaker and vibration
+                        motor, device type, device model, CPU information, storage information, operating system
+                        information, IP address, signal strength information, network type, sender and receiver user ID,
+                        user attributes, usage duration, personal information setting name, nickname, logs</td>
+                    <td>https://console.sud.tech/privacy</td>
+                </tr>
+                <tr>
+                    <td>MobTech SDK</td>
+                    <td>Provide timely message push and notification functionality for testing a sample application of
+                        mobile cross-platform development tools</td>
+                    <td>System operation information, network access, obtaining MAC address, obtaining IMEI information,
+                        obtaining anonymous device identifiers (OAID), International Mobile Subscriber Identity (IMSI),
+                        obtaining installed applications, base station information, obtaining running process
+                        information</td>
+                    <td>https://www.mob.com/about/policy</td>
+                </tr>
+            </tbody>
+        </table>
+    </figure>
 
 </body>
 

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

@@ -0,0 +1,67 @@
+body {
+  width: 10rem;
+  height: 17.78667rem;
+  background: #F5F7F9;
+  box-sizing: border-box;
+  padding: 0.26667rem 0.42667rem 1.09333rem;
+  margin: 0 auto;
+}
+
+h2 {
+  width: 100%;
+  color: #313131;
+  font-size: 0.37333rem;
+  font-weight: 500;
+  line-height: 0.53333rem;
+}
+
+h3 {
+  width: 100%;
+  color: #7B7B7D;
+  font-size: 0.34667rem;
+  font-weight: 400;
+  margin-bottom: 0.18667rem;
+  line-height: 0.53333rem;
+}
+
+img {
+  display: block;
+  width: 9.14667rem;
+  margin-bottom: 0.18667rem;
+  margin-top: 0.18667rem;
+}
+
+.img1 {
+  height: 4.26667rem;
+}
+
+.img2 {
+  height: 5.44rem;
+}
+
+.img3 {
+  height: 3.46667rem;
+}
+
+.img9,
+.img10,
+.img11,
+.img12 {
+  margin-top: 0.18667rem;
+}
+
+.imgBox {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 0.18667rem;
+  margin-top: 0.18667rem;
+}
+
+.imgBox img {
+  width: 4.48rem;
+}
+
+.null {
+  height: 1.09333rem;
+}

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

@@ -0,0 +1,71 @@
+@function px2rem($px) {
+    @return $px / 75+rem;
+}
+
+body {
+    width: px2rem(750);
+    height: px2rem(1334);
+    background: #F5F7F9;
+    box-sizing: border-box;
+    padding: px2rem(20) px2rem(32) px2rem(82);
+    margin: 0 auto;
+}
+
+h2 {
+    width: 100%;
+    color: #313131;
+    font-size: px2rem(28);
+    font-weight: 500;
+    line-height: px2rem(40);
+}
+
+h3 {
+    width: 100%;
+    color: #7B7B7D;
+    font-size: px2rem(26);
+    font-weight: 400;
+    margin-bottom: px2rem(14);
+    line-height: px2rem(40);
+}
+
+img {
+    display: block;
+    width: px2rem(686);
+    margin-bottom: px2rem(14);
+    margin-top: px2rem(14);
+}
+
+.img1 {
+    height: px2rem(320);
+}
+
+.img2 {
+    height: px2rem(408);
+}
+
+.img3 {
+    height: px2rem(260);
+}
+
+.img9,
+.img10,
+.img11,
+.img12 {
+    margin-top: px2rem(14);
+}
+
+.imgBox {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: px2rem(14);
+    margin-top: px2rem(14);
+
+    img {
+        width: px2rem(336);
+    }
+}
+
+.null {
+    height: px2rem(82);
+}

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

@@ -1,5 +1,6 @@
 const ar = {
     diamondLog: {
+        解除CP手续费: 'بالتأكيد',
         SS公会活动奖励: 'جوائز حدث نقابة SS',
         公會usd兌換給代儲收入: 'دخل تبادل الدولار للإيداع',
         公會usd兌換金幣收入: 'دخل تبادل الدولار لعملات الذهب',

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

@@ -1,5 +1,6 @@
 const en = {
     diamondLog: {
+        解除CP手续费: 'Pay Fee',
         SS公会活动奖励: 'SS Guild Event Rewards',
         公會usd兌換給代儲收入: ' Guild USD for Deposit Income',
         公會usd兌換金幣收入: 'Guild USD for Gold Income',

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

@@ -1,5 +1,6 @@
 const zh = {
   diamondLog: {
+    解除CP手续费: '解除CP手續費',
     SS公会活动奖励: 'SS公會活動奬勵',
     公會usd兌換給代儲收入: '公會usd兌換給代儲收入',
     公會usd兌換金幣收入: '公會usd兌換金幣收入',

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

@@ -248,6 +248,9 @@
               <p v-else-if="tab === 12 && item1.objType === 117">
                 {{ $t("diamondLog.遊戲開黑支出") }}
               </p>
+              <p v-else-if="tab === 12 && item1.objType === 126">
+                {{ $t("diamondLog.解除CP手续费") }}
+              </p>
               <p v-else-if="tab === 12 && item1.objType === 90">
                 {{ $t("diamondLog.轉贈金幣給") }} {{ item1.targetNick.length > 7 ? item1.targetNick.slice(0, 7) + '...' : item1.targetNick }}
                 {{ item1.sendDiamondAmount }}{{ $t("diamondLog.金幣") }}