From 22ba0d9bd4815f882a4622c5f4e596cabb54acf7 Mon Sep 17 00:00:00 2001 From: dragon <3013557874@qq.com> Date: Fri, 24 May 2024 17:31:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dui=E5=92=8Cbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../molistar/modules/guildAr/css/adminSet.css | 3 +- .../modules/guildAr/css/adminSet.scss | 3 +- .../modules/guildAr/css/adminSet2.css | 5 +- .../modules/guildAr/css/adminSet2.scss | 5 +- view/molistar/modules/guildAr/css/guild.css | 3 +- view/molistar/modules/guildAr/css/guild.scss | 3 +- .../modules/guildAr/css/guildInfoSet.css | 1 + .../modules/guildAr/css/guildInfoSet.scss | 1 + view/molistar/modules/guildAr/css/index.css | 14 ++-- view/molistar/modules/guildAr/css/index.scss | 15 ++-- .../modules/guildAr/css/memberFlow.css | 23 +++--- .../modules/guildAr/css/memberFlow.scss | 25 +++--- .../modules/guildAr/css/memberFlow2.css | 28 ++++--- .../modules/guildAr/css/memberFlow2.scss | 30 ++++--- view/molistar/modules/guildAr/css/search.css | 3 +- view/molistar/modules/guildAr/css/search.scss | 4 +- view/molistar/modules/guildAr/images/xjt.png | Bin 2474 -> 1088 bytes view/molistar/modules/guildAr/js/Invite.js | 2 +- view/molistar/modules/guildAr/js/adminSet.js | 2 +- view/molistar/modules/guildAr/js/adminSet2.js | 6 +- .../modules/guildAr/js/guildInfoSet.js | 2 +- view/molistar/modules/guildAr/js/index.js | 10 +-- .../molistar/modules/guildAr/js/memberFlow.js | 25 ++++-- .../modules/guildAr/js/memberFlow2.js | 25 ++++-- view/molistar/modules/guildAr/js/search.js | 7 +- view/molistar/modules/guildAr/memberFlow.html | 8 +- .../molistar/modules/guildAr/memberFlow2.html | 10 +-- .../molistar/modules/rule/js/luckyGiftRule.js | 19 ++++- view/molistar/modules/rule/local/ar.js | 15 ++-- view/molistar/modules/rule/local/en.js | 9 +- view/molistar/modules/rule/local/zh.js | 5 ++ view/molistar/modules/rule/luckyGiftRule.html | 7 +- .../modules/rule/style/luckyGiftRule.css | 67 +++++++++------ .../modules/rule/style/luckyGiftRule.scss | 77 ++++++++++-------- .../weekStar/images/newimages/header-ar.png | Bin 0 -> 124539 bytes .../weekStar/images/newimages/header-en.png | Bin 0 -> 117866 bytes .../weekStar/images/newimages/rule-ar.png | Bin 0 -> 2026 bytes .../weekStar/images/newimages/rule-en.png | Bin 0 -> 1717 bytes .../images/newimages/rule_content-ar.png | Bin 0 -> 195775 bytes .../images/newimages/rule_content-en.png | Bin 0 -> 211214 bytes .../weekStar/images/newimages/stab_A-ar.png | Bin 0 -> 9224 bytes .../weekStar/images/newimages/stab_A-en.png | Bin 0 -> 7855 bytes .../weekStar/images/newimages/stab_B-ar.png | Bin 0 -> 9708 bytes .../weekStar/images/newimages/stab_B-en.png | Bin 0 -> 7718 bytes .../weekStar/images/newimages/tab1_A-ar.png | Bin 0 -> 6098 bytes .../weekStar/images/newimages/tab1_A-en.png | Bin 0 -> 6172 bytes .../weekStar/images/newimages/tab2_B-ar.png | Bin 0 -> 6067 bytes .../weekStar/images/newimages/tab2_B-en.png | Bin 0 -> 6097 bytes .../modules/weekStar/js/newWeekStar.js | 66 +++++++++------ .../modules/weekStar/js/newWeekStar2.js | 22 +++++ view/molistar/modules/weekStar/local/ar.js | 20 ++++- view/molistar/modules/weekStar/local/en.js | 20 ++++- view/molistar/modules/weekStar/local/zh.js | 19 ++++- view/molistar/modules/weekStar/newDetail.html | 14 +++- .../modules/weekStar/newWeekStar.html | 7 +- 55 files changed, 432 insertions(+), 198 deletions(-) create mode 100644 view/molistar/modules/weekStar/images/newimages/header-ar.png create mode 100644 view/molistar/modules/weekStar/images/newimages/header-en.png create mode 100644 view/molistar/modules/weekStar/images/newimages/rule-ar.png create mode 100644 view/molistar/modules/weekStar/images/newimages/rule-en.png create mode 100644 view/molistar/modules/weekStar/images/newimages/rule_content-ar.png create mode 100644 view/molistar/modules/weekStar/images/newimages/rule_content-en.png create mode 100644 view/molistar/modules/weekStar/images/newimages/stab_A-ar.png create mode 100644 view/molistar/modules/weekStar/images/newimages/stab_A-en.png create mode 100644 view/molistar/modules/weekStar/images/newimages/stab_B-ar.png create mode 100644 view/molistar/modules/weekStar/images/newimages/stab_B-en.png create mode 100644 view/molistar/modules/weekStar/images/newimages/tab1_A-ar.png create mode 100644 view/molistar/modules/weekStar/images/newimages/tab1_A-en.png create mode 100644 view/molistar/modules/weekStar/images/newimages/tab2_B-ar.png create mode 100644 view/molistar/modules/weekStar/images/newimages/tab2_B-en.png create mode 100644 view/molistar/modules/weekStar/js/newWeekStar2.js diff --git a/view/molistar/modules/guildAr/css/adminSet.css b/view/molistar/modules/guildAr/css/adminSet.css index 5f9bc39..4db18f6 100644 --- a/view/molistar/modules/guildAr/css/adminSet.css +++ b/view/molistar/modules/guildAr/css/adminSet.css @@ -116,12 +116,13 @@ ul li .user p { font-weight: bold; display: inline-block; margin-right: 0.10667rem; - margin-top: 0.74667rem; margin-bottom: 0.16rem; width: 2.7rem; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; + box-sizing: border-box; + padding-top: 0.66667rem; } ul li .user b { diff --git a/view/molistar/modules/guildAr/css/adminSet.scss b/view/molistar/modules/guildAr/css/adminSet.scss index d31d494..b2f4afc 100644 --- a/view/molistar/modules/guildAr/css/adminSet.scss +++ b/view/molistar/modules/guildAr/css/adminSet.scss @@ -117,12 +117,13 @@ ul { font-weight: bold; display: inline-block; margin-right: px2rem(8); - margin-top: px2rem(56); margin-bottom: px2rem(12); width: 2.7rem; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; + box-sizing: border-box; + padding-top: px2rem(50); } b { diff --git a/view/molistar/modules/guildAr/css/adminSet2.css b/view/molistar/modules/guildAr/css/adminSet2.css index 563a83a..a592dbd 100644 --- a/view/molistar/modules/guildAr/css/adminSet2.css +++ b/view/molistar/modules/guildAr/css/adminSet2.css @@ -95,12 +95,13 @@ ul li .user p { font-weight: bold; display: inline-block; margin-right: 0.10667rem; - margin-top: 0.74667rem; margin-bottom: 0.16rem; width: 2.7rem; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; + box-sizing: border-box; + padding-top: 0.66667rem; } ul li .user b { @@ -153,6 +154,7 @@ ul li .chairman { left: 0.16rem; top: 0.94667rem; background: linear-gradient(90deg, #FFEB67, #FFFCE7); + display: none; } ul li .administrator { @@ -168,6 +170,7 @@ ul li .administrator { left: 0.16rem; top: 0.94667rem; background: linear-gradient(-90deg, #FBE1FF, #F090FF); + display: none; } ul .null { diff --git a/view/molistar/modules/guildAr/css/adminSet2.scss b/view/molistar/modules/guildAr/css/adminSet2.scss index 59750c9..7ed127d 100644 --- a/view/molistar/modules/guildAr/css/adminSet2.scss +++ b/view/molistar/modules/guildAr/css/adminSet2.scss @@ -96,12 +96,13 @@ ul { font-weight: bold; display: inline-block; margin-right: px2rem(8); - margin-top: px2rem(56); margin-bottom: px2rem(12); width: 2.7rem; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; + box-sizing: border-box; + padding-top: px2rem(50); } b { @@ -155,6 +156,7 @@ ul { left: px2rem(12); top: px2rem(71); background: linear-gradient(90deg, #FFEB67, #FFFCE7); + display: none; } .administrator { @@ -170,6 +172,7 @@ ul { left: px2rem(12); top: px2rem(71); background: linear-gradient(-90deg, #FBE1FF, #F090FF); + display: none; } } diff --git a/view/molistar/modules/guildAr/css/guild.css b/view/molistar/modules/guildAr/css/guild.css index 9e519de..2e8b1b4 100644 --- a/view/molistar/modules/guildAr/css/guild.css +++ b/view/molistar/modules/guildAr/css/guild.css @@ -120,9 +120,10 @@ ul li .user p { text-overflow: ellipsis; color: #515665; font-size: 0.32rem; - margin-top: 0.70667rem; margin-bottom: 0.38667rem; font-weight: bold; + box-sizing: border-box; + padding-top: 0.70667rem; } ul li .user b { diff --git a/view/molistar/modules/guildAr/css/guild.scss b/view/molistar/modules/guildAr/css/guild.scss index 567b6ee..76749b1 100644 --- a/view/molistar/modules/guildAr/css/guild.scss +++ b/view/molistar/modules/guildAr/css/guild.scss @@ -121,9 +121,10 @@ ul { text-overflow: ellipsis; color: #515665; font-size: px2rem(24); - margin-top: px2rem(53); margin-bottom: px2rem(29); font-weight: bold; + box-sizing: border-box; + padding-top: px2rem(53); } b { diff --git a/view/molistar/modules/guildAr/css/guildInfoSet.css b/view/molistar/modules/guildAr/css/guildInfoSet.css index ef091df..b8ee73a 100644 --- a/view/molistar/modules/guildAr/css/guildInfoSet.css +++ b/view/molistar/modules/guildAr/css/guildInfoSet.css @@ -77,6 +77,7 @@ body { top: 0; left: 2.53333rem; z-index: 1; + border-radius: 0.13333rem; } .bg .upload { diff --git a/view/molistar/modules/guildAr/css/guildInfoSet.scss b/view/molistar/modules/guildAr/css/guildInfoSet.scss index be04321..0682651 100644 --- a/view/molistar/modules/guildAr/css/guildInfoSet.scss +++ b/view/molistar/modules/guildAr/css/guildInfoSet.scss @@ -80,6 +80,7 @@ body { top: 0; left: px2rem(190); z-index: 1; + border-radius: px2rem(10); } .upload { diff --git a/view/molistar/modules/guildAr/css/index.css b/view/molistar/modules/guildAr/css/index.css index a5718f2..8eb2303 100644 --- a/view/molistar/modules/guildAr/css/index.css +++ b/view/molistar/modules/guildAr/css/index.css @@ -37,7 +37,7 @@ body { } .header .tx { - width: 2.53333rem; + width: 2.64rem; height: 2.53333rem; position: absolute; left: 50%; @@ -53,6 +53,7 @@ body { top: 1.73333rem; left: 50%; transform: translateX(-50%); + z-index: 2; } .header .nick { @@ -179,7 +180,7 @@ body { .guildList { width: 9.25333rem; - height: 9.97333rem; + height: 13.33333rem; border-radius: 0.26667rem; margin: -1.66667rem auto 0rem; position: relative; @@ -267,6 +268,8 @@ body { overflow: hidden; margin-bottom: 0.44rem; position: relative; + box-sizing: border-box; + padding-left: 0.13333rem; } .guildList ul li .tx { @@ -290,12 +293,13 @@ body { font-weight: bold; display: inline-block; margin-right: 0.10667rem; - margin-top: 0.10667rem; margin-bottom: 0.18667rem; width: 2.7rem; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; + box-sizing: border-box; + padding-top: 0.10667rem; } .guildList ul li .user b { @@ -344,7 +348,7 @@ body { font-size: 0.29333rem; font-weight: 400; position: absolute; - left: 0.16rem; + left: 0.26667rem; top: 0.94667rem; background: linear-gradient(90deg, #FFEB67, #FFFCE7); display: none; @@ -360,7 +364,7 @@ body { font-size: 0.29333rem; font-weight: 400; position: absolute; - left: 0.16rem; + left: 0.26667rem; top: 0.94667rem; background: linear-gradient(-90deg, #FBE1FF, #F090FF); display: none; diff --git a/view/molistar/modules/guildAr/css/index.scss b/view/molistar/modules/guildAr/css/index.scss index a956998..b66c23a 100644 --- a/view/molistar/modules/guildAr/css/index.scss +++ b/view/molistar/modules/guildAr/css/index.scss @@ -40,7 +40,7 @@ body { margin: 0 auto px2rem(0); .tx { - width: px2rem(190); + width: px2rem(198); height: px2rem(190); position: absolute; left: 50%; @@ -56,6 +56,7 @@ body { top: px2rem(130); left: 50%; transform: translateX(-50%); + z-index: 2; } .nick { @@ -183,7 +184,7 @@ body { .guildList { width: px2rem(694); - height: px2rem(748); + height: px2rem(1000); border-radius: px2rem(20); margin: px2rem(-125) auto px2rem(0); position: relative; @@ -198,6 +199,7 @@ body { line-height: px2rem(30); margin-top: px2rem(31); position: relative; + // margin-left: px2rem(-13); b { float: left; @@ -269,6 +271,8 @@ body { overflow: hidden; margin-bottom: px2rem(33); position: relative; + box-sizing: border-box; + padding-left: px2rem(10); .tx { width: px2rem(80); @@ -290,12 +294,13 @@ body { font-weight: bold; display: inline-block; margin-right: px2rem(8); - margin-top: px2rem(8); margin-bottom: px2rem(14); width: 2.7rem; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; + box-sizing: border-box; + padding-top: px2rem(8); } b { @@ -345,7 +350,7 @@ body { font-size: px2rem(22); font-weight: 400; position: absolute; - left: px2rem(12); + left: px2rem(20); top: px2rem(71); background: linear-gradient(90deg, #FFEB67, #FFFCE7); display: none; @@ -361,7 +366,7 @@ body { font-size: px2rem(22); font-weight: 400; position: absolute; - left: px2rem(12); + left: px2rem(20); top: px2rem(71); background: linear-gradient(-90deg, #FBE1FF, #F090FF); display: none; diff --git a/view/molistar/modules/guildAr/css/memberFlow.css b/view/molistar/modules/guildAr/css/memberFlow.css index f246ad4..5af9107 100644 --- a/view/molistar/modules/guildAr/css/memberFlow.css +++ b/view/molistar/modules/guildAr/css/memberFlow.css @@ -62,7 +62,7 @@ body { .timeBox .line { width: 0.02667rem; height: 1.90667rem; - background: #A4ABB2; + background: #D7DCE6; position: absolute; left: 2.92rem; top: 50%; @@ -90,18 +90,19 @@ body { color: #848D9C; font-size: 0.37333rem; font-weight: bold; - text-align: center; } .timeBox .startTime b { margin-right: 0.1rem; + text-indent: 0.45rem; + display: inline-block; } .timeBox .startTime img { - width: 0.46667rem; - height: 0.6rem; + width: 0.32rem; + height: 0.21333rem; display: inline-block; - margin-top: -0.1rem; + margin-top: 0.1rem; } .timeBox .endTime { @@ -112,18 +113,19 @@ body { color: #848D9C; font-size: 0.37333rem; font-weight: bold; - text-align: center; } .timeBox .endTime b { margin-right: 0.1rem; + text-indent: 0.45rem; + display: inline-block; } .timeBox .endTime img { - width: 0.46667rem; - height: 0.6rem; + width: 0.32rem; + height: 0.21333rem; display: inline-block; - margin-top: -0.1rem; + margin-top: 0.1rem; } .timeBox .right { @@ -201,7 +203,7 @@ body { width: 8.76rem; height: 2.01333rem; margin: 0 auto 0; - border-bottom: 0.02667rem solid #B0BACD; + border-bottom: 0.02667rem solid #D7DCE6; display: flex; justify-content: space-between; } @@ -218,6 +220,7 @@ body { color: #848D9C; font-size: 0.32rem; font-weight: 500; + white-space: nowrap; } .list .other div img { diff --git a/view/molistar/modules/guildAr/css/memberFlow.scss b/view/molistar/modules/guildAr/css/memberFlow.scss index 0260092..5949b2e 100644 --- a/view/molistar/modules/guildAr/css/memberFlow.scss +++ b/view/molistar/modules/guildAr/css/memberFlow.scss @@ -65,7 +65,7 @@ body { .line { width: px2rem(2); height: px2rem(143); - background: #A4ABB2; + background: #D7DCE6; position: absolute; left: px2rem(219); top: 50%; @@ -93,17 +93,19 @@ body { color: #848D9C; font-size: px2rem(28); font-weight: bold; - text-align: center; + // text-align: center; b { margin-right: 0.1rem; + text-indent: 0.45rem; + display: inline-block; } img { - width: px2rem(35); - height: px2rem(45); + width: px2rem(24); + height: px2rem(16); display: inline-block; - margin-top: -0.1rem; + margin-top: 0.1rem; } } @@ -115,17 +117,19 @@ body { color: #848D9C; font-size: px2rem(28); font-weight: bold; - text-align: center; + // text-align: center; b { margin-right: 0.1rem; + text-indent: 0.45rem; + display: inline-block; } img { - width: px2rem(35); - height: px2rem(45); + width: px2rem(24); + height: px2rem(16); display: inline-block; - margin-top: -0.1rem; + margin-top: 0.1rem; } } @@ -204,7 +208,7 @@ body { width: px2rem(657); height: px2rem(151); margin: 0 auto 0; - border-bottom: px2rem(2) solid #B0BACD; + border-bottom: px2rem(2) solid #D7DCE6; display: flex; justify-content: space-between; @@ -220,6 +224,7 @@ body { color: #848D9C; font-size: px2rem(24); font-weight: 500; + white-space: nowrap; img { display: block; diff --git a/view/molistar/modules/guildAr/css/memberFlow2.css b/view/molistar/modules/guildAr/css/memberFlow2.css index 00c5df3..99f1747 100644 --- a/view/molistar/modules/guildAr/css/memberFlow2.css +++ b/view/molistar/modules/guildAr/css/memberFlow2.css @@ -62,7 +62,7 @@ body { .timeBox .line { width: 0.02667rem; height: 1.90667rem; - background: #A4ABB2; + background: #D7DCE6; position: absolute; left: 2.92rem; top: 50%; @@ -90,18 +90,19 @@ body { color: #848D9C; font-size: 0.37333rem; font-weight: bold; - text-align: center; } .timeBox .startTime b { margin-right: 0.1rem; + text-indent: 0.45rem; + display: inline-block; } .timeBox .startTime img { - width: 0.46667rem; - height: 0.6rem; + width: 0.32rem; + height: 0.21333rem; display: inline-block; - margin-top: -0.1rem; + margin-top: 0.1rem; } .timeBox .endTime { @@ -112,18 +113,19 @@ body { color: #848D9C; font-size: 0.37333rem; font-weight: bold; - text-align: center; } .timeBox .endTime b { margin-right: 0.1rem; + text-indent: 0.45rem; + display: inline-block; } .timeBox .endTime img { - width: 0.46667rem; - height: 0.6rem; + width: 0.32rem; + height: 0.21333rem; display: inline-block; - margin-top: -0.1rem; + margin-top: 0.1rem; } .timeBox .right { @@ -140,6 +142,7 @@ body { width: 50%; text-align: center; overflow: hidden; + position: relative; } .timeBox .right div p { @@ -155,6 +158,10 @@ body { color: #848D9C; font-size: 0.37333rem; font-weight: bold; + position: absolute; + left: 50%; + transform: translateX(-50%); + bottom: 0.6rem; } .timeBox .right .goToExchangeGold { @@ -209,7 +216,7 @@ body { width: 8.76rem; height: 2.01333rem; margin: 0 auto 0; - border-bottom: 0.02667rem solid #B0BACD; + border-bottom: 0.02667rem solid #D7DCE6; display: flex; justify-content: space-between; } @@ -226,6 +233,7 @@ body { color: #848D9C; font-size: 0.32rem; font-weight: 500; + white-space: nowrap; } .list .other div img { diff --git a/view/molistar/modules/guildAr/css/memberFlow2.scss b/view/molistar/modules/guildAr/css/memberFlow2.scss index 9f93abd..b007d92 100644 --- a/view/molistar/modules/guildAr/css/memberFlow2.scss +++ b/view/molistar/modules/guildAr/css/memberFlow2.scss @@ -67,7 +67,7 @@ body { .line { width: px2rem(2); height: px2rem(143); - background: #A4ABB2; + background: #D7DCE6; position: absolute; left: px2rem(219); top: 50%; @@ -95,17 +95,19 @@ body { color: #848D9C; font-size: px2rem(28); font-weight: bold; - text-align: center; + // text-align: center; b { margin-right: 0.1rem; + text-indent: 0.45rem; + display: inline-block; } img { - width: px2rem(35); - height: px2rem(45); + width: px2rem(24); + height: px2rem(16); display: inline-block; - margin-top: -0.1rem; + margin-top: 0.1rem; } } @@ -117,17 +119,19 @@ body { color: #848D9C; font-size: px2rem(28); font-weight: bold; - text-align: center; + // text-align: center; b { margin-right: 0.1rem; + text-indent: 0.45rem; + display: inline-block; } img { - width: px2rem(35); - height: px2rem(45); + width: px2rem(24); + height: px2rem(16); display: inline-block; - margin-top: -0.1rem; + margin-top: 0.1rem; } } @@ -144,6 +148,7 @@ body { width: 50%; text-align: center; overflow: hidden; + position: relative; p { color: #A4ABB2; @@ -158,6 +163,10 @@ body { color: #848D9C; font-size: px2rem(28); font-weight: bold; + position: absolute; + left: 50%; + transform: translateX(-50%); + bottom: px2rem(45); } } @@ -214,7 +223,7 @@ body { width: px2rem(657); height: px2rem(151); margin: 0 auto 0; - border-bottom: px2rem(2) solid #B0BACD; + border-bottom: px2rem(2) solid #D7DCE6; display: flex; justify-content: space-between; @@ -230,6 +239,7 @@ body { color: #848D9C; font-size: px2rem(24); font-weight: 500; + white-space: nowrap; img { display: block; diff --git a/view/molistar/modules/guildAr/css/search.css b/view/molistar/modules/guildAr/css/search.css index ece74a8..a162753 100644 --- a/view/molistar/modules/guildAr/css/search.css +++ b/view/molistar/modules/guildAr/css/search.css @@ -116,12 +116,13 @@ ul li .user p { font-weight: bold; display: inline-block; margin-right: 0.10667rem; - margin-top: 0.74667rem; margin-bottom: 0.16rem; width: 2.7rem; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; + box-sizing: border-box; + padding-top: 0.74667rem; } ul li .user b { diff --git a/view/molistar/modules/guildAr/css/search.scss b/view/molistar/modules/guildAr/css/search.scss index 1069a3f..359b341 100644 --- a/view/molistar/modules/guildAr/css/search.scss +++ b/view/molistar/modules/guildAr/css/search.scss @@ -117,12 +117,14 @@ ul { font-weight: bold; display: inline-block; margin-right: px2rem(8); - margin-top: px2rem(56); + // margin-top: px2rem(56); margin-bottom: px2rem(12); width: 2.7rem; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; + box-sizing: border-box; + padding-top: px2rem(56); } b { diff --git a/view/molistar/modules/guildAr/images/xjt.png b/view/molistar/modules/guildAr/images/xjt.png index 9da06b6e44fa379505eb63799dc80d2bf2fd6a88..1a3652b4741042f06456e5ded05affd0ade5c8fe 100644 GIT binary patch literal 1088 zcmV-G1i$-Px&`bk7VR9Hvtm|bWbRTRhnXLd7b3N?9XAB2KnMUbMjGi$__Sl2o`sWF*JvKBWOuMsAA~A`3Zh6|BgHH`b7Zz% z*))4+ceAsVKUcwUpXo>sBC4m3CgTfA2$B%b)&Mte7iSGh13#NCw z<-*=*G+MftrY-ARxwB_(AA?81C;|LIvC#E!JifN*`49pm)Al&PJFCqS_|V*+KWvZ3 zHOOu z+OePxVb;{t%Y*>s{W7@j{>+xAnY(``*2J-)CxpuDmThRZ~3f>Q?68sj@){~AM;Pf2C9B^D<9{q@4}x*ez_q$cxMvBX(`Rtt*E zNsQZuboKLQAX3x$es+-pAlJ_0pTX`1Q}6w$)_B7JUh?6|uh+8VWEof`FnLxYY#!3o zuNr|!P1!dw@n-;*3*vtx7aNU!^|bgPX{1tB%*13)aU}9)xm%E0a9!Fo(yyHKlTJ*| z^pYf{eRR%%c$29`PWkCH)q($(Q+j42qg=e^%n|TA9JkNda{YI;iYGITb=P+U0u%=p#n)l*b1}Hk#$1m>8S zb{e|!W;5mk132G_N0_j`Sp(&G<~^n!d1*1Zfpnl!IFZRcMNCgLV}zLY8oKgyGdb0< zfdZ5_b~^te0ec!UM0nQJ)JGeN6$Awi;9Z82)Ak$0xX0fZziw#i?pAMhfdhD^y}N8@ z&zkobh}VK3;NXy^>}b_|pquzYquy(R-1E=J00!ob5t79--`^S3!$4a)P%)g%W|tL; zEB1qE6o3QfgVj$Wt*re@Zd(C@Fj!CH5(I8G>p@SS%krmAp}>f@6F)%Y|n23{j~4) z7k)F*jP3~4Qcuz>dhF(-rRhmj>*;b+I~ZeF_0ZQl#vq_$hFIB*8o%fKuqs2dmf+@# z`it;~S$;WPDQ32>j>%EvTo7b0dReC7*plV7%pc;+ z6m-jf;uT#xo=ZtwUF=zG;NGGbcXIj`7OItQ1bq@7`Z-XBR~t!PKNR z>sC7fZ_CtKw_~R!+pqVZOX*u*eq^{hz0@yPV}72%kThma?J~Yv zcsoAHTWSgA9;F%x;`zK$I~$u#Pwuggr_w;bca=g?!7R^)79XEDg|~;ZC6R{p zRV~|VbE0h_36dmyl4qET`ZafJeC3TO($|Td4qVkGJI6=Jm5JL*gf9*A^_ad4iOLN1 z{kD^=QV1%C8VL3uwGB4Tj5Zbp;#rv?TyaIgBN?~;g_x>u8ke%;1u4>x+N$2jT)pwi zG8Z)JWtaNpVand6^6#s@ZXbD#K9S_ENym_7yX(EbZ#&p1g9OhH<6@B!?xSvPxec$` zBDQ=Iso?CSgl*z*TbtHyD^E{$`0GjFEMX4HIM6hV)aia5r7_*LN>Ttr-_Fegg;2FDr1oGO% z(=lyaMkRn}k<{l#3dJLePyry8v5VnfM1j>ukTm55yDd7<^OhCQc45%QkDNwQ(2Dzti;S_%RA;faWK;jn?HQ=3$;zJ`6okJocez4$ib*+`A`H1Y z;~<>i#X}3qgqCacW)C_>G}nOY@>8FyGE2_^B3S@V$DtM;lM8nk?D^`bpaN2a%{QP! zh(=h(2il0DRTw03q6H{fnLv<08&R^7K+r}51iU-^wNms`GGl!Ahs_!zJGbDA9TqqO^U;owb8-*%#>4x0 zprEYv&oC>*U^?ZWlp?L51Vy?sVCPO?o=K>CGmol(3w@yO8D)mOMbPt8$16aA&+~i* zhJgUZ{E=B98`gE4W*civ%2o_fU#LeXKnc^Zd$LX2FznR}( zpe735hHv@1pk)3q*xvT;eJD84ps~jmAyxSIGyT6D6h6b+?ZJIZCK56 { - window.history.go(-1); + window.location.href = document.referrer; }) }, 100) }) diff --git a/view/molistar/modules/guildAr/js/adminSet.js b/view/molistar/modules/guildAr/js/adminSet.js index 8487f16..6aa4325 100644 --- a/view/molistar/modules/guildAr/js/adminSet.js +++ b/view/molistar/modules/guildAr/js/adminSet.js @@ -41,7 +41,7 @@ $(function () { }; // 頂部返回事件 $('.back .backs').click(() => { - window.history.go(-1); + window.location.href = document.referrer; }) }, 100) }) diff --git a/view/molistar/modules/guildAr/js/adminSet2.js b/view/molistar/modules/guildAr/js/adminSet2.js index 3472873..afe90e7 100644 --- a/view/molistar/modules/guildAr/js/adminSet2.js +++ b/view/molistar/modules/guildAr/js/adminSet2.js @@ -41,7 +41,7 @@ $(function () { }; // 頂部返回事件 $('.back .backs').click(() => { - window.history.go(-1); + window.location.href = "./index.html"; }) listManager(); }, 100) @@ -66,8 +66,8 @@ function listManager() { res.data.forEach(res => { str += `
  • -
    الوكيل
    -
    المشرف
    +
    الوكيل
    +
    المشرف

    ${res.nick}

    diff --git a/view/molistar/modules/guildAr/js/guildInfoSet.js b/view/molistar/modules/guildAr/js/guildInfoSet.js index 13d4124..c88f4cb 100644 --- a/view/molistar/modules/guildAr/js/guildInfoSet.js +++ b/view/molistar/modules/guildAr/js/guildInfoSet.js @@ -40,7 +40,7 @@ $(function () { }; // 頂部返回事件 $('.back img').click(() => { - window.history.go(-1); + window.location.href = document.referrer; }) pubInfo['Accept-Language'] = 'ar' }, 100) diff --git a/view/molistar/modules/guildAr/js/index.js b/view/molistar/modules/guildAr/js/index.js index 3959020..bbe12ab 100644 --- a/view/molistar/modules/guildAr/js/index.js +++ b/view/molistar/modules/guildAr/js/index.js @@ -79,10 +79,6 @@ function guildFun(type) { else { } } -// 邀请成员按钮 -$('.header .inveMember').click(function () { - window.location.href = './invite.html' -}) // 配置接口 function get() { showLoading() @@ -99,10 +95,10 @@ function get() { $('.header .nick').text(res.data.owner.nick); $('.header .id').text('ID：' + res.data.owner.erbanNo); $('.header').css({ "background": `url(${res.data.backgroundUrl}) no-repeat`, "background-size": "100% 100%" }); - $('.header .guildNick').text('نقابة:' + res.data.name); + $('.header .guildNick').text('اسم النقابة:' + res.data.name); // 处理成员 var str = ''; - $('.guildList .top i').text(res.data.members.length); + $('.guildList .top i').text(`(${res.data.members.length})`); $('.guildList ul li').remove(); res.data.members.forEach((res, i) => { str += ` @@ -242,5 +238,5 @@ $('.header .memberFlowMy').click(function (params) { }) // 查看成员流水 $('.header .inveMember').click(function (params) { - window.location.href = `./Invite.html` + window.location.href = `./invite.html` }) \ No newline at end of file diff --git a/view/molistar/modules/guildAr/js/memberFlow.js b/view/molistar/modules/guildAr/js/memberFlow.js index 7bf0e59..fc80614 100644 --- a/view/molistar/modules/guildAr/js/memberFlow.js +++ b/view/molistar/modules/guildAr/js/memberFlow.js @@ -29,6 +29,7 @@ const toastMsg = (content = '操作完成', time = 2) => { var times = new Date().getTime() - 86400000; var startDates; var endDates; +var timestamp; // 初始化函數 $(function () { getInfoFromClient(); @@ -43,7 +44,7 @@ $(function () { }; // 頂部返回事件 $('.back .backs').click(() => { - window.history.go(-1); + window.location.href = './index.html'; }) //初始化时间插件 this.initTime() @@ -89,8 +90,8 @@ function memberIncome(startDate, endDate) {
    • ` } else { - $('.timeBox .right div b').text(res.data.totalDiamondRemain); - $('.timeBox .right div b').text(res.data.totalGoldIncome); + $('.timeBox .right .div1 b').text(res.data.totalGoldIncome); + $('.timeBox .right .div2 b').text(res.data.totalDiamondRemain); res.data.memberIncomeList.forEach(val => { str += `
  • @@ -99,17 +100,19 @@ function memberIncome(startDate, endDate) {

    ${val.member.nick}

    ID:${val.member.erbanNo} -
    ${val.micRemainTime}min
    +
    ${val.micRemainTime}
    ${val.goldIncome}
    -
    ${val.res.data.diamondRemain}
    +
    ${val.diamondRemain}
    ${val.sendGiftUserNum}
    • ` }) } $('.list').append(str); + timestamp = res.timestamp; } else { toastMsg(res.message) + timestamp = res.timestamp; } hideLoading(layerIndex) }, @@ -121,5 +124,15 @@ function memberIncome(startDate, endDate) { } // 查询按钮 $('.back .text').click(function () { - memberIncome(startDates, endDates) + if ((Date.parse(endDates)) >= timestamp) { + toastMsg('وقت الانتهاء يجب أن يكون قبل اليوم السابق كحد أقصى.') + } else if (endDates == dateFormat(timestamp, 'yyyy-MM-dd')) { + toastMsg('وقت الانتهاء يجب أن يكون قبل اليوم السابق كحد أقصى.') + } else if (Date.parse(startDates) > Date.parse(endDates)) { + toastMsg(`لا يمكن أن يكون وقت البدء أقل من وقت الانتهاء.`) + } else if ((Date.parse(endDates) - Date.parse(startDates)) > (30 * 24 * 60 * 60 * 1000)) { + toastMsg('المدة الزمنية يجب أن تكون داخل الثلاثين يومًا.') + } else { + memberIncome(startDates, endDates) + } }) \ No newline at end of file diff --git a/view/molistar/modules/guildAr/js/memberFlow2.js b/view/molistar/modules/guildAr/js/memberFlow2.js index fc818b1..72665c2 100644 --- a/view/molistar/modules/guildAr/js/memberFlow2.js +++ b/view/molistar/modules/guildAr/js/memberFlow2.js @@ -29,6 +29,7 @@ const toastMsg = (content = '操作完成', time = 2) => { var times = new Date().getTime() - 86400000; var startDates; var endDates; +var timestamp; // 初始化函數 $(function () { getInfoFromClient(); @@ -43,7 +44,7 @@ $(function () { }; // 頂部返回事件 $('.back .backs').click(() => { - window.history.go(-1); + window.location.href = './index.html'; }) //初始化时间插件 this.initTime() @@ -89,13 +90,13 @@ function memberIncome(startDate, endDate) { ` } else { - $('.timeBox .right div b').text(res.data.totalDiamondRemain); - $('.timeBox .right div b').text(res.data.totalGoldIncome); + $('.timeBox .right .div1 b').text(res.data.totalGoldIncome); + $('.timeBox .right .div2 b').text(res.data.totalDiamondRemain); res.data.incomeList.forEach(val => { str += `
  • ${dateFormat(val.date, 'yyyy-MM-dd')}
    -
    ${val.micRemainTime}min
    +
    ${val.micRemainTime}
    ${val.goldIncome}
    ${val.diamondRemain}
    ${val.sendGiftUserNum}
    @@ -104,8 +105,10 @@ function memberIncome(startDate, endDate) { }) } $('.list').append(str); + timestamp = res.timestamp; } else { toastMsg(res.message) + timestamp = res.timestamp; } hideLoading(layerIndex) }, @@ -118,12 +121,22 @@ function memberIncome(startDate, endDate) { // 跳转客户端兑换金币页面 $('.timeBox .right .goToExchangeGold').click(function () { if (browser.android) { - window.androidJsObj.goToExchangeGold(false) + window.androidJsObj.goToExchangeGold() } else { window.webkit.messageHandlers.goToExchangeGold.postMessage(0) } }) // 查询按钮 $('.back .text').click(function () { - memberIncome(startDates, endDates) + if ((Date.parse(endDates)) >= timestamp) { + toastMsg('وقت الانتهاء يجب أن يكون قبل اليوم السابق كحد أقصى.') + } else if (endDates == dateFormat(timestamp, 'yyyy-MM-dd')) { + toastMsg('وقت الانتهاء يجب أن يكون قبل اليوم السابق كحد أقصى.') + } else if (Date.parse(startDates) > Date.parse(endDates)) { + toastMsg(`لا يمكن أن يكون وقت البدء أقل من وقت الانتهاء.`) + } else if ((Date.parse(endDates) - Date.parse(startDates)) > (30 * 24 * 60 * 60 * 1000)) { + toastMsg('المدة الزمنية يجب أن تكون داخل الثلاثين يومًا.') + } else { + memberIncome(startDates, endDates) + } }) \ No newline at end of file diff --git a/view/molistar/modules/guildAr/js/search.js b/view/molistar/modules/guildAr/js/search.js index 412e09e..dfd5143 100644 --- a/view/molistar/modules/guildAr/js/search.js +++ b/view/molistar/modules/guildAr/js/search.js @@ -40,19 +40,20 @@ $(function () { }; // 頂部返回事件 $('.back .backs').click(() => { - window.history.go(-1); + window.location.href = document.referrer; }) }, 100) }) // 配置接口 function searchFamily(erbanNo) { + $('ul li').remove(); showLoading() networkRequest({ type: 'get', url: urlPrefix + '/family/searchFamily', data: { erbanNo }, success(res) { - if (res.code === 200) { + if (res.code == 200) { var str = ''; str += `
  • @@ -64,7 +65,9 @@ function searchFamily(erbanNo) {
    طلب إضافة
    • ` + $('ul').append(str); } else if (res.code == 1404) { + var str = ''; str += `
  • diff --git a/view/molistar/modules/guildAr/memberFlow.html b/view/molistar/modules/guildAr/memberFlow.html index fbfe990..5ad2aea 100644 --- a/view/molistar/modules/guildAr/memberFlow.html +++ b/view/molistar/modules/guildAr/memberFlow.html @@ -4,7 +4,7 @@ - أجمالي دخل الأعضاء + إجمالي دخل الأعضاء @@ -15,7 +15,7 @@
    -
    أجمالي دخل الأعضاء
    +
    إجمالي دخل الأعضاء
    استعلام
    @@ -30,7 +30,7 @@

    الدخل الإجمالي للعملات الذهبية

    0 -
    +

    الدخل الإجمالي للماس

    0 @@ -41,7 +41,7 @@
    • -
      رسائل الأعضاء
      +
      معلومات الأعضاء
      وقت البث
      diff --git a/view/molistar/modules/guildAr/memberFlow2.html b/view/molistar/modules/guildAr/memberFlow2.html index e108178..9344cd0 100644 --- a/view/molistar/modules/guildAr/memberFlow2.html +++ b/view/molistar/modules/guildAr/memberFlow2.html @@ -4,7 +4,7 @@ - دخل الشخصي + الدخل الشخصي @@ -15,7 +15,7 @@
      -
      دخل الشخصي
      +
      الدخل الشخصي
      استعلام
      @@ -30,19 +30,19 @@

      الدخل الإجمالي للعملات الذهبية

      0
    -
    +

    الدخل الإجمالي للماس

    0
    -
    استبدال
    +
    استبدال >>
    • -
      تاريخ
      +
      التاريخ
      وقت البث
      diff --git a/view/molistar/modules/rule/js/luckyGiftRule.js b/view/molistar/modules/rule/js/luckyGiftRule.js index 14dbb32..fe936ae 100644 --- a/view/molistar/modules/rule/js/luckyGiftRule.js +++ b/view/molistar/modules/rule/js/luckyGiftRule.js @@ -1,9 +1,11 @@ let locateObj = getQueryString() let urlPrefix = getUrlPrefix() let luckyBagPoolInfoMaps; +var langReplace; +var localLang; // 封装layer消息提醒框 let layerIndex -const showLoading = (content = '加載中...') => { +const showLoading = (content = '(*＾-＾*)') => { layer.open({ type: 2, shadeClose: false, @@ -16,7 +18,7 @@ const showLoading = (content = '加載中...') => { const hideLoading = (index) => { layer.close(index) } -const toastMsg = (content = '操作完成', time = 2) => { +const toastMsg = (content = '︶︵︶', time = 2) => { layer.open({ content, time, @@ -38,7 +40,7 @@ const getList = () => { } }, error () { - toastMsg('網絡錯誤') + toastMsg(langReplace(localLang.demoModule.luckyGiftRuleErr)) } }) } @@ -48,11 +50,22 @@ $(function () { new VConsole(); } getInfoFromClient() + fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言 setTimeout(function () { fuzzyMatchUpdateQueryStringParameterFun(); + langReplace = window.lang.replace; + localLang = window.lang; + translateFun(); getList() },50) }) +function translateFun() { + var langReplace = window.lang.replace; + var localLang = window.lang; + $('#luckyGiftRuleTitle').text(langReplace(localLang.demoModule.luckyGiftRuleTitle)) + $('#luckyGiftRuleText1').text(langReplace(localLang.demoModule.luckyGiftRuleText1)) + $('#luckyGiftRuleText2').text(langReplace(localLang.demoModule.luckyGiftRuleText2)) +} function bodyList (id) { $('.wrap .gift_item_contain li').remove(); console.log(luckyBagPoolInfoMaps[id]); diff --git a/view/molistar/modules/rule/local/ar.js b/view/molistar/modules/rule/local/ar.js index 3fe2f81..710941f 100644 --- a/view/molistar/modules/rule/local/ar.js +++ b/view/molistar/modules/rule/local/ar.js @@ -1,7 +1,7 @@ // 英文 -langAr = { +langAr = { // 模块 - + demoModule: { // ==========================================sdk================================== sdk_title: `Third-party SDK Directory`, @@ -1534,7 +1534,7 @@ langAr = {
    `, - + // ==========================================平台社区规范================================== community_title: `MoliStarApp Community Guidelines`, community_body: ` Principles

    @@ -1769,7 +1769,12 @@ langAr = { Complaints can be sent to MoliStar666@gmail.com.

    `, //==========================================贵族规则================================== - introduction_title:`VIP قواعد`, - introduction_title_img:'./images/patrician-ar.png', + introduction_title: `VIP قواعد`, + introduction_title_img: './images/patrician-ar.png', + // 幸运礼物 + luckyGiftRuleTitle: 'قواعد الهدايا الحظ', + luckyGiftRuleErr: 'خطأ في الشبكة', + luckyGiftRuleText1: 'أرسل هدايا حظ مختلفة لفرصة الفوز بجوائز عالية القيمة.', + luckyGiftRuleText2: 'حقيبة الحظ', } } \ No newline at end of file diff --git a/view/molistar/modules/rule/local/en.js b/view/molistar/modules/rule/local/en.js index 0e1ba6b..a8c949f 100644 --- a/view/molistar/modules/rule/local/en.js +++ b/view/molistar/modules/rule/local/en.js @@ -1769,7 +1769,12 @@ langEn = { Complaints can be sent to MoliStar666@gmail.com.

    `, //==========================================贵族规则================================== - introduction_title:'VIP rules', - introduction_title_img:'./images/patrician-en.png', + introduction_title: 'VIP rules', + introduction_title_img: './images/patrician-en.png', + // 幸运礼物 + luckyGiftRuleTitle: 'Lucky Gift Rules', + luckyGiftRuleErr: 'Network Error', + luckyGiftRuleText1: 'Send different lucky gifts for a chance to win high-value prizes.', + luckyGiftRuleText2: 'Lucky Bag', } } \ No newline at end of file diff --git a/view/molistar/modules/rule/local/zh.js b/view/molistar/modules/rule/local/zh.js index 2db97e6..fa1fd0f 100644 --- a/view/molistar/modules/rule/local/zh.js +++ b/view/molistar/modules/rule/local/zh.js @@ -1771,5 +1771,10 @@ langZh = { //==========================================贵族规则================================== introduction_title: '貴族規則', introduction_title_img: './images/patrician.png', + // 幸运礼物 + luckyGiftRuleTitle:'幸運禮物玩法說明', + luckyGiftRuleErr:'網絡錯誤', + luckyGiftRuleText1:'送出不同的幸運禮物，有機會獲得以下高價禮物', + luckyGiftRuleText2:'幸運福袋', } } \ No newline at end of file diff --git a/view/molistar/modules/rule/luckyGiftRule.html b/view/molistar/modules/rule/luckyGiftRule.html index 4140006..602c6c7 100644 --- a/view/molistar/modules/rule/luckyGiftRule.html +++ b/view/molistar/modules/rule/luckyGiftRule.html @@ -6,7 +6,8 @@ - 幸运礼物玩法说明 + +