From 25c5aeb21fd483b46e92f4a26227f3370a94af96 Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Mon, 15 Jun 2026 15:01:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9C=8D=E5=8A=A1=E5=95=86=E9=80=9A?= =?UTF-8?q?=E9=81=93=E5=95=86=E6=88=B7=E5=88=9B=E5=BB=BA=E6=97=B6=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E6=8E=88=E6=9D=83=E4=BB=A4=E7=89=8C=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E9=9D=9E=E5=BF=85=E5=A1=AB=EF=BC=8C=E5=9F=BA=E7=A1=80=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=B7=BB=E5=8A=A0=E4=BB=A3=E8=BF=90=E8=90=A5=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E5=8D=A1=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../channel/alipay/channel-merchant.api.ts | 2 +- .../payment/merchant/channelMerchant.json | 2 ++ .../payment/merchant/channelMerchant.json | 2 ++ .../alipay/config/AlipayMchCreateConfig.vue | 2 +- .../mch/AlipayChannelMerchantManage.vue | 33 ++++++++++++++----- .../alipay/manage/mch/AlipayMchManage.vue | 1 - 6 files changed, 30 insertions(+), 12 deletions(-) diff --git a/apps/daxpay-admin/src/api/payment/channel/alipay/channel-merchant.api.ts b/apps/daxpay-admin/src/api/payment/channel/alipay/channel-merchant.api.ts index 6cf33aff8..670708313 100644 --- a/apps/daxpay-admin/src/api/payment/channel/alipay/channel-merchant.api.ts +++ b/apps/daxpay-admin/src/api/payment/channel/alipay/channel-merchant.api.ts @@ -87,7 +87,7 @@ export interface AlipayIsvChannelMerchantCreateParam { /** 子商户支付宝用户ID(2088开头) */ alipayUserId: string; /** 应用授权令牌 */ - appAuthToken: string; + appAuthToken?: string; } /** diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/channelMerchant.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/channelMerchant.json index a0faa7b4f..9758ef245 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/channelMerchant.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/channelMerchant.json @@ -17,6 +17,8 @@ "groupApp": "App Management", "cardBasicInfo": "Basic Info", "cardBasicInfoDesc": "View channel merchant basic configuration", + "cardAuthOperation": "Auth Operation", + "cardAuthOperationDesc": "Authorize platform to operate Alipay merchant, get app auth token", "cardApp": "App Management", "cardAppDesc": "Channel merchant app creation and management", "basicInfoDrawerTitle": "Basic Info", diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/channelMerchant.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/channelMerchant.json index 7d36a0d65..dbcaa4baa 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/channelMerchant.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/channelMerchant.json @@ -17,6 +17,8 @@ "groupApp": "应用管理", "cardBasicInfo": "基本信息", "cardBasicInfoDesc": "查看通道商户基础配置信息", + "cardAuthOperation": "代运营授权", + "cardAuthOperationDesc": "授权平台代运营支付宝商户，获取应用授权令牌", "cardApp": "应用管理", "cardAppDesc": "通道商户应用创建与管理", "basicInfoDrawerTitle": "基本信息", diff --git a/apps/daxpay-admin/src/views/payment/channel/alipay/config/AlipayMchCreateConfig.vue b/apps/daxpay-admin/src/views/payment/channel/alipay/config/AlipayMchCreateConfig.vue index b588aa626..ba7fa6912 100644 --- a/apps/daxpay-admin/src/views/payment/channel/alipay/config/AlipayMchCreateConfig.vue +++ b/apps/daxpay-admin/src/views/payment/channel/alipay/config/AlipayMchCreateConfig.vue @@ -66,7 +66,7 @@ const rules = computed(() => ({ channelMerchantName: [{ required: true, message: $t('payment.merchant.channelMerchant.channelMerchantNameRequired') }], appId: [{ required: true, message: $t('payment.merchant.channelMerchant.alipayIsvAppRequired') }], alipayUserId: [{ required: true, message: $t('payment.merchant.channelMerchant.alipaySubMerchantNoRequired') }], - appAuthToken: [{ required: true, message: $t('payment.merchant.channelMerchant.appAuthTokenRequired') }], + appAuthToken: [{ required: false }], })); /** 支付宝应用下拉选项(值为系统主键id, 展示应用名+支付宝APPID便于识别) */ diff --git a/apps/daxpay-admin/src/views/payment/channel/alipay/manage/mch/AlipayChannelMerchantManage.vue b/apps/daxpay-admin/src/views/payment/channel/alipay/manage/mch/AlipayChannelMerchantManage.vue index 06b7da90d..a65732711 100644 --- a/apps/daxpay-admin/src/views/payment/channel/alipay/manage/mch/AlipayChannelMerchantManage.vue +++ b/apps/daxpay-admin/src/views/payment/channel/alipay/manage/mch/AlipayChannelMerchantManage.vue @@ -6,6 +6,7 @@ import { $t } from '@vben/locales'; import { IconifyIcon } from '@vben-core/icons'; import type { ChannelMerchantResult } from '#/api/payment/channel/channel-merchant.api'; +import { useMessage } from '#/hooks/useMessage'; import AlipayChannelMerchantBasicInfo from './AlipayChannelMerchantBasicInfo.vue'; @@ -15,6 +16,7 @@ const mchNo = ref(''); const channelMchNo = ref(''); const channelMerchant = ref({}); const basicInfoRef = ref>(); +const { message } = useMessage(); /** 功能卡片配置（服务商通道商户：仅基本信息） */ const functionCards = computed(() => [ @@ -22,15 +24,22 @@ const functionCards = computed(() => [ // 国际化：基础管理 group: $t('payment.merchant.channelMerchant.groupBasic'), color: 'blue', - cards: [ - { - key: 'basicInfo', - // 国际化：基本信息 - title: $t('payment.merchant.channelMerchant.cardBasicInfo'), - icon: 'ant-design:info-circle-outlined', - description: $t('payment.merchant.channelMerchant.cardBasicInfoDesc'), - }, - ], + cards: [ + { + key: 'basicInfo', + // 国际化：基本信息 + title: $t('payment.merchant.channelMerchant.cardBasicInfo'), + icon: 'ant-design:info-circle-outlined', + description: $t('payment.merchant.channelMerchant.cardBasicInfoDesc'), + }, + { + key: 'authOperation', + // 国际化：代运营授权 + title: $t('payment.merchant.channelMerchant.cardAuthOperation'), + icon: 'ant-design:safety-certificate-outlined', + description: $t('payment.merchant.channelMerchant.cardAuthOperationDesc'), + }, + ], }, ]); @@ -60,6 +69,12 @@ function init(no: string, mchChannelNo: string, summary: ChannelMerchantResult) function handleCardClick(card: { key: string }) { if (card.key === 'basicInfo') { basicInfoRef.value?.open(); + return; + } + if (card.key === 'authOperation') { + // 国际化：功能开发中，敬请期待 + message.info($t('payment.merchant.channelMerchant.developing')); + return; } } diff --git a/apps/daxpay-admin/src/views/payment/channel/alipay/manage/mch/AlipayMchManage.vue b/apps/daxpay-admin/src/views/payment/channel/alipay/manage/mch/AlipayMchManage.vue index 6ec4f8185..5ce018af8 100644 --- a/apps/daxpay-admin/src/views/payment/channel/alipay/manage/mch/AlipayMchManage.vue +++ b/apps/daxpay-admin/src/views/payment/channel/alipay/manage/mch/AlipayMchManage.vue @@ -20,7 +20,6 @@ const channelMchNo = ref(''); const channelMerchant = ref({}); const basicInfoRef = ref>(); - /** 功能卡片配置 */ const functionCards = computed(() => [ {