From f8c12617775c932a1116f65e738445cb8b5bfb38 Mon Sep 17 00:00:00 2001 From: jiangcheng Date: Thu, 2 Apr 2026 14:54:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=8A=E5=A4=9A=E8=AF=AD=E8=A8=80=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/activityManage/activity.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/activityManage/activity.vue b/src/views/activityManage/activity.vue index d4e03f2..f5b072e 100644 --- a/src/views/activityManage/activity.vue +++ b/src/views/activityManage/activity.vue @@ -67,8 +67,8 @@ From 6551fee08837bfc011d69afa843b814c0fad0ce4 Mon Sep 17 00:00:00 2001 From: ZhangYong Date: Thu, 2 Apr 2026 15:27:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/.env.development b/.env.development index 94b830f..38e25f8 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,22 @@ -VITE_API_BASE='https://hwjb.homilychart.com/prod' -# VITE_API_BASE='http://192.168.8.246:8081/' -VITE_UPLOAD_URL=https://api.homilychart.com/hljw/api/aws/upload +VITE_API_BASE='https://hwjb.homilychart.com/dev/admin/' +# 测试环境 +# VITE_API_BASE='http://54.255.212.181:10704/' +# 正式环境 +# VITE_API_BASE='http://54.255.212.181:10705/' +VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload +# sunjiabei +# VITE_API_BASE='http://192.168.9.28:8081/' +# VITE_API_BASE='http://192.168.5.92:8081/' +# 张勇 +# VITE_API_BASE='http://192.168.40.72:8081/' +# 本地 +# VITE_API_BASE='http://localhost:8081/' +# 孙加倍 +# VITE_API_BASE='http://192.168.40.12:8081' +# 黄其振 +# VITE_API_BASE='http://192.168.40.17:8081' +# Lijianlin +# VITE_API_BASE='http://192.168.40.9:8081/' +# VITE_API_BASE='http://localhost:8081/' +# 汪国瑞 +# VITE_API_BASE='http://192.168.40.30:8081/' \ No newline at end of file From 083e4b9efc846db1d2bcb9dbee6be84b352f0cba Mon Sep 17 00:00:00 2001 From: ZhangYong Date: Thu, 2 Apr 2026 15:33:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=8A=A0=E4=B8=8Astripe2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/moneyManage/executor/executor.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue index ded00c7..2e0de0f 100644 --- a/src/views/moneyManage/executor/executor.vue +++ b/src/views/moneyManage/executor/executor.vue @@ -515,6 +515,7 @@ const channelOptions = ref([ t('cash.payMethods.transfer'), t('cash.payMethods.iotPay'), t('cash.payMethods.stripe3'), + t('cash.payMethods.stripe2'), t('cash.payMethods.paypal'), ]) From caae87cfd338153c7b5b99ad4037ee203aa1edaa Mon Sep 17 00:00:00 2001 From: ZhangYong Date: Thu, 2 Apr 2026 17:10:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8A=A0=E4=BA=86=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/SvgIcons/wallet_management.svg | 1 + src/router/index.js | 86 ++ src/views/home.vue | 1 + src/views/walletManage/WalletBalance.vue | 906 +++++++++++++++++++++ .../components/WalletDetailTemplate.vue | 36 + src/views/walletManage/walletDetail/BJWallet.vue | 10 + src/views/walletManage/walletDetail/CAWallet.vue | 10 + src/views/walletManage/walletDetail/HKWallet.vue | 11 + src/views/walletManage/walletDetail/MyWallet.vue | 10 + src/views/walletManage/walletDetail/SGWalletCM.vue | 10 + src/views/walletManage/walletDetail/SGWalletHC.vue | 10 + src/views/walletManage/walletDetail/THWalletHA.vue | 10 + src/views/walletManage/walletDetail/THWalletHS.vue | 10 + src/views/walletManage/walletDetail/VNWallet.vue | 10 + 14 files changed, 1121 insertions(+) create mode 100644 src/assets/SvgIcons/wallet_management.svg create mode 100644 src/views/walletManage/WalletBalance.vue create mode 100644 src/views/walletManage/components/WalletDetailTemplate.vue create mode 100644 src/views/walletManage/walletDetail/BJWallet.vue create mode 100644 src/views/walletManage/walletDetail/CAWallet.vue create mode 100644 src/views/walletManage/walletDetail/HKWallet.vue create mode 100644 src/views/walletManage/walletDetail/MyWallet.vue create mode 100644 src/views/walletManage/walletDetail/SGWalletCM.vue create mode 100644 src/views/walletManage/walletDetail/SGWalletHC.vue create mode 100644 src/views/walletManage/walletDetail/THWalletHA.vue create mode 100644 src/views/walletManage/walletDetail/THWalletHS.vue create mode 100644 src/views/walletManage/walletDetail/VNWallet.vue diff --git a/src/assets/SvgIcons/wallet_management.svg b/src/assets/SvgIcons/wallet_management.svg new file mode 100644 index 0000000..f031c3c --- /dev/null +++ b/src/assets/SvgIcons/wallet_management.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index d995309..606fb2a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -413,6 +413,92 @@ const routes = [ } ] }, + // 钱包管理 + { + path: 'walletManage', + name: 'walletManage', + meta: {permissionId: 150}, + children: [ + // 钱包余额 + { + path: 'walletBalance', + name: "walletBalance", + component: () => import("../views/walletManage/WalletBalance.vue"), + meta: {permissionId: 151} + }, + // 钱包明细 + { + path: 'walletDetail', + name: "walletDetail", + meta: {permissionId: 152}, + children: [ + // 香港钱包 + { + path: 'hkWallet', + name: "hkWallet", + component: () => import("../views/walletManage/walletDetail/HKWallet.vue"), + meta: {permissionId: 153} + }, + //新加坡HC钱包 + { + path: 'sgWalletHC', + name: "sgWalletHC", + component: () => import("../views/walletManage/walletDetail/SGWalletHC.vue"), + meta: {permissionId: 154} + }, + //马来钱包 + { + path: 'myWallet', + name: "myWallet", + component: () => import("../views/walletManage/walletDetail/MyWallet.vue"), + meta: {permissionId: 155} + }, + // 新加坡CM钱包 + { + path: 'sgWalletCM', + name: "sgWalletCM", + component: () => import("../views/walletManage/walletDetail/SGWalletCM.vue"), + meta: {permissionId: 156} + }, + // 加拿大钱包 + { + path: 'caWallet', + name: "caWallet", + component: () => import("../views/walletManage/walletDetail/CAWallet.vue"), + meta: {permissionId: 157} + }, + //泰国HS钱包 + { + path: 'thWalletHS', + name: "thWalletHS", + component: () => import("../views/walletManage/walletDetail/THWalletHS.vue"), + meta: {permissionId: 158} + }, + //泰国HA钱包 + { + path: 'thWalletHA', + name: "thWalletHA", + component: () => import("../views/walletManage/walletDetail/THWalletHA.vue"), + meta: {permissionId: 159} + }, + //越南钱包 + { + path: 'vnWallet', + name: "vnWallet", + component: () => import("../views/walletManage/walletDetail/VNWallet.vue"), + meta: {permissionId: 160} + }, + //北京钱包 + { + path: 'bjWallet', + name: "bjWallet", + component: () => import("../views/walletManage/walletDetail/BJWallet.vue"), + meta: {permissionId: 161} + }, + ] + }, + ] + }, // 频道管理 { path: 'channelManage', diff --git a/src/views/home.vue b/src/views/home.vue index d6421b6..dcd7430 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -33,6 +33,7 @@ const menuNameMap = { '124': 'channel-management', //频道管理 '128': 'permission-management', //权限管理 '146': 'mutiple-language', //多语言配置 + '150': 'wallet_management', //钱包管理 } const getIconPath = (menuNameId) => { diff --git a/src/views/walletManage/WalletBalance.vue b/src/views/walletManage/WalletBalance.vue new file mode 100644 index 0000000..b2213ef --- /dev/null +++ b/src/views/walletManage/WalletBalance.vue @@ -0,0 +1,906 @@ + + + + + diff --git a/src/views/walletManage/components/WalletDetailTemplate.vue b/src/views/walletManage/components/WalletDetailTemplate.vue new file mode 100644 index 0000000..49179b4 --- /dev/null +++ b/src/views/walletManage/components/WalletDetailTemplate.vue @@ -0,0 +1,36 @@ + + + \ No newline at end of file diff --git a/src/views/walletManage/walletDetail/BJWallet.vue b/src/views/walletManage/walletDetail/BJWallet.vue new file mode 100644 index 0000000..7878883 --- /dev/null +++ b/src/views/walletManage/walletDetail/BJWallet.vue @@ -0,0 +1,10 @@ + + + + diff --git a/src/views/walletManage/walletDetail/CAWallet.vue b/src/views/walletManage/walletDetail/CAWallet.vue new file mode 100644 index 0000000..13b1287 --- /dev/null +++ b/src/views/walletManage/walletDetail/CAWallet.vue @@ -0,0 +1,10 @@ + + + + diff --git a/src/views/walletManage/walletDetail/HKWallet.vue b/src/views/walletManage/walletDetail/HKWallet.vue new file mode 100644 index 0000000..017c7fb --- /dev/null +++ b/src/views/walletManage/walletDetail/HKWallet.vue @@ -0,0 +1,11 @@ + + + + diff --git a/src/views/walletManage/walletDetail/MyWallet.vue b/src/views/walletManage/walletDetail/MyWallet.vue new file mode 100644 index 0000000..1ad4a01 --- /dev/null +++ b/src/views/walletManage/walletDetail/MyWallet.vue @@ -0,0 +1,10 @@ + + + + diff --git a/src/views/walletManage/walletDetail/SGWalletCM.vue b/src/views/walletManage/walletDetail/SGWalletCM.vue new file mode 100644 index 0000000..72d946e --- /dev/null +++ b/src/views/walletManage/walletDetail/SGWalletCM.vue @@ -0,0 +1,10 @@ + + + + diff --git a/src/views/walletManage/walletDetail/SGWalletHC.vue b/src/views/walletManage/walletDetail/SGWalletHC.vue new file mode 100644 index 0000000..c82094e --- /dev/null +++ b/src/views/walletManage/walletDetail/SGWalletHC.vue @@ -0,0 +1,10 @@ + + + + diff --git a/src/views/walletManage/walletDetail/THWalletHA.vue b/src/views/walletManage/walletDetail/THWalletHA.vue new file mode 100644 index 0000000..1e898c3 --- /dev/null +++ b/src/views/walletManage/walletDetail/THWalletHA.vue @@ -0,0 +1,10 @@ + + + + diff --git a/src/views/walletManage/walletDetail/THWalletHS.vue b/src/views/walletManage/walletDetail/THWalletHS.vue new file mode 100644 index 0000000..3717d81 --- /dev/null +++ b/src/views/walletManage/walletDetail/THWalletHS.vue @@ -0,0 +1,10 @@ + + + + diff --git a/src/views/walletManage/walletDetail/VNWallet.vue b/src/views/walletManage/walletDetail/VNWallet.vue new file mode 100644 index 0000000..dc8976b --- /dev/null +++ b/src/views/walletManage/walletDetail/VNWallet.vue @@ -0,0 +1,10 @@ + + + +