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 @@
${localLang.memberFlow2.text10}
@@ -157,9 +159,13 @@ function familyWage(month) {
${localLang.memberFlow2.text13}
${unitProcessingAr(res.goldWage, 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 @@