diff --git a/view/molistar/common/js/common2.js b/view/molistar/common/js/common2.js index 122d6aa..9074821 100644 --- a/view/molistar/common/js/common2.js +++ b/view/molistar/common/js/common2.js @@ -826,9 +826,9 @@ function fuzzyMatchUpdateQueryStringParameterFun() { } } function langCodeFun(langCode) { - if (window.location.href.match(/guildAr/)) { - return - } + // if (window.location.href.match(/guildAr/)) { + // return + // } var body = document.body; body.style.display = 'none'; setTimeout(function () { @@ -841,9 +841,9 @@ function langCodeFun(langCode) { } else if (langCode == "en") { document.body.classList.add('english'); } - if (window.location.href.match(/guildAr/)) { - document.documentElement.setAttribute("dir", "ltr"); - } + // if (window.location.href.match(/guildAr/)) { + // document.documentElement.setAttribute("dir", "ltr"); + // } } // 获取整条url function updateQueryStringParameter(uri, key, value) { diff --git a/view/molistar/modules/guildAr/adminSet.html b/view/molistar/modules/guildAr/adminSet.html index 62db0c8..0b0ba16 100644 --- a/view/molistar/modules/guildAr/adminSet.html +++ b/view/molistar/modules/guildAr/adminSet.html @@ -41,8 +41,8 @@

-
-
+
+
diff --git a/view/molistar/modules/guildAr/css/memberFlow2.css b/view/molistar/modules/guildAr/css/memberFlow2.css index 309e300..b88e8a8 100644 --- a/view/molistar/modules/guildAr/css/memberFlow2.css +++ b/view/molistar/modules/guildAr/css/memberFlow2.css @@ -266,7 +266,7 @@ body { font-weight: 600; margin: 0; margin-left: 0.26667rem; - margin-bottom: 0.50667rem; + margin-bottom: 0.24rem; } .box h3 span { @@ -278,6 +278,15 @@ body { margin-right: 0.13333rem; } +.box .h3 { + width: 100%; + padding-left: 0.3rem; + margin-bottom: 0.50667rem; + color: #666666; + font-size: 0.37333rem; + box-sizing: border-box; +} + .box .box_in { width: 100%; height: 100%; @@ -376,7 +385,7 @@ body { } .box .box_in .ordinaryBox .ordinaryBox_in { - width: 13.5rem; + width: 16.5rem; height: 100%; } @@ -439,11 +448,12 @@ body { } .english .box .box_in .ordinaryBox .ordinaryBox_in { - width: 15rem; + width: 20.5rem; } .english .box .box_in .ordinaryBox .ordinaryBox_in .ordinary { width: 2.6rem; + margin-right: 0.8rem; } .english .header .time span { @@ -514,9 +524,13 @@ body { } .arabic .box .box_in .ordinaryBox .ordinaryBox_in { - width: 18rem; + width: 22rem; } .arabic .header .datas div span { font-size: 0.32rem; } + +.arabic .box .h3 { + padding-right: 0.65rem; +} diff --git a/view/molistar/modules/guildAr/css/memberFlow2.scss b/view/molistar/modules/guildAr/css/memberFlow2.scss index cb225f6..414f783 100644 --- a/view/molistar/modules/guildAr/css/memberFlow2.scss +++ b/view/molistar/modules/guildAr/css/memberFlow2.scss @@ -274,7 +274,7 @@ body { font-weight: 600; margin: 0; margin-left: px2rem(20); - margin-bottom: px2rem(38); + margin-bottom: px2rem(18); span { display: inline-block; @@ -286,6 +286,15 @@ body { } } + .h3 { + width: 100%; + padding-left: 0.3rem; + margin-bottom: px2rem(38); + color: #666666; + font-size: 0.37333rem; + box-sizing: border-box; + } + .box_in { width: 100%; height: 100%; @@ -386,7 +395,7 @@ body { } .ordinaryBox_in { - width: 13.5rem; + width: 16.5rem; height: 100%; .ordinary { @@ -461,10 +470,11 @@ body { } .box .box_in .ordinaryBox .ordinaryBox_in { - width: 15rem; + width: 20.5rem; .ordinary { width: 2.6rem; + margin-right: 0.8rem; } } @@ -539,10 +549,14 @@ body { } .box .box_in .ordinaryBox .ordinaryBox_in { - width: 18rem; + width: 22rem; } .header .datas div span { font-size: px2rem(24); } + + .box .h3{ + padding-right: 0.65rem; + } } \ No newline at end of file diff --git a/view/molistar/modules/guildAr/js/adminSet.js b/view/molistar/modules/guildAr/js/adminSet.js index 5bca2ff..89cfda7 100644 --- a/view/molistar/modules/guildAr/js/adminSet.js +++ b/view/molistar/modules/guildAr/js/adminSet.js @@ -62,6 +62,8 @@ function translateFun() { $('.text5').text(langReplace(localLang.adminSet.text5)); $('.text6').text(langReplace(localLang.adminSet.text6)); $('.text16').attr('placeholder', langReplace(localLang.demoModule.text16)); + $('.texts1').text(langReplace(localLang.adminSet2.text6)); + $('.texts2').text(langReplace(localLang.adminSet2.text7)); } // 搜索接口 function searchUser(erbanNo) { diff --git a/view/molistar/modules/guildAr/js/memberFlow2.js b/view/molistar/modules/guildAr/js/memberFlow2.js index 6bf1d4f..79755e1 100644 --- a/view/molistar/modules/guildAr/js/memberFlow2.js +++ b/view/molistar/modules/guildAr/js/memberFlow2.js @@ -112,6 +112,7 @@ function translateFun() { $('.text7').text(langReplace(localLang.memberFlow2.text7)); $('.text8').text(langReplace(localLang.memberFlow2.text8)); $('.text9').text(langReplace(localLang.memberFlow2.text9)); + $('.textss').text(langReplace(localLang.memberFlow2.textss)); } // 获取数据接口 function familyWage(month) { @@ -132,6 +133,7 @@ function familyWage(month) { var strLeft = ''; var strRight = ''; res.data.memberWageList.forEach((res, i) => { + console.log(res); strLeft += `
${localLang.memberFlow2.text10}
@@ -157,9 +159,13 @@ function familyWage(month) {
${localLang.memberFlow2.text13}

${unitProcessingAr(res.goldWage, 1)}

+
+
${localLang.memberFlow2.text6}
+

${unitProcessingAr(res.agentWage, 1)}

+
${localLang.memberFlow2.text14}
-

${unitProcessingAr(res.diamondRemain, 1)}

+

${res.diamondRemain == '-' ? '-' : unitProcessingAr(res.diamondRemain, 1)}

${localLang.memberFlow2.text15}
diff --git a/view/molistar/modules/guildAr/js/memberFlow222.js b/view/molistar/modules/guildAr/js/memberFlow222.js index 79054b6..1f65a60 100644 --- a/view/molistar/modules/guildAr/js/memberFlow222.js +++ b/view/molistar/modules/guildAr/js/memberFlow222.js @@ -132,6 +132,7 @@ function familyMemberWage(month) { $('.header .user img').attr('src', res.data.avatar) $('.header .user p').text(res.data.nick) $('.header .user b').text("ID:" + res.data.erbanNo) + $('.box .h3 b').text(res.data.totalGoldIncome) var strLeft = ''; var strRight = ''; res.data.dayWageList.forEach((res, i) => { diff --git a/view/molistar/modules/guildAr/local/ar.js b/view/molistar/modules/guildAr/local/ar.js index 32d0915..6927e2b 100644 --- a/view/molistar/modules/guildAr/local/ar.js +++ b/view/molistar/modules/guildAr/local/ar.js @@ -112,9 +112,10 @@ langAr = { text12: `دخل العملات الذهبية`, text13: `راتب العملات الذهبية `, text14: `رصيد الماس `, - text15: ``, + text15: `تفاصيل`, text16: `تفاصيل`, text17: `الشهر الحالي `, + textss:`إجمالي راتب العملات الذهبية:` }, memberFlow22: { text1: `الراتب الشهري للأعضاء `, diff --git a/view/molistar/modules/guildAr/local/en.js b/view/molistar/modules/guildAr/local/en.js index cb5cf06..5ffb088 100644 --- a/view/molistar/modules/guildAr/local/en.js +++ b/view/molistar/modules/guildAr/local/en.js @@ -5,7 +5,7 @@ langEn = { layerIndex3: `Network error`, text1: `Agency Name`, text2: `Agency Name`, - text3: `Administrator`, + text3: `Admin`, text4: `Settings`, text5: `Income`, text6: `Invite`, @@ -15,7 +15,7 @@ langEn = { text10: `Confirm`, text11: 'Guild Name:', text12: `Master`, - text13: `Administrator`, + text13: `Admin`, text14: `Delete`, text15: `Are you sure you want to remove this person?`, text16: `Enter MoliStar ID to Search`, @@ -38,7 +38,7 @@ langEn = { adminSet2: { text1: `Administrator`, text2: `Settings`, - text3: `Add Administrator`, + text3: `Add Admin`, text4: `No data`, text5: `Remove Administrator?`, text6: `Cancel`, @@ -110,9 +110,10 @@ langEn = { text12: `Coins Income`, text13: `Coin Salary`, text14: `Remaining Diamonds`, - text15: ``, + text15: `View`, text16: `Details`, text17: `Current`, + textss:'Total Coin Salary:' }, memberFlow22: { text1: `Member Salary`, diff --git a/view/molistar/modules/guildAr/local/zh.js b/view/molistar/modules/guildAr/local/zh.js index 33c18cd..e2b1d2a 100644 --- a/view/molistar/modules/guildAr/local/zh.js +++ b/view/molistar/modules/guildAr/local/zh.js @@ -115,6 +115,7 @@ langZh = { text15: `查看`, text16: `詳情`, text17: `本月`, + textss: `金币工资总和:`, }, memberFlow22: { text1: `成員月工資`, diff --git a/view/molistar/modules/guildAr/memberFlow2.html b/view/molistar/modules/guildAr/memberFlow2.html index 5813700..4f63e76 100644 --- a/view/molistar/modules/guildAr/memberFlow2.html +++ b/view/molistar/modules/guildAr/memberFlow2.html @@ -66,6 +66,7 @@

+
0