diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js
index aab1c9b..409ea55 100644
--- a/src/components/locales/lang/en.js
+++ b/src/components/locales/lang/en.js
@@ -934,6 +934,7 @@ export default {
other: "Other",
currentBalance: "Current Balance",
transactionType: "Type",
+ transactionCurrency: "Currency",
transactionDesc: "Desc",
transactionOrderNo: "Order No.",
transactionStatus: "Status",
diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js
index 827b0c0..831b778 100644
--- a/src/components/locales/lang/zh-CN.js
+++ b/src/components/locales/lang/zh-CN.js
@@ -941,6 +941,7 @@ export default {
other: "其他",
currentBalance: "当前余额",
transactionType: "交易类型",
+ transactionCurrency: "交易币种",
transactionDesc: "交易说明",
transactionOrderNo: "交易单号",
transactionStatus: "交易状态",
diff --git a/src/utils/menuUtils.js b/src/utils/menuUtils.js
index 612c42d..d073102 100644
--- a/src/utils/menuUtils.js
+++ b/src/utils/menuUtils.js
@@ -92,8 +92,8 @@ export const getRoutePath = (menu) => {
"152": "/walletManage/walletDetail", // 钱包明细
"153": "/walletManage/walletDetail/hkWallet", // 香港钱包
"154": "/walletManage/walletDetail/sgWalletHC", // 新加坡HC钱包
- "155": "/walletManage/walletDetail/sgWalletCM", // 新加坡CM钱包
- "156": "/walletManage/walletDetail/myWallet", // 马来西亚钱包
+ "156": "/walletManage/walletDetail/sgWalletCM", // 新加坡CM钱包
+ "155": "/walletManage/walletDetail/myWallet", // 马来西亚钱包
"157": "/walletManage/walletDetail/caWallet", // 加拿大钱包
"158": "/walletManage/walletDetail/thWalletHS", // 泰国HS钱包
"159": "/walletManage/walletDetail/thWalletHA", // 泰国HA钱包
diff --git a/src/views/moneyManage/financialAccount/performanceAttribution.vue b/src/views/moneyManage/financialAccount/performanceAttribution.vue
index 120ce24..3cc411e 100644
--- a/src/views/moneyManage/financialAccount/performanceAttribution.vue
+++ b/src/views/moneyManage/financialAccount/performanceAttribution.vue
@@ -622,6 +622,7 @@ onMounted( async() => {
cursor: pointer;
border: none;
background-color: #7349ad;
+ margin-left: auto;
}
.table-card {
@@ -662,7 +663,7 @@ onMounted( async() => {
position: relative;
width: 100%;
height: 50px; /* Set a fixed height to make diagonal line work well */
- background: linear-gradient(to bottom right, transparent 49.5%, #dcdfe6 49.5%, #dcdfe6 50.5%, transparent 50.5%);
+ background: linear-gradient(to top right, transparent 49.5%, #dcdfe6 49.5%, #dcdfe6 50.5%, transparent 50.5%);
}
.diagonal-header .top-right {
position: absolute;
diff --git a/src/views/walletManage/WalletBalance.vue b/src/views/walletManage/WalletBalance.vue
index b2213ef..b11524d 100644
--- a/src/views/walletManage/WalletBalance.vue
+++ b/src/views/walletManage/WalletBalance.vue
@@ -646,7 +646,7 @@ const format3 = (num) => {
{{ $t('common.search') }}
{{ $t('common.reset') }}
{{ $t('common.exportExcel') }}
- {{ $t('common.exportCompanyWalletDetail') }}
+
{{ $t('common.viewExportList') }}
diff --git a/src/views/walletManage/components/WalletDetailTemplate.vue b/src/views/walletManage/components/WalletDetailTemplate.vue
index e70722b..4f70494 100644
--- a/src/views/walletManage/components/WalletDetailTemplate.vue
+++ b/src/views/walletManage/components/WalletDetailTemplate.vue
@@ -297,6 +297,7 @@ onMounted(() => {
{{ scope.row.time }}
+
diff --git a/src/views/walletManage/walletDetail/BJWallet.vue b/src/views/walletManage/walletDetail/BJWallet.vue
index cba6eff..9d1a626 100644
--- a/src/views/walletManage/walletDetail/BJWallet.vue
+++ b/src/views/walletManage/walletDetail/BJWallet.vue
@@ -1,7 +1,7 @@
-
+