新增账单

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

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

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

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

view/molistar/home/index.html

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

view/molistar/home/local/ar.js

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

view/molistar/home/local/en.js

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -7,7 +7,7 @@
     <title class="text1"></title>
     <!-- 公会信息设置 -->
     <link rel="stylesheet" href="../../common/css/reset.css">
-    <link rel="stylesheet" href="./css/guildInfoSet.css?v=1.0">
+    <link rel="stylesheet" href="./css/guildInfoSet.css?v=1.1">
 </head>
 
 <body>

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

@@ -75,8 +75,9 @@
                 <span class="newtext1"></span>
             </div>
             <div style="display: none;" class="memberFlow2 FFEFE5">
-                <img src="./images/icon2.png" alt="">
-                <span class="newtext2"></span>
+                <b><img src="./images/icon2.png" alt="">
+                    <span class="newtext2"></span></b>
+                <img src="./images/why.png" alt="" class="why">
             </div>
             <div style="display: none;" class="guildInfoSet">
                 <img src="./images/icon3.png" alt="">

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

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

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

@@ -385,11 +385,16 @@ $('.guildInfoSet').click(function () {
 })
 // 我的收入
 $('.memberFlow').click(function (params) {
-    window.location.href = `./personal.html`
+    window.location.href = `./personal.html?roleTypes=${roleTypes}`
 })
 // 薪资账户
-$('.memberFlow2').click(function (params) {
+$('.memberFlow2 b').click(function (params) {
     window.location.href = `./salary_account.html`
+    return
+})
+$('.memberFlow2 .why').click(function () {
+    window.location.href = `./guide.html`
+    return
 })
 // 邀请成员
 $('.inveMember').click(function (params) {

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

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

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

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

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

@@ -336,4 +336,13 @@ langEn = {
         <p>3 Coin reward gradient</p>`,
         text3: `./images/weeklyRewardsRule2.png`,
     },
+    agencyDiamondIncome:{
+        text1:`Agency Diamond Income`,
+        text2:`Building a guild, you can search for diamond income at any time.`,
+        text3:`User exit agency may result in data changes.`,
+        text4:`To`,
+        text5:`Date selection`,
+        text6:`Confirm`,
+        text7:`Search`,
+    }
 }

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

@@ -337,4 +337,13 @@ langZh = {
         <p>3 金幣獎勵梯度</p>`,
         text3: `./images/weeklyRewardsRule2.png`,
     },
+    agencyDiamondIncome: {
+        text1: `公會鑽石收入`, // 繁體中文
+        text2: `建立公會，隨時可以查詢鑽石收入。`, // 繁體中文
+        text3: `用戶退出公會可能導致數據變更。`, // 繁體中文
+        text4: `至`, // 繁體中文
+        text5: `日期選擇`, // 繁體中文
+        text6: `確認`, // 繁體中文
+        text7:`查詢`,
+    }
 }

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

@@ -7,7 +7,7 @@
     <title class="text1">Personal</title>
     <!-- 公会首页 -->
     <link rel="stylesheet" href="../../common/css/reset.css">
-    <link rel="stylesheet" href="./css/personal.css">
+    <link rel="stylesheet" href="./css/personal.css?v=1.1">
 </head>
 
 <body>
@@ -99,6 +99,7 @@
                 </div>
             </div>
         </div>
+        <div class="agencyDiamondIncome"><span></span><b class="agencyDiamondIncometext1"></b> <img src="./images/right.png" alt=""></div>
         <div class="agentSalary2"><span></span><b class="text19"></b><i>0</i></div>
         <div class="data">
             <div class="box">
@@ -126,5 +127,5 @@
 <script src="./local/en.js"></script>
 <script src="./local/zh.js"></script>
 <script src="./local/ar.js"></script>
-<script src="./js/personal.js"></script>
+<script src="./js/personal.js?v=1.1"></script>
 <script src="../../common/local/langHandler.js"></script>

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

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

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

@@ -181,8 +181,13 @@ h3 {
         left: auto;
         right: 0.26667rem;
     }
+
     .account input {
         left: auto;
         right: 2.5rem;
     }
+
+    .background input {
+        right: 4.7rem;
+    }
 }

view/molistar/modules/guildAr/guildInfoSet.html

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

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

@@ -216,7 +216,7 @@ function setInfo(name, backgroundUrl, fun, avatar) {
     showLoading()
     networkRequest({
         type: 'post',
-        url: urlPrefix + '/guild/setInfo',
+        url: urlPrefix + '/family/setInfo',
         data: { name, backgroundUrl, avatar },
         success(res) {
             if (res.code === 200) {

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.44211d465cb0d014cc9246142d7a13a7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.64d282af95bfe3b8d31f.js></script><script type=text/javascript src=./static/js/vendor.ef63a6e67767f10f7bb6.js></script><script type=text/javascript src=./static/js/app.1f42635e687324c7f3ae.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.62416e12c59dba6b05b5dcbb0d405e1d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.f57a6b078e19ce5ab256.js></script><script type=text/javascript src=./static/js/vendor.ef63a6e67767f10f7bb6.js></script><script type=text/javascript src=./static/js/app.14ef4c10cedbdb649510.js></script></body></html>

view/molistar/modules/myincome/static/js/manifest.f57a6b078e19ce5ab256.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:"fe141e2285ec9a9a15b3",6:"0e7ac399b5d59483b7f2",7:"770781e704ff5805cd00",8:"4218eb5becaddd649623",9:"d02156509389fc441584",10:"9f5644b8d8539a302508",11:"5d316356ba01de644f13",12:"b16a14104ab77a57b8a2"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
-//# sourceMappingURL=manifest.64d282af95bfe3b8d31f.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:"9d2a68d3a61a36048a34",6:"0e7ac399b5d59483b7f2",7:"770781e704ff5805cd00",8:"4218eb5becaddd649623",9:"d02156509389fc441584",10:"9f5644b8d8539a302508",11:"5d316356ba01de644f13",12:"b16a14104ab77a57b8a2"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
+//# sourceMappingURL=manifest.f57a6b078e19ce5ab256.js.map

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

@@ -957,27 +957,79 @@ body {
   height: 3.92rem;
 }
 
+.pub {
+  position: fixed;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  background: rgba(0, 0, 0, 0.6);
+  z-index: 99;
+  display: none;
+}
+
+.pub .pub_in {
+  width: 8rem;
+  max-height: 10.66667rem;
+  overflow-y: scroll;
+  box-sizing: border-box;
+  padding: 0.93333rem 0.26667rem 0.26667rem;
+  background: #fff;
+  border: 0.02667rem solid #a39d9d;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  border-radius: 0.33333rem;
+}
+
+.pub .pub_in::-webkit-scrollbar {
+  display: none;
+}
+
+.pub .pub_in .close {
+  width: 0.58667rem;
+  height: 0.58667rem;
+  position: absolute;
+  right: 0.26667rem;
+  top: 0.26667rem;
+}
+
+.pub .pub_in p {
+  font-size: 0.34667rem;
+  color: #575757;
+  margin-bottom: 0.13333rem;
+  line-height: 0.53333rem;
+}
+
+.pub .pub_in p b {
+  color: #272525;
+  font-weight: 600;
+}
+
+.pub .pub_in .copy {
+  display: inline-block;
+  width: 0.4rem;
+  margin-top: 0.05333rem;
+}
+
 .english .page1 .way div i {
   width: 2rem;
 }
 
-.arabic .rule {
-  text-align: center;
-}
-
-.arabic .rule p {
-  white-space: nowrap;
-  text-align: center;
+.arabic .page2 .rule p {
+  text-align: right;
   font-size: 0.28rem;
 }
 
-.arabic .rule p img {
-  margin-right: 0;
-  margin-left: 0.16rem;
+.arabic .tab1 {
+  background: url(../images/tab2.png) no-repeat;
+  background-size: 100% 100%;
 }
 
-.arabic .rule p a {
-  white-space: nowrap;
+.arabic .tab2 {
+  background: url(../images/tab1.png) no-repeat;
+  background-size: 100% 100%;
 }
 
 .arabic .page1 h3 {

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

@@ -976,6 +976,62 @@ body {
     }
 }
 
+.pub {
+    position: fixed;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    background: rgba(0, 0, 0, .6);
+    z-index: 99;
+    display: none;
+
+    .pub_in {
+        width: px2rem(600);
+        max-height: px2rem(800);
+        overflow-y: scroll;
+        box-sizing: border-box;
+        padding: px2rem(70) px2rem(20) px2rem(20);
+        background: #fff;
+        border: px2rem(2) solid #a39d9d;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%, -50%);
+        border-radius: px2rem(25);
+
+        &::-webkit-scrollbar {
+            display: none;
+        }
+
+        .close {
+            width: px2rem(44);
+            height: px2rem(44);
+            position: absolute;
+            right: px2rem(20);
+            top: px2rem(20);
+        }
+
+        p {
+            font-size: px2rem(26);
+            color: #575757;
+            margin-bottom: px2rem(10);
+            line-height: px2rem(40);
+
+            b {
+                color: #272525;
+                font-weight: 600;
+            }
+        }
+
+        .copy {
+            display: inline-block;
+            width: px2rem(30);
+            margin-top: px2rem(4);
+        }
+    }
+}
+
 .english {
     .page1 .way div i {
         width: 2rem;
@@ -983,23 +1039,21 @@ body {
 }
 
 .arabic {
-    .rule {
-        text-align: center;
 
+    .page2 .rule {
         p {
-            white-space: nowrap;
-            text-align: center;
+            text-align: right;
             font-size: px2rem(21);
-
-            img {
-                margin-right: 0;
-                margin-left: 0.16rem;
+        }
     }
 
-            a {
-                white-space: nowrap;
-            }
+    .tab1 {
+        background: url(../images/tab2.png) no-repeat;
+        background-size: 100% 100%;
     }
+    .tab2 {
+        background: url(../images/tab1.png) no-repeat;
+        background-size: 100% 100%;
     }
 
     .page1 h3 {

view/molistar/modules/pay/index.html

@@ -9,7 +9,7 @@
     <!-- 充值 -->
     <link rel="stylesheet" href="../../common/css/reset.css">
     <link rel="stylesheet" href="../../common/css/flex.css">
-    <link rel="stylesheet" href="./css/index.css?v=1.12">
+    <link rel="stylesheet" href="./css/index.css?v=1.4">
 </head>
 
 <body>
@@ -157,6 +157,25 @@
             <img class="text20" src="./images/guide.png" alt="">
         </div>
     </div>
+    <!-- 弹窗 -->
+    <div class="pub">
+        <pub class="pub_in">
+            <img src="./images/close.png" alt="" class="close">
+            <div class="text pubText">
+                <p>You can contact the official customer service to get coins by transferring money to the following
+                    bank
+                    accounts.</p>
+                <p><b>Bank account number:</b> 01009701492 <img src="./images/copy.png" alt="" id="copys" class="copy">
+                </p>
+                <p><b>Notes:</b></p>
+                <p>1 The daily recharge limit is 60,000 Egyptian pounds.</p>
+                <p>2 After recharging, please contact our official customer service to confirm the transaction so that
+                    we
+                    can recharge your coins in time.</p>
+                <p><b>Thank you for your support and wish you a happy use!</b></p>
+            </div>
+        </pub>
+    </div>
 </body>
 
 </html>
@@ -165,8 +184,9 @@
 <script src="../../common/js/common2.js"></script>
 <script src="../../common/js/layer.js"></script>
 <script src="../../common/js/vconsole.min.js"></script>
-<script src="./local/en.js"></script>
-<script src="./local/zh.js"></script>
-<script src="./local/ar.js"></script>
-<script src="./js/index.js?v=1.2"></script>
+<script src="../../common/js/jquery.copy.min.js"></script>
+<script src="./local/en.js?v=1.4"></script>
+<script src="./local/zh.js?v=1.4"></script>
+<script src="./local/ar.js?v=1.4"></script>
+<script src="./js/index.js?v=1.4"></script>
 <script src="../../common/local/langHandler.js"></script>

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

@@ -59,6 +59,12 @@ $(function () {
         langReplace = window.lang.replace;
         localLang = window.lang;
         translateFun();
+        $.copy({
+            text: langReplace(localLang.demoModule.copy), //分享提示文案
+            copyUrl: "01009701492", //自定義復制
+            tipTime: 1000, //分享提示消失時間
+            copyId: "#copys" //復制按鈕id
+        });
         getArea();
     }, 100)
     setTimeout(function () {
@@ -87,6 +93,7 @@ function translateFun() {
     $('.text17').text(langReplace(localLang.demoModule.text17));
     $('.text18').text(langReplace(localLang.demoModule.text18));
     $('.text19').text(langReplace(localLang.demoModule.text19));
+    $('.pubText').html(langReplace(localLang.demoModule.pubText));
     $('.text20').attr('src', langReplace(localLang.demoModule.text20));
 }
 // 请求地区列表
@@ -241,8 +248,26 @@ $('.page1 .way ').on('click', 'div', function () {
     var id = $(this).attr('id');
     payChannel = $(this).attr('paychannel');
     paymentType = $(this).attr('paymenttype');
+    if (paymentType == "WALLET-VODAFONE") {
+        $('.pub').show();
+        bodyScroolFun(true);
+    }
     getChargePageInfoForH5Html(chargeGroupsArr, id, false);
 })
+// 关闭弹窗
+$('.pub .pub_in .close').click(function () {
+    $('.pub').hide();
+    bodyScroolFun(false);
+})
+// 复制卡号
+$('.pub .pub_in').on('click', '.copy', function () {
+    $.copy({
+        text: langReplace(localLang.demoModule.copy), //分享提示文案
+        copyUrl: "01009701492", //自定義復制
+        tipTime: 1000, //分享提示消失時間
+        copyId: "#copys" //復制按鈕id
+    });
+})
 // 点击充值金额方式
 $('.page1 .position').on('click', 'div', function () {
     $(this).addClass('active').siblings().removeClass('active')
@@ -301,8 +326,14 @@ $('.page1 .payBut').click(function () {
         return
     }
     if (apply2NewLock) {
+        console.log(paymentType);
+        if (paymentType == "WALLET-VODAFONE") {
+            $('.pub').show();
+            bodyScroolFun(true);
+        } else {
             apply2New();
         }
+    }
     // if (browser.app) {
     // apply2New();
     // } else {

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

@@ -42,5 +42,12 @@ langAr = {
         text30: `نسخ بنجاح`,
         text31: `هذا المتصفح لا يدعم النقر للنسخ إلى الحافظة`,
         text32: `هذا المتصفح لا يدعم النقر للنسخ إلى الحافظة`,
+        copy: `تم النسخ بنجاح`,
+        pubText: `<p>يمكنك التواصل مع خدمة العملاء الرسمية للحصول على العملات عبر تحويل الأموال إلى الحسابات البنكية التالية.</p>
+    <p><img src="./images/copy.png" alt="" id="copys" class="copy"><b>Vodafone Account:</b> 01002038365 </p>
+    <p><b>ملاحظات:</b></p>
+    <p>1. الحد الأقصى لإعادة الشحن اليومية هو 60,000 جنيه مصري.</p>
+    <p>2. بعد إعادة الشحن، يُرجى الاتصال بخدمة العملاء الرسمية لتأكيد المعاملة حتى نتمكن من إعادة شحن عملاتك في الوقت المناسب.</p>
+    <p><b>شكرًا لدعمكم ونتمنى لكم استخدامًا سعيدًا!</b></p>`
     }
 }

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

@@ -41,5 +41,18 @@ langEn = {
         text30: `Copy successful`,
         text31: `This browser does not support click to copy to clipboard`,
         text32: `This browser does not support click to copy to clipboard`,
+        copy: `Copied successfully`,
+        pubText: `<p>You can contact the official customer service to get coins by transferring money to the following
+        bank
+        accounts.</p>
+    <p><b>Vodafone Account:</b> 01002038365 <img src="./images/copy.png" alt="" id="copys" class="copy">
+    </p>
+    <p><b>Notes:</b></p>
+    <p>1 The daily recharge limit is 60,000 Egyptian pounds.</p>
+    <p>2 After recharging, please contact our official customer service to confirm the transaction so that
+        we
+        can recharge your coins in time.</p>
+    <p><b>Thank you for your support and wish you a happy use!</b></p>
+</div>`,
     }
 }

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

@@ -44,5 +44,12 @@ langZh = {
         text30: `復制成功`,
         text31: `該瀏覽器不支持點擊復制到剪貼闆`,
         text32: `該瀏覽器不支持點擊復制到剪貼闆`,
+        copy: `複製成功`,
+        pubText: `<p>您可以聯繫官方客服，通過轉賬到以下銀行賬戶獲取金幣。</p>
+    <p><b>Vodafone 账号：</b>01002038365 <img src="./images/copy.png" alt="" id="copys" class="copy"></p>
+    <p><b>注意：</b></p>
+    <p>1. 每日充值上限為60,000埃及鎊。</p>
+    <p>2. 充值後，請聯繫官方客服確認交易，以便我們及時充值您的金幣。</p>
+    <p><b>感謝您的支持，祝您使用愉快！</b></p>`
     }
 }

view/molistar/modules/rank/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.63d0984592f84b30a20508e287c84a87.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.edefaad72d9b1875036b.js></script><script type=text/javascript src=./static/js/vendor.15ea60415f84b9c5a7e3.js></script><script type=text/javascript src=./static/js/app.53a391fad53fabe5b23f.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.63d0984592f84b30a20508e287c84a87.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.f4b4d5c0f1822918fbf8.js></script><script type=text/javascript src=./static/js/vendor.15ea60415f84b9c5a7e3.js></script><script type=text/javascript src=./static/js/app.53a391fad53fabe5b23f.js></script></body></html>

view/molistar/modules/rank/static/js/manifest.f4b4d5c0f1822918fbf8.js

@@ -1,2 +1,2 @@
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,d=[];s<r.length;s++)u=r[s],t[u]&&d.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);d.length;)d.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={9: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 c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"8df79ff5365eaaec9298",1:"2660322e6ec3ab36d36b",2:"c400ed84fcfb7544002c",3:"7a4dfeb0d7ea325598f5",4:"99ab71a6e2e3859989f5",5:"946613b23d8c5d98c013",6:"92d7991962d3719f0ac8"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),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.edefaad72d9b1875036b.js.map
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,d=[];s<r.length;s++)u=r[s],t[u]&&d.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);d.length;)d.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={9: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 c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"9c750f0dc769418916c2",1:"2660322e6ec3ab36d36b",2:"c400ed84fcfb7544002c",3:"7a4dfeb0d7ea325598f5",4:"99ab71a6e2e3859989f5",5:"946613b23d8c5d98c013",6:"92d7991962d3719f0ac8"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),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.f4b4d5c0f1822918fbf8.js.map

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

@@ -1,8 +1,11 @@
 const ar = {
     diamondLog: {
-        主播周奖励: "مكافآت الأسبوع للمضيف",  
-        解除CP手续费: 'بالتأكيد',
-        SS公会活动奖励: 'جوائز حدث نقابة SS',
+        赠送个人主页: "زيين الصفحة الرئيسية",
+        购买个人主页: "شراء ديكور الصفحة الرئيسية ",
+        公会周期结算会长钻石收入: "إيرادات الماس لرئيس النقابة عند التسوية الدورية",
+        购买房间背景: "شراء خلفية الغرفة",
+        自定义房间背景: "خلفية الغرفة المخصصة",
+        自定义房间背景驳回: "رفض خلفية الغرفة المخصصة",
         公會usd兌換給代儲收入: 'دخل تبادل الدولار للإيداع',
         公會usd兌換金幣收入: 'دخل تبادل الدولار لعملات الذهب',
         遊戲開黑支出: 'الرهانات الرياضية',
@@ -12,7 +15,7 @@ const ar = {
         購買頭條消耗: 'استهلاك شراء العنوان',
         小遊戲收入: 'إيرادات اللعبة',
         小遊戲支出: 'نفقات اللعبة',
-        加載中: 'جار التحميل',
+        加載中: 'جار التحميل...',
         金幣記錄: 'سجل العملات الذهبية',
         收入記錄: 'سجل الدخل',
         支出記錄: 'سجل المصروفات',

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

@@ -1,5 +1,11 @@
 const en = {
     diamondLog: {
+        赠送个人主页: "Give homepage dress",
+        购买个人主页: "Buy homepage dress",
+        公会周期结算会长钻石收入: "Guild Leader Diamond Income for Periodic Settlement",
+        购买房间背景: "Purchase Room Background",
+        自定义房间背景: "Custom Room Background",
+        自定义房间背景驳回: "Custom Room Background Rejected",
         主播周奖励: "Host Weekly Rewards",
         解除CP手续费: 'Pay Fee',
         SS公会活动奖励: 'SS Guild Event Rewards',
@@ -12,7 +18,7 @@ const en = {
         購買頭條消耗: 'Purchase Headline Consumption',
         小遊戲收入: 'translates to "Game revenue',
         小遊戲支出: 'translates to "Game expenses',
-        加載中: 'Loading',
+        加載中: 'Loading...',
         金幣記錄: 'Gold Coin Records',
         收入記錄: 'Income Records',
         支出記錄: 'Expense Records',

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

@@ -1,5 +1,11 @@
 const zh = {
   diamondLog: {
+    赠送个人主页: "贈送主頁裝扮",
+    购买个人主页: "購買主頁裝扮",
+    公会周期结算会长钻石收入: "公會週期結算會長鑽石收入",
+    购买房间背景: "購買房間背景",
+    自定义房间背景: "自訂房間背景",
+    自定义房间背景驳回: "自訂房間背景駁回",
     主播周奖励: "主播周獎勵",
     解除CP手续费: '解除CP手續費',
     SS公会活动奖励: 'SS公會活動奬勵',
@@ -12,7 +18,7 @@ const zh = {
     購買頭條消耗: '購買頭條消耗',
     小遊戲收入: '小遊戲收入',
     小遊戲支出: '小遊戲支出',
-    加載中: '加載中',
+    加載中: '加載中...',
     金幣記錄: '金幣記錄',
     收入記錄: '收入記錄',
     支出記錄: '支出記錄',

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

@@ -32,7 +32,7 @@
       <van-list
         style="width: 100%"
         :finished="finished"
-        :finished-text="this.$t(`diamondLog.沒有更多了`)"
+        :finished-text="this.$t(`diamondLog.加載中`)"
         @load="onLoad"
       >
         <div v-for="(item, index) in list" :key="index">
@@ -174,6 +174,12 @@
               <p v-else-if="tab === 11 && item1.objType === 135">
                 {{ $t("diamondLog.主播周奖励") }}
               </p>
+              <p v-else-if="tab === 11 && item1.objType === 140">
+                {{ $t("diamondLog.自定义房间背景驳回") }}
+              </p>
+              <p v-else-if="tab === 11 && item1.objType === 141">
+                {{ $t("diamondLog.公会周期结算会长钻石收入") }}
+              </p>
               <p v-if="tab === 12 && item1.objType === 40">
                 {{ $t("diamondLog.全服紅包_發生在") }}{{ item1.roomTitle }}
               </p>
@@ -183,6 +189,12 @@
               <p v-else-if="tab === 12 && item1.objType === 113">
                 {{ $t("diamondLog.LUDO匹配消耗") }}
               </p>
+              <p v-else-if="tab === 12 && item1.objType === 142">
+                {{ $t("diamondLog.购买个人主页") }}
+              </p>
+              <p v-else-if="tab === 12 && item1.objType === 143">
+                {{ $t("diamondLog.赠送个人主页") }}
+              </p>
               <p v-else-if="tab === 12 && item1.objType === 14">
                 {{ $t("diamondLog.鉆石兌換金幣支出") }}
               </p>
@@ -267,6 +279,12 @@
               <p v-else-if="tab === 12 && item1.objType === 126">
                 {{ $t("diamondLog.解除CP手续费") }}
               </p>
+              <p v-else-if="tab === 12 && item1.objType === 138">
+                {{ $t("diamondLog.购买房间背景") }}
+              </p>
+              <p v-else-if="tab === 12 && item1.objType === 139">
+                {{ $t("diamondLog.自定义房间背景") }}
+              </p>
               <p v-else-if="tab === 12 && item1.objType === 90">
                 {{ $t("diamondLog.轉贈金幣給") }}
                 {{
@@ -382,13 +400,14 @@ export default {
     },
     onLoad() {
       this.page++;
+      this.finished = true;
       diamondLog({
         uid: window.sessionStorage.getItem("uid"),
         // uid: 935006,
         type: this.tab,
         date: new Date().getTime(),
         pageNo: this.page,
-        pageSize: 20,
+        pageSize: 100,
       }).then((res) => {
         console.log(res.data);
         if (res.data.code === 200) {
@@ -397,10 +416,10 @@ export default {
           } else {
             this.list.push(...res.data.data.billList);
           }
-          this.loading = false;
-          if (res.data.data.billList.length < 20) {
-            this.finished = true;
+          if (res.data.data.billList.length > 0) {
+            this.finished = false;
           }
+          this.loading = false;
         } else {
           Toast(res.data.message);
           this.finished = true;

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

@@ -11,7 +11,6 @@ if (EnvCheck() === 'test') {
   baseURL = 'https://api.molistar.xyz'
 }
 // baseURL = ''
-
 const service = axios.create({
   baseURL,
   // baseURL: '',
@@ -20,6 +19,7 @@ const service = axios.create({
   headers: {
     'pub_ticket': window.sessionStorage.getItem('ticket'),
     'pub_uid': window.sessionStorage.getItem('uid'),
+    'Accept-Language':window.info.deviceInfo['Accept-Language']
     // 'pub_ticket': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0aWNrZXRfdHlwZSI6bnVsbCwidWlkIjo5MzUwMDQsInRpY2tldF9pZCI6IjIxYmJiZWE3LWIxNTMtNDcyZi04MDdlLTM3YjI3ODMzOGZkMSIsImV4cCI6MzYwMCwiY2xpZW50X2lkIjoiZXJiYW4tY2xpZW50In0.mqQZqYhIfHekxGWYe7nK53svKqwU1wMdKUuc6_9Hdh4',
   }
 })