diff --git a/src/enums/daxpay/ChannelEnum.ts b/src/enums/daxpay/daxpayEnum.ts
similarity index 84%
rename from src/enums/daxpay/ChannelEnum.ts
rename to src/enums/daxpay/daxpayEnum.ts
index a3fe4be1..5f71adb4 100644
--- a/src/enums/daxpay/ChannelEnum.ts
+++ b/src/enums/daxpay/daxpayEnum.ts
@@ -1,7 +1,7 @@
/**
* 支付通道
*/
-export enum ChannelEnum {
+export enum DaxpayEnum {
ALI = 'ali_pay',
WECHAT = 'wechat_pay',
UNION_PAY = 'union_pay',
@@ -50,3 +50,11 @@ export enum ChannelAuthStatusEnum {
/** 数据不存在 */
NOT_EXIST = 'not_exist',
}
+
+/**
+ * 收银台类型
+ */
+export enum CashierTypeEnum {
+ WECHAT_PAY = 'wechat_pay',
+ ALIPAY = 'alipay',
+}
diff --git a/src/enums/daxpay/TradeStatusEnum.ts b/src/enums/daxpay/tradeStatusEnum.ts
similarity index 100%
rename from src/enums/daxpay/TradeStatusEnum.ts
rename to src/enums/daxpay/tradeStatusEnum.ts
diff --git a/src/views/daxpay/common/develop/auth/ChannelAuth.vue b/src/views/daxpay/common/develop/auth/ChannelAuth.vue
index ec5b1504..8bd661a0 100644
--- a/src/views/daxpay/common/develop/auth/ChannelAuth.vue
+++ b/src/views/daxpay/common/develop/auth/ChannelAuth.vue
@@ -93,7 +93,7 @@
import { merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
import { useDict } from '@/hooks/bootx/useDict'
- import { ChannelAuthStatusEnum } from '@/enums/daxpay/ChannelEnum'
+ import { ChannelAuthStatusEnum } from '@/enums/daxpay/daxpayEnum'
const { createMessage } = useMessage()
const { dictDropDown } = useDict()
diff --git a/src/views/daxpay/common/develop/trade/DevelopTrade.vue b/src/views/daxpay/common/develop/trade/DevelopTrade.vue
index ef899d8a..02f114ec 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTrade.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTrade.vue
@@ -18,7 +18,7 @@
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigList.vue b/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigList.vue
new file mode 100644
index 00000000..51e9dc5e
--- /dev/null
+++ b/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigList.vue
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已启用
+
+
+
+ 未启用
+
+
+
+ 未配置
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/merchant/cashier/ChannelCashierQrCode.vue b/src/views/daxpay/common/merchant/cashier/ChannelCashierQrCode.vue
new file mode 100644
index 00000000..0a8d203d
--- /dev/null
+++ b/src/views/daxpay/common/merchant/cashier/ChannelCashierQrCode.vue
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue b/src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue
index 2944e154..10dc62ad 100644
--- a/src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue
+++ b/src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue
@@ -6,7 +6,7 @@