Merge branch 'zhangrenyuan/feature-20260326164720-日常优化3.0' into milestone-20260328-金币日常优化3.0

src/components/locales/lang/en.js

@@ -1137,6 +1137,8 @@ export default {
       ipay88: "Ipay88",
       paymentAsia: "PaymentAsia",
       transfer: "E-Transfer",
+      iotPay: "IOT Pay",
+      stripe3:'Stripe3',
       paysolution:'paysolution',
       stripe2:'Stripe2',
     },

src/components/locales/lang/zh-CN.js

@@ -1150,6 +1150,8 @@ export default {
       ipay88: "Ipay88",
       paymentAsia: "PaymentAsia",
       transfer: "E-Transfer",
+      iotPay: "IOT Pay",
+      stripe3:'Stripe3',
       paysolution:'paysolution',
       stripe2:'Stripe2',
     },

src/views/moneyManage/executor/executor.vue

@@ -469,6 +469,8 @@ const channelOptions = ref([
   t('cash.payMethods.grabpay'),
   t('cash.payMethods.nets'),
   t('cash.payMethods.transfer'),
+  t('cash.payMethods.iotPay'),
+  t('cash.payMethods.stripe3'),
   t('cash.payMethods.paypal'),
 ])
 

src/views/moneyManage/financialAccount/cashFlow.vue

@@ -25,6 +25,8 @@ const paytypeList = [
   t('cash.payMethods.grabpay'),     // Grabpay
   t('cash.payMethods.nets'),        // Nets
   t('cash.payMethods.transfer'),    // E-Transfer
+  t('cash.payMethods.iotPay'),      // IOT Pay
+  t('cash.payMethods.stripe3'),     // Stripe3
   t('cash.payMethods.paypal'),      // PayPal
   t('cash.payMethods.paysolution'), // Paysolution
   t('cash.payMethods.bankTransfer'),// 银行转账

src/views/moneyManage/financialAccount/performanceAttribution.vue

@@ -24,6 +24,8 @@ const paytypeList = [
     t('cash.payMethods.grabpay'),
     t('cash.payMethods.nets'),
     t('cash.payMethods.transfer'),
+    t('cash.payMethods.iotPay'),
+    t('cash.payMethods.stripe3'),
     t('cash.payMethods.paypal'),
 ]
 

src/views/moneyManage/receiveDetail/receiveFinance.vue

@@ -779,6 +779,8 @@ const paytypeList = [
     t('cash.payMethods.grabpay'),     // Grabpay
     t('cash.payMethods.nets'),        // Nets
     t('cash.payMethods.transfer'),    // E-Transfer
+    t('cash.payMethods.iotPay'),      // IOT Pay
+    t('cash.payMethods.stripe3'),     // Stripe3
     t('cash.payMethods.paypal'),      // PayPal
     t('cash.payMethods.paysolution'), // Paysolution
     t('cash.payMethods.bankTransfer'),// 银行转账

src/views/moneyManage/receiveDetail/receiveHead.vue

@@ -764,6 +764,8 @@ const paytypeList = ref([
     t('cash.payMethods.grabpay'),     // Grabpay
     t('cash.payMethods.nets'),        // Nets
     t('cash.payMethods.transfer'),    // E-Transfer
+    t('cash.payMethods.iotPay'),      // IOT Pay
+    t('cash.payMethods.stripe3'),     // Stripe3
     t('cash.payMethods.paypal'),      // PayPal
     t('cash.payMethods.bankTransfer'),// 银行转账
     t('cash.payMethods.card'),        // 刷卡

src/views/moneyManage/receiveDetail/receiveManage.vue

@@ -779,6 +779,8 @@ const paytypeList = [
     t('cash.payMethods.grabpay'),     // Grabpay
     t('cash.payMethods.nets'),        // Nets
     t('cash.payMethods.transfer'),    // E-Transfer
+    t('cash.payMethods.iotPay'),      // IOT Pay
+    t('cash.payMethods.stripe3'),     // Stripe3
     t('cash.payMethods.paypal'),      // PayPal
     t('cash.payMethods.paysolution'), // Paysolution
     t('cash.payMethods.bankTransfer'),// 银行转账

src/views/moneyManage/receiveDetail/receiveService.vue

@@ -697,7 +697,7 @@ const ifGroup = () => {
         isGroup.value = true
         addFormData.value.receivedMarket = t('cash.markets.Malaysia')
         addFormData.value.receivedWallet = t('cash.wallet.MalaysiaWallet')
-    } else if (addFormData.value.payType === t('cash.payMethods.transfer')) {
+    } else if (addFormData.value.payType === t('cash.payMethods.transfer') || addFormData.value.payType === t('cash.payMethods.iotPay') || addFormData.value.payType === t('cash.payMethods.stripe3')) {
         isGroup.value = true
         addFormData.value.receivedMarket = t('cash.markets.Canada')
         addFormData.value.receivedWallet = t('cash.wallet.CanadaWallet')
@@ -1034,6 +1034,8 @@ const paytypeOptions = ref([
     t('cash.payMethods.grabpay'),     // Grabpay
     t('cash.payMethods.nets'),        // Nets
     t('cash.payMethods.transfer'),    // E-Transfer
+    t('cash.payMethods.iotPay'),      // IOT Pay
+    t('cash.payMethods.stripe3'),     // Stripe3
     t('cash.payMethods.paypal'),      // PayPal
     t('cash.payMethods.paysolution'), // Paysolution
     t('cash.payMethods.bankTransfer'),// 银行转账
@@ -1330,6 +1332,8 @@ const paytypeList = ref([
     t('cash.payMethods.grabpay'),     // Grabpay
     t('cash.payMethods.nets'),        // Nets
     t('cash.payMethods.transfer'),    // E-Transfer
+    t('cash.payMethods.iotPay'),      // IOT Pay
+    t('cash.payMethods.stripe3'),     // Stripe3
     t('cash.payMethods.paypal'),      // PayPal
     t('cash.payMethods.paysolution'), // Paysolution
     t('cash.payMethods.bankTransfer'),// 银行转账

src/views/moneyManage/receiveDetail/utils/staticData.js

@@ -291,6 +291,10 @@ export const normalizePayType = (name) => {
     return 'PaymentAsia'
   } else if (name == t('cash.payMethods.transfer') || name == 'E-Transfer') {
     return 'E-Transfer'
+  } else if (name == t('cash.payMethods.iotPay') || name == 'IOT Pay') {
+    return 'IOT Pay'
+  } else if (name == t('cash.payMethods.stripe3') || name == 'Stripe3') {
+    return 'Stripe3'
   } else if (name == t('cash.payMethods.grabpay') || name == 'Grabpay') {
     return 'Grabpay'
   } else if (name == t('cash.payMethods.nets') || name == 'Nets') {

src/views/moneyManage/refundDetail/refundCharge.vue

@@ -441,6 +441,8 @@ const channelOptions = computed(() => [
     t('cash.payMethods.grabpay'),
     t('cash.payMethods.nets'),
     t('cash.payMethods.transfer'),
+    t('cash.payMethods.iotPay'),
+    t('cash.payMethods.stripe3'),
     t('cash.payMethods.paypal')
 ])
 const statusList = computed(() => [

src/views/moneyManage/refundDetail/refundFinance.vue

@@ -420,6 +420,8 @@ const channelOptions = computed(() => [
     t('cash.payMethods.grabpay'),
     t('cash.payMethods.nets'),
     t('cash.payMethods.transfer'),
+    t('cash.payMethods.iotPay'),
+    t('cash.payMethods.stripe3'),
     t('cash.payMethods.paypal')
 ])
 const statusList = computed(() => [

src/views/moneyManage/refundDetail/refundHeader.vue

@@ -441,6 +441,8 @@ const channelOptions = computed(() => [
     t('cash.payMethods.grabpay'),
     t('cash.payMethods.nets'),
     t('cash.payMethods.transfer'),
+    t('cash.payMethods.iotPay'),
+    t('cash.payMethods.stripe3'),
     t('cash.payMethods.paypal')
 ])
 const statusList = computed(() => [

src/views/moneyManage/refundDetail/refundService.vue

@@ -580,6 +580,8 @@ const channelOptions = computed(() => [
   t('cash.payMethods.grabpay'),     // Grabpay
   t('cash.payMethods.nets'),        // Nets
   t('cash.payMethods.transfer'),    // E-Transfer
+  t('cash.payMethods.iotPay'),      // IOT Pay
+  t('cash.payMethods.stripe3'),     // Stripe3
   t('cash.payMethods.paypal'),      // PayPal
   t('cash.payMethods.paysolution'), // Paysolution
   t('cash.payMethods.bankTransfer'),// 银行转账

src/views/usergold/gold/clientCountWallet.vue

@@ -84,6 +84,7 @@ const getObj = ref({
 // 新增排序字段和排序方式
 const sortField = ref('')
 const sortOrder = ref('')
+const sortWalletId = ref('')
 
 // 方法
 // 搜索===========================================================================
@@ -122,6 +123,18 @@ const get = async function (val) {
       params.market = String(selectData.value.markets[0])
     }
 
+    if (sortField.value) {
+      params.sortField = sortField.value
+    }
+
+    if (sortOrder.value) {
+      params.sortOrder = sortOrder.value
+    }
+
+    if (sortWalletId.value !== '') {
+      params.sortWalletId = sortWalletId.value
+    }
+
     console.log('最终请求参数', params)
 
     const result = await API({
@@ -188,6 +201,7 @@ const reset = function () {
   }
   sortField.value = ''
   sortOrder.value = ''
+  sortWalletId.value = ''
   selectedMarketPath.value = []
   // 重置页码
   getObj.value.pageNum = 1
@@ -301,10 +315,23 @@ const handleWalletDetailCurrentChange = (val) => {
 const handleSortChange = (column) => {
   console.log('排序字段：', column.prop)
   console.log('排序方式：', column.order)
-  if (column.prop) {
-    sortField.value = column.prop.replace(/([A-Z])/g, "_$1").toLowerCase();
+
+  if (!column.prop || !column.order) {
+    sortField.value = ''
+    sortOrder.value = ''
+    sortWalletId.value = ''
+    getObj.value.pageNum = 1
+    get()
+    return
+  }
+
+  if (propToWalletId[column.prop]) {
+    sortField.value = 'currentPermanentGold'
+    sortWalletId.value = propToWalletId[column.prop]
   }
+
   sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC'
+  getObj.value.pageNum = 1
   get()
 }
 
@@ -392,8 +419,7 @@ const exportExcelOnlyOne = async function () {
     pageNum: 1, // 导出通常从第一页开始
     pageSize: 10000, // 导出大量数据，或者不传让后端处理全部？通常传大值
     userWalletRecord: {
-      // id从1开始，后端walletId从2开始，需要+1
-      walletId: selectWalletForm.value.companyWalletId + 1,
+      walletId: selectWalletForm.value.companyWalletId,
       jwcode: selectData.value.jwcode ? Number(selectData.value.jwcode) : null
     }
   }
@@ -438,39 +464,39 @@ const closeSelectWallet = () => {
 const selectWalletForm = ref({})
 const companyWalletList = ref([
   {
-    id: 1,
+    id: 2,
     name: t('clientCount.market.hkGold') + t('clientCount.wallet')
   },
   {
-    id: 2,
+    id: 3,
     name: t('clientCount.market.sgHcGold')
   },
   {
-    id: 3,
+    id: 4,
     name: t('clientCount.market.myGold')
   },
   {
-    id: 4,
+    id: 5,
     name: t('clientCount.market.sgCmGold')
   },
   {
-    id: 5,
+    id: 6,
     name: t('clientCount.market.caGold')
   },
   {
-    id: 6,
+    id: 7,
     name: t('clientCount.market.thHsGold')
   },
   {
-    id: 7,
+    id: 8,
     name: t('clientCount.market.thHaGold')
   },
   {
-    id: 8,
+    id: 9,
     name: t('clientCount.market.vnGold')
   },
   {
-    id: 9,
+    id: 10,
     name: t('clientCount.market.bjGold')
   }
 ])