diff --git a/view/molistar/modules/guild-ar/css/index.css b/view/molistar/modules/guild-ar/css/index.css
index 5f69c31a..37c6b7a3 100644
--- a/view/molistar/modules/guild-ar/css/index.css
+++ b/view/molistar/modules/guild-ar/css/index.css
@@ -157,7 +157,9 @@ body {
margin-bottom: 0.24rem;
background: #F2F3F7;
border-radius: 0.32rem;
- text-align: center;
+ text-align: left;
+ box-sizing: border-box;
+ padding: 0 0.13333rem;
}
.headerBox .headerBox_in div img {
@@ -285,7 +287,7 @@ body {
.guildList {
width: 10rem;
border-radius: 0.26667rem;
- margin: 0.26667rem auto 0;
+ margin: 0rem auto 0;
position: relative;
background: #fff;
overflow: hidden;
@@ -363,7 +365,7 @@ body {
.guildList ul {
width: 100%;
height: 6.7rem;
- margin: 0.52rem auto 0;
+ margin: 0.25333rem auto 0;
overflow-y: scroll;
}
@@ -614,16 +616,15 @@ body {
font-size: 0.21333rem;
}
-.english .headerBox .headerBox_in .guildInfoSet span,
-.english .headerBox .headerBox_in .adminSet span {
- font-size: 0.26667rem;
-}
-
.arabic .header .inveMember {
right: auto;
left: 0.42667rem;
}
+.arabic .headerBox .headerBox_in div {
+ text-align: right;
+}
+
.arabic .header .headerBox {
width: 8rem;
}
diff --git a/view/molistar/modules/guild-ar/css/index.scss b/view/molistar/modules/guild-ar/css/index.scss
index e33ae42f..23f4e9fa 100644
--- a/view/molistar/modules/guild-ar/css/index.scss
+++ b/view/molistar/modules/guild-ar/css/index.scss
@@ -162,7 +162,9 @@ body {
margin-bottom: px2rem(18);
background: #F2F3F7;
border-radius: px2rem(24);
- text-align: center;
+ text-align: left;
+ box-sizing: border-box;
+ padding: 0 px2rem(10);
img {
display: inline;
@@ -294,7 +296,7 @@ body {
// height: 11rem;
// height: 6.7rem;
border-radius: px2rem(20);
- margin: px2rem(20) auto 0;
+ margin: px2rem(0) auto 0;
position: relative;
background: #fff;
overflow: hidden;
@@ -377,7 +379,7 @@ body {
width: 100%;
// height: 11rem;
height: 6.7rem;
- margin: px2rem(39) auto 0;
+ margin: px2rem(19) auto 0;
overflow-y: scroll;
&::-webkit-scrollbar {
@@ -636,7 +638,7 @@ body {
.headerBox .headerBox_in .guildInfoSet span,
.headerBox .headerBox_in .adminSet span {
- font-size: px2rem(20);
+ // font-size: px2rem(20);
}
}
@@ -645,6 +647,9 @@ body {
right: auto;
left: px2rem(32);
}
+ .headerBox .headerBox_in div{
+ text-align: right;
+ }
.header .headerBox {
width: 8rem;
diff --git a/view/molistar/modules/guild-ar/css/invitation.css b/view/molistar/modules/guild-ar/css/invitation.css
index 21bce72d..f377f359 100644
--- a/view/molistar/modules/guild-ar/css/invitation.css
+++ b/view/molistar/modules/guild-ar/css/invitation.css
@@ -45,7 +45,7 @@ body {
line-height: 0.74667rem;
border-radius: 0.74667rem;
box-sizing: border-box;
- padding-left: 0.72rem;
+ padding: 0 0.72rem;
position: absolute;
left: 1.22667rem;
top: 75%;
diff --git a/view/molistar/modules/guild-ar/css/invitation.scss b/view/molistar/modules/guild-ar/css/invitation.scss
index d44be9d9..46553947 100644
--- a/view/molistar/modules/guild-ar/css/invitation.scss
+++ b/view/molistar/modules/guild-ar/css/invitation.scss
@@ -48,7 +48,7 @@ body {
line-height: px2rem(56);
border-radius: px2rem(56);
box-sizing: border-box;
- padding-left: px2rem(54);
+ padding: 0 px2rem(54);
position: absolute;
left: px2rem(92);
top: 75%;
diff --git a/view/molistar/modules/guild-ar/css/personal.css b/view/molistar/modules/guild-ar/css/personal.css
index 565693ef..a365d1ab 100644
--- a/view/molistar/modules/guild-ar/css/personal.css
+++ b/view/molistar/modules/guild-ar/css/personal.css
@@ -342,7 +342,7 @@ body {
.page1 .incomeBoxLast .line {
width: 8.66667rem;
height: 0.02667rem;
- background: #C2E7D6;
+ background: #E4E4E4;
margin: 0 auto 0.26667rem;
}
@@ -446,6 +446,7 @@ body {
height: 1.76rem;
display: flex;
justify-content: space-between;
+ margin-top: 0.24rem;
}
.page2 .agentSalaryInfo .bottom div {
@@ -527,7 +528,7 @@ body {
.page2 .data {
width: 9.14667rem;
height: 13rem;
- margin: 0 auto 0;
+ margin: 0 auto 0rem;
overflow-y: scroll;
}
@@ -542,6 +543,7 @@ body {
background: #DBF6FF;
box-sizing: border-box;
padding: 0 0.24rem;
+ margin-bottom: 0.26667rem;
}
.page2 .data .box .tx {
@@ -584,10 +586,10 @@ body {
.page2 .data .box .right p {
color: #313131;
- font-size: 0.53333rem;
+ font-size: 0.48rem;
font-weight: 600;
margin-top: 0.45333rem;
- margin-bottom: 0.13333rem;
+ margin-bottom: 0.2rem;
}
.page2 .data .box .right b {
diff --git a/view/molistar/modules/guild-ar/css/personal.scss b/view/molistar/modules/guild-ar/css/personal.scss
index 6b4856b8..75ea6e18 100644
--- a/view/molistar/modules/guild-ar/css/personal.scss
+++ b/view/molistar/modules/guild-ar/css/personal.scss
@@ -349,7 +349,7 @@ body {
.line {
width: px2rem(650);
height: px2rem(2);
- background: #C2E7D6;
+ background: #E4E4E4;
margin: 0 auto px2rem(20);
}
}
@@ -453,6 +453,7 @@ body {
height: px2rem(132);
display: flex;
justify-content: space-between;
+ margin-top: px2rem(18);
div {
width: px2rem(316);
@@ -535,7 +536,7 @@ body {
.data {
width: px2rem(686);
height: 13rem;
- margin: 0 auto 0;
+ margin: 0 auto px2rem(0);
overflow-y: scroll;
&::-webkit-scrollbar {
@@ -549,6 +550,7 @@ body {
background: #DBF6FF;
box-sizing: border-box;
padding: 0 px2rem(18);
+ margin-bottom: px2rem(20);
.tx {
float: left;
@@ -589,10 +591,10 @@ body {
p {
color: #313131;
- font-size: px2rem(40);
+ font-size: px2rem(36);
font-weight: 600;
margin-top: px2rem(34);
- margin-bottom: px2rem(10);
+ margin-bottom: px2rem(15);
}
b {
diff --git a/view/molistar/modules/guild-ar/js/guild.js b/view/molistar/modules/guild-ar/js/guild.js
index 3fecaf16..43184d47 100644
--- a/view/molistar/modules/guild-ar/js/guild.js
+++ b/view/molistar/modules/guild-ar/js/guild.js
@@ -80,20 +80,39 @@ function listRank() {
success(res) {
if (res.code === 200) {
var str = '';
- res.data.forEach((res, i) => {
- str += `
+ if (res.data.length > 6) {//
+ var arr = generateUniqueRandomNumbers(2, 0, res.data.length - 1);
+ var val = res.data;
+ arr.forEach(res => {
+ str += `
+
+ ${i > 2 ? i + 1 : ''}
+
+ 
+
+
${val.guildName}
+
ID:${val.owner.erbanNo}
+
${langReplace(localLang.guild.text7)}
+
+ `
+ })
+ } else {
+ res.data.forEach((res, i) => {
+ str += `
${i > 2 ? i + 1 : ''}
-
${res.familyName}
+
${res.guildName}
ID:${res.owner.erbanNo}
${langReplace(localLang.guild.text7)}
`
- })
+ })
+ }
$('ul').append(str);
} else {
toastMsg(res.message)
@@ -106,6 +125,17 @@ function listRank() {
}
})
}
+// 随机数
+function generateUniqueRandomNumbers(count, min, max) {
+ const uniqueNumbers = new Set();
+
+ while (uniqueNumbers.size < count) {
+ const randomNumber = Math.floor(Math.random() * (max - min + 1)) + min;
+ uniqueNumbers.add(randomNumber);
+ }
+
+ return [...uniqueNumbers];
+}
// 确认加入按钮
$('ul').on('click', 'li .but', function () {
var familyId = $(this).attr('familyId');
@@ -128,7 +158,7 @@ function apply(familyId) {
networkRequest({
type: 'post',
url: urlPrefix + '/guild/manager/apply',
- data: { guildId:familyId },
+ data: { guildId: familyId },
success(res) {
if (res.code === 200) {
toastMsg(langReplace(localLang.guild.text8))
diff --git a/view/molistar/modules/guild-ar/js/index.js b/view/molistar/modules/guild-ar/js/index.js
index 1ad7196a..3f84a9d9 100644
--- a/view/molistar/modules/guild-ar/js/index.js
+++ b/view/molistar/modules/guild-ar/js/index.js
@@ -145,7 +145,7 @@ function get() {
if (cycleDiamondWageLevel.nextLevelWage) {
$('.agencylevel .agencylevelInfo .bottom div').eq(1).text(`${cycleDiamondWageLevel.nextLevel}(${unitProcessingAr(cycleDiamondWageLevel.nextLevelWage, 0)})`);
$('.agencylevel .agencylevelInfo .line .line_in').css('width', (cycleDiamondWageLevel.curDiamond - cycleDiamondWageLevel.curLevelWage) / (cycleDiamondWageLevel.nextLevelWage - cycleDiamondWageLevel.curLevelWage) * 100 + '%')
- }else{
+ } else {
$('.agencylevel .agencylevelInfo .bottom div').eq(1).hide();
$('.agencylevel .agencylevelInfo .line .line_in').css('width', '100%')
}
@@ -195,7 +195,7 @@ function get() {
ID:${res.erbanNo}
- ${roleTypes == 1 && res.roleType != 1 ? `${langReplace(localLang.demoModule.text14)}
` : roleTypes == 2 && res.roleType != 1 && res.roleType != 2 ? `${langReplace(localLang.demoModule.text14)}
` : `${langReplace(localLang.demoModule.text14)}
`}
+ ${roleTypes == 1 && res.roleType != 1 ? `${langReplace(localLang.demoModule.text14)}
` : roleTypes == 2 && res.roleType != 1 && res.roleType != 2 ? `${langReplace(localLang.demoModule.text14)}
` : `${langReplace(localLang.demoModule.text14)}
`}
`
@@ -245,7 +245,7 @@ function searchUser(erbanNo) {
ID:${res.erbanNo}
- ${roleTypes == 1 && res.roleType != 1 ? `${langReplace(localLang.demoModule.text14)}
` : roleTypes == 2 && res.roleType != 1 && res.roleType != 2 ? `${langReplace(localLang.demoModule.text14)}
` : `${langReplace(localLang.demoModule.text14)}
`}
+ ${roleTypes == 1 && res.roleType != 1 ? `${langReplace(localLang.demoModule.text14)}
` : roleTypes == 2 && res.roleType != 1 && res.roleType != 2 ? `${langReplace(localLang.demoModule.text14)}
` : `${langReplace(localLang.demoModule.text14)}
`}
`
$('.guildList ul').append(str);
@@ -337,4 +337,13 @@ $('.inveMember').click(function (params) {
// 我的工资
$(`.myWages`).click(function (params) {
window.location.href = `./memberFlow222.html?familyMemberId=${familyMemberId}`
-})
\ No newline at end of file
+})
+// $('.guildList .top ').on('focus', 'input', () => {
+// $('.headerBox').css('margin','-0.9rem auto 0rem')
+// console.log("聚焦");
+// });
+
+// $('.guildList .top').on('blur', 'input', () => {
+// console.log("失焦");
+// $('.headerBox').css('margin','-0.4rem auto 0rem')
+// });
\ No newline at end of file
diff --git a/view/molistar/modules/guild-ar/js/invitation.js b/view/molistar/modules/guild-ar/js/invitation.js
index df23debd..4d33db62 100644
--- a/view/molistar/modules/guild-ar/js/invitation.js
+++ b/view/molistar/modules/guild-ar/js/invitation.js
@@ -43,7 +43,7 @@ $(function () {
};
// 頂部返回事件
$('.back .backs').click(() => {
- window.location.href = document.referrer;
+ window.history.back();
})
fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言
langReplace = window.lang.replace;
diff --git a/view/molistar/modules/guild-ar/js/personal.js b/view/molistar/modules/guild-ar/js/personal.js
index eaa1f63d..53a85fdd 100644
--- a/view/molistar/modules/guild-ar/js/personal.js
+++ b/view/molistar/modules/guild-ar/js/personal.js
@@ -98,7 +98,7 @@ function getAccount() {
var me = res.data.person.me;
$('.page1 .my .tx').attr('src', me.avatar);
$('.page1 .my .user p').text(me.nick);
- $('.page1 .my .user b').text(me.erbanNo);
+ $('.page1 .my .user b').text('ID:'+me.erbanNo);
// 处理当前
var curCycle = res.data.person.curCycle;
$('.page1 .incomeTitle i').text(curCycle.cycleDate);
diff --git a/view/molistar/modules/guild-ar/js/success.js b/view/molistar/modules/guild-ar/js/success.js
index dbfc71d4..0663f416 100644
--- a/view/molistar/modules/guild-ar/js/success.js
+++ b/view/molistar/modules/guild-ar/js/success.js
@@ -72,7 +72,7 @@ $(function () {
if (type == 5) {
$('.settlement_wrap .settlement_account').hide();
} else {
- $('.settlement_wrap .settlement_account b').html(`${res.target.nick.length >= 6 ? res.target.nick.slice(0, 6) + '... ' : res.target.nick}![]()
(ID:${res.target.erbanNo})`);
+ $('.settlement_wrap .settlement_account b').html(`${res.target.nick.length >= 6 ? res.target.nick.slice(0, 6) + '... ' : res.target.nick}(ID:${res.target.erbanNo})`);
}
$('.settlement_wrap .time b').text(dateFormat(res.createTime, 'yyyy/MM/dd hh:mm:ss'));
$('.settlement_wrap .order b h6').text(res.no);
diff --git a/view/molistar/modules/guild-ar/local/ar.js b/view/molistar/modules/guild-ar/local/ar.js
index ae674e59..7b979e5f 100644
--- a/view/molistar/modules/guild-ar/local/ar.js
+++ b/view/molistar/modules/guild-ar/local/ar.js
@@ -220,7 +220,7 @@ langAr = {
text15: `المبلغ المخصص`,
text16: `الكل`,
text17: `يمكن تبادله مقابل 0 عملة ذهبية`,
- text18: `(نسبة التبادل 1:1)`,
+ text18: `(نسبة التبادل 1:7000)`,
text19: `تبادل العملات`,
text20: `السحب الرسمي`,
text21: `يمكن التسوية في الأول و 16 من كل شهر`,
diff --git a/view/molistar/modules/guild-ar/local/en.js b/view/molistar/modules/guild-ar/local/en.js
index 0df0f0b5..64494495 100644
--- a/view/molistar/modules/guild-ar/local/en.js
+++ b/view/molistar/modules/guild-ar/local/en.js
@@ -26,8 +26,8 @@ langEn = {
texts5: "My Salary",
newtext1: "My Income",
newtext2: "Salary Account",
- newtext3: "Guild Information Settings",
- newtext4: "Guild Admin Settings",
+ newtext3: "Guild Information",
+ newtext4: "Guild Admin",
newtext5: "Agency level",
newtext6: "Current Agency Lv:",
newtext7: "Next level need:",
@@ -218,7 +218,7 @@ langEn = {
text15: `Custom amount`,
text16: `All`,
text17: `Can be exchanged for 0 gold coin`,
- text18: `(Exchange at a ratio of 1:1)`,
+ text18: `(Exchange at a ratio of 1:7000)`,
text19: `Exchange coins`,
text20: `Official withdraw`,
text21: `Settlement available on the 1st and 16th of each month`,
diff --git a/view/molistar/modules/guild-ar/local/zh.js b/view/molistar/modules/guild-ar/local/zh.js
index e3e36c49..b261d5d8 100644
--- a/view/molistar/modules/guild-ar/local/zh.js
+++ b/view/molistar/modules/guild-ar/local/zh.js
@@ -27,12 +27,12 @@ langZh = {
texts4: `公會管理員設置`,
texts5: `我的工資`,
newtext1: "我的收入",
- newtext2: "薪资账户",
- newtext3: "公会信息设置",
- newtext4: "公会管理员设置",
- newtext5: "公会等级",
- newtext6: "当前公会等级：",
- newtext7: "升级所需：",
+ newtext2: "薪資賬戶",
+ newtext3: "公會信息設置",
+ newtext4: "公會管理員設置",
+ newtext5: "公會等級",
+ newtext6: "當前公會等級：",
+ newtext7: "升級所需：",
},
adminSet: {
text1: `管理員設置`,
@@ -122,7 +122,7 @@ langZh = {
text15: `查看`,
text16: `詳情`,
text17: `本月`,
- textss: `金币工资总和：`,
+ textss: `金幣工資總和：`,
},
memberFlow22: {
text1: `成員月工資`,
@@ -169,8 +169,8 @@ langZh = {
lay: {
ok: '確認',
close: '取消',
- departed: '已离开',
- placeholder: '请添加',
+ departed: '已離開',
+ placeholder: '請添加',
},
personal: {
text1: `個人`,
@@ -195,68 +195,68 @@ langZh = {
text20: `鑽石收入`,
},
diamondWithdraw: {
- text1: `钻石提现`,
- text2: `确认`,
- text3: `提现成功`,
- text4: `进入薪资账户`,
+ text1: `鉆石提現`,
+ text2: `確認`,
+ text3: `提現成功`,
+ text4: `進入薪資賬戶`,
text5: `取消`,
- text6: `钻石`,
- text7: `成功将 0ÜS 提取到薪资账户`
+ text6: `鉆石`,
+ text7: `成功將 0ÜS 提取到薪資賬戶`
},
salary: {
- text1: `薪资账户`,
- text2: `我的薪资：`,
- text3: `账单`,
- text4: `个人`,
+ text1: `薪資賬戶`,
+ text2: `我的薪資：`,
+ text3: `賬單`,
+ text4: `個人`,
text5: `代理`,
- text6: `转账方式`,
- text7: `转账美元`,
- text8: `确认`,
+ text6: `轉賬方式`,
+ text7: `轉賬美元`,
+ text8: `確認`,
text9: `充值代理`,
- text10: `该区域没有充值代理`,
+ text10: `該區域沒有充值代理`,
text11: `取消`,
- text12: `确认`,
+ text12: `確認`,
text13: `充值代理`,
- text14: `您确定要向代理发送 进行结算吗？`,
- text15: `自定义金额`,
+ text14: `您確定要向代理發送 進行結算嗎？`,
+ text15: `自定義金額`,
text16: `全部`,
- text17: `可兑换 0 金币`,
- text18: `(兑换比例为 1:1)`,
- text19: `兑换硬币`,
- text20: `官方提现`,
- text21: `每月的 1 日和 16 日可结算`,
- text22: `代理结算`,
- text23: `充值代理结算`,
- text24: `请输入要赎回的金额`,
- text25: `金币`
+ text17: `可兌換 0 金幣`,
+ text18: `(兌換比例為 1:7000)`,
+ text19: `兌換硬幣`,
+ text20: `官方提現`,
+ text21: `每月的 1 日和 16 日可結算`,
+ text22: `代理結算`,
+ text23: `充值代理結算`,
+ text24: `請輸入要贖回的金額`,
+ text25: `金幣`
},
bill: {
- text1: `账单`,
+ text1: `賬單`,
text2: `收入`,
text3: `支出`,
- text4: `薪资：`,
- text5: `钻石提现`,
- text6: `官方提现`,
- text7: `薪资兑换为硬币`,
- text8: `薪资转账`,
- text9: `代理薪资`,
+ text4: `薪資：`,
+ text5: `鉆石提現`,
+ text6: `官方提現`,
+ text7: `薪資兌換為硬幣`,
+ text8: `薪資轉賬`,
+ text9: `代理薪資`,
},
success: {
- text1: `结算成功`,
- text2: `兑换成功`,
- text3: `工资`,
- text4: `当前状态`,
- text5: `兑换成功`,
- text6: `兑换账户`,
- text7: `兑换币`,
- text8: `兑换时间`,
- text9: `订单`,
+ text1: `結算成功`,
+ text2: `兌換成功`,
+ text3: `工資`,
+ text4: `當前狀態`,
+ text5: `兌換成功`,
+ text6: `兌換賬戶`,
+ text7: `兌換幣`,
+ text8: `兌換時間`,
+ text9: `訂單`,
text10: ``,
- text11: `当前状态`,
+ text11: `當前狀態`,
text12: `成功`,
- text13: `账户`,
- text14: `结算账户`,
- text15: `时间`,
- text16: `订单`
+ text13: `賬戶`,
+ text14: `結算賬戶`,
+ text15: `時間`,
+ text16: `訂單`
},
}
\ No newline at end of file