From c0c70679c44799e2f2bb1120149ac491e5f1e6a9 Mon Sep 17 00:00:00 2001
From: dragon <3013557874@qq.com>
Date: Fri, 30 Aug 2024 17:50:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B4=A6=E5=8D=95=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 view/molistar/modules/guild-ar/js/bill.js   | 18 ++++++++--------
 view/molistar/modules/guild-ar/js/record.js | 24 ++++++++++-----------
 view/molistar/modules/guild-ar/local/ar.js  |  4 +++-
 view/molistar/modules/guild-ar/local/en.js  |  2 ++
 view/molistar/modules/guild-ar/local/zh.js  |  2 ++
 5 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/view/molistar/modules/guild-ar/js/bill.js b/view/molistar/modules/guild-ar/js/bill.js
index 71e95d8b..4cdd668b 100644
--- a/view/molistar/modules/guild-ar/js/bill.js
+++ b/view/molistar/modules/guild-ar/js/bill.js
@@ -99,15 +99,15 @@ function getData() {
                     // tradeType 1 收入 2支出
                     // if (item.tradeType == 1) {
                     str += `<li>
-                      <div>
-                            <p>${item.type == 1 ? `${langReplace(localLang.bill.text5)}` : item.type == 2 ? `${langReplace(localLang.bill.text6)}` : item.type == 3 ? `${langReplace(localLang.bill.text7)}` : item.type == 4 ? `ID:${type == 1 ? item.target.erbanNo : item.me.erbanNo} ${langReplace(localLang.bill.text8)} ID: ${type == 1 ? item.me.erbanNo : item.target.erbanNo}` : `${langReplace(localLang.bill.text9)}`}</p>
-                            <b>${type == 1 ? '+' + item.operateUsdNum.toLocaleString() : item.operateUsdNum.toLocaleString()} ÜS</b>
-                      </div>
-                      <div>
-                            <span>${langReplace(localLang.bill.text4)}${item.beforeUsdNum}ÜS->${item.afterUsdNum}ÜS</span>
-                            <span>${dateFormat(item.createTime, 'yyyy/MM/dd hh:mm:ss')}</span>
-                      </div>
-                  </li>`
+                            <div>
+                                    <p>${item.type == 1 ? `${langReplace(localLang.bill.text5)}` : item.type == 2 ? `${langReplace(localLang.bill.text6)}` : item.type == 3 ? `${langReplace(localLang.bill.text7)}` : item.type == 4 ? `ID:${type == 1 ? item.target.erbanNo : item.me.erbanNo} ${langReplace(localLang.bill.text8)} ID: ${type == 1 ? item.me.erbanNo : item.target.erbanNo}` : `${langReplace(localLang.bill.text9)}`}</p>
+                                    <b dir="ltr">${type == 1 ? '+ ' + item.operateUsdNum.toLocaleString() : item.operateUsdNum.toLocaleString()} ÜS</b>
+                            </div>
+                            <div>
+                                    <span>${langReplace(localLang.bill.text4)}${item.beforeUsdNum}ÜS -> ${item.afterUsdNum}ÜS</span>
+                                    <span>${dateFormat(item.createTime, 'yyyy/MM/dd hh:mm:ss')}</span>
+                            </div>
+                        </li>`
                     //     } else {
                     //         str += `<li>
                     //       <div>
diff --git a/view/molistar/modules/guild-ar/js/record.js b/view/molistar/modules/guild-ar/js/record.js
index 00a7f171..3e1cc4eb 100644
--- a/view/molistar/modules/guild-ar/js/record.js
+++ b/view/molistar/modules/guild-ar/js/record.js
@@ -104,24 +104,24 @@ function getData() {
         let str = ''
         let lastDate = ''
         originList.forEach((item, i) => {
-          console.log(lastDate);
+          console.log(lastDate,i);
           if (lastDate == '' || lastDate != item.date) {
             lastDate = item.date
-            str += `<div class="date">${item.date}</div>
+            str += `<div class="date">${dateFormat(item.createTime,'yyyy/MM/dd')}</div>
                     <li>
-                        <img src="${item.avatar}" alt="" class="avatar">
-                        <div class="name">${item.salaryNick}</div>
-                        <div class="id">ID:${item.salaryErbano}</div>
-                        <span>${langReplace(localLang.demoModule.transfer_salary)}<b>${item.tradeUsb.toLocaleString()}ÜS</b></span>
-                        <p class="coins">+${item.gold.toLocaleString()} ${langReplace(localLang.demoModule.coins)}</p>
+                        <img src="${item.target.avatar}" alt="" class="avatar">
+                        <div class="name">${item.target.nick}</div>
+                        <div class="id">ID:${item.target.erbanNo}</div>
+                        <span>${langReplace(localLang.demoModule.transfer_salary)}<b>${item.guildUsdNum.toLocaleString()}ÜS</b></span>
+                        <p class="coins">+${item.goldNum.toLocaleString()} ${langReplace(localLang.demoModule.coins)}</p>
                     </li>`
           } else {
             str += `<li>
-                        <img src="${item.avatar}" alt="" class="avatar">
-                        <div class="name">${item.salaryNick}</div>
-                        <div class="id">ID:${item.salaryErbano}</div>
-                        <span>${langReplace(localLang.demoModule.transfer_salary)}<b>${item.tradeUsb.toLocaleString()}ÜS</b></span>
-                        <p class="coins">+${item.gold.toLocaleString()} ${langReplace(localLang.demoModule.coins)}</p>
+                        <img src="${item.target.avatar}" alt="" class="avatar">
+                        <div class="name">${item.target.nick}</div>
+                        <div class="id">ID:${item.target.erbanNo}</div>
+                        <span>${langReplace(localLang.demoModule.transfer_salary)}<b>${item.guildUsdNum.toLocaleString()}ÜS</b></span>
+                        <p class="coins">+${item.goldNum.toLocaleString()} ${langReplace(localLang.demoModule.coins)}</p>
                     </li>`
           }
         })
diff --git a/view/molistar/modules/guild-ar/local/ar.js b/view/molistar/modules/guild-ar/local/ar.js
index 7b979e5f..b04461ce 100644
--- a/view/molistar/modules/guild-ar/local/ar.js
+++ b/view/molistar/modules/guild-ar/local/ar.js
@@ -32,7 +32,9 @@ langAr = {
         newtext4: "إعدادات مشرف النقابة",
         newtext5: "مستوى النقابة",
         newtext6: "المستوى الحالي للنقابة:",
-        newtext7: "الترقية المطلوبة:"
+        newtext7: "الترقية المطلوبة:",
+        coins: "عملات",
+        transfer_salary: "تحويل الراتب:"
     },
     adminSet: {
         text1: `إعدادات المشرف`,
diff --git a/view/molistar/modules/guild-ar/local/en.js b/view/molistar/modules/guild-ar/local/en.js
index 64494495..c85c5b0c 100644
--- a/view/molistar/modules/guild-ar/local/en.js
+++ b/view/molistar/modules/guild-ar/local/en.js
@@ -31,6 +31,8 @@ langEn = {
         newtext5: "Agency level",
         newtext6: "Current Agency Lv:",
         newtext7: "Next level need:",
+        coins: "Coins",
+        transfer_salary: "Salary Transfer:"
     },
     adminSet: {
         text1: `Administrator`,
diff --git a/view/molistar/modules/guild-ar/local/zh.js b/view/molistar/modules/guild-ar/local/zh.js
index b261d5d8..024d0204 100644
--- a/view/molistar/modules/guild-ar/local/zh.js
+++ b/view/molistar/modules/guild-ar/local/zh.js
@@ -33,6 +33,8 @@ langZh = {
         newtext5: "公會等級",
         newtext6: "當前公會等級：",
         newtext7: "升級所需：",
+        coins: "金幣",
+        transfer_salary: "薪资转账:",
     },
     adminSet: {
         text1: `管理員設置`,