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 9da06b6..1a3652b 100644 Binary files a/view/molistar/modules/guildAr/images/xjt.png and b/view/molistar/modules/guildAr/images/xjt.png differ diff --git a/view/molistar/modules/guildAr/js/Invite.js b/view/molistar/modules/guildAr/js/Invite.js index ed9ec58..81f23a6 100644 --- a/view/molistar/modules/guildAr/js/Invite.js +++ b/view/molistar/modules/guildAr/js/Invite.js @@ -40,7 +40,7 @@ $(function () { }; // 頂部返回事件 $('.back .backs').click(() => { - 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 += `${val.member.nick}
ID:${val.member.erbanNo}
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 @@
-
- الدخل الإجمالي للعملات الذهبية
0 -الدخل الإجمالي للماس
0 @@ -41,7 +41,7 @@
- الدخل الإجمالي للعملات الذهبية
0الدخل الإجمالي للماس
0