diff --git a/src/views/daxpay/common/config/cashier/checkout/CheckoutConfig.api.vue b/src/views/daxpay/common/config/cashier/checkout/CheckoutConfig.api.vue
deleted file mode 100644
index 0a8d203dd..000000000
--- a/src/views/daxpay/common/config/cashier/checkout/CheckoutConfig.api.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/views/daxpay/common/config/cashier/code/CashierCodeConfigEdit.vue b/src/views/daxpay/common/config/cashier/code/CashierCodeConfigEdit.vue
index 34459b1ec..a781b694c 100644
--- a/src/views/daxpay/common/config/cashier/code/CashierCodeConfigEdit.vue
+++ b/src/views/daxpay/common/config/cashier/code/CashierCodeConfigEdit.vue
@@ -8,36 +8,38 @@
:mask-closable="showable"
@cancel="handleCancel"
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
取消
diff --git a/src/views/daxpay/common/config/cashier/code/CashierCodeTypeConfigEdit.vue b/src/views/daxpay/common/config/cashier/code/CashierCodeTypeConfigEdit.vue
index b31bf4a9e..5f496e5f9 100644
--- a/src/views/daxpay/common/config/cashier/code/CashierCodeTypeConfigEdit.vue
+++ b/src/views/daxpay/common/config/cashier/code/CashierCodeTypeConfigEdit.vue
@@ -157,6 +157,7 @@
form.value.cashierCodeId = unref(configId)
getInfo(id, editType)
}
+
/**
* 获取信息
*/
diff --git a/src/views/daxpay/common/config/checkout/CheckoutAggregateConfigEdit.vue b/src/views/daxpay/common/config/checkout/CheckoutAggregateConfigEdit.vue
new file mode 100644
index 000000000..b1d29951a
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutAggregateConfigEdit.vue
@@ -0,0 +1,211 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/config/checkout/CheckoutAggregateConfigList.vue b/src/views/daxpay/common/config/checkout/CheckoutAggregateConfigList.vue
new file mode 100644
index 000000000..d086ed620
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutAggregateConfigList.vue
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/config/checkout/CheckoutConfig.api.ts b/src/views/daxpay/common/config/checkout/CheckoutConfig.api.ts
new file mode 100644
index 000000000..ec0690d12
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutConfig.api.ts
@@ -0,0 +1,279 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { MchEntity } from '#/web'
+
+/**
+ * 获取收银台配置
+ */
+export function getConfig(appId) {
+ return defHttp.get>({
+ url: '/checkout/config/get',
+ params: {
+ appId,
+ },
+ })
+}
+
+/**
+ * 保存收银台配置
+ */
+export function saveConfig(data: CheckoutConfig) {
+ return defHttp.post>({
+ url: '/checkout/config/save',
+ data,
+ })
+}
+
+/**
+ * 更新收银台配置
+ */
+export function updateConfig(data: CheckoutConfig) {
+ return defHttp.post>({
+ url: '/checkout/config/update',
+ data,
+ })
+}
+
+/**
+ * 获取分组配置列表
+ */
+export function getGroupConfigs(appId, checkoutType) {
+ return defHttp.get>({
+ url: '/checkout/config/group/list',
+ params: {
+ appId,
+ checkoutType,
+ },
+ })
+}
+
+/**
+ * 获取分组配置列表
+ */
+export function getGroupConfig(id) {
+ return defHttp.get>({
+ url: '/checkout/config/group/get',
+ params: { id },
+ })
+}
+
+/**
+ * 保存分组配置
+ */
+export function saveGroupConfig(data: CheckoutGroupConfig) {
+ return defHttp.post>({
+ url: '/checkout/config/group/save',
+ data,
+ })
+}
+
+/**
+ * 更新分组配置
+ */
+export function updateGroupConfig(data: CheckoutGroupConfig) {
+ return defHttp.post>({
+ url: '/checkout/config/group/update',
+ data,
+ })
+}
+
+/**
+ * 删除分组配置
+ */
+export function delGroupConfig(id) {
+ return defHttp.post({
+ url: '/checkout/config/group/delete',
+ params: { id },
+ })
+}
+
+/**
+ * 获取配置项配置
+ */
+export function getItemConfigs(groupId) {
+ return defHttp.get>({
+ url: '/checkout/config/item/list',
+ params: {
+ groupId,
+ },
+ })
+}
+/**
+ * 获取配置项配置
+ */
+export function getItemConfig(id) {
+ return defHttp.get>({
+ url: '/checkout/config/item/get',
+ params: {
+ id,
+ },
+ })
+}
+
+/**
+ * 保存配置项配置
+ */
+export function saveItemConfig(data: CheckoutItemConfig) {
+ return defHttp.post>({
+ url: '/checkout/config/item/save',
+ data,
+ })
+}
+
+/**
+ * 更新配置项配置
+ */
+export function updateItemConfig(data: CheckoutItemConfig) {
+ return defHttp.post>({
+ url: '/checkout/config/item/update',
+ data,
+ })
+}
+
+/**
+ * 删除配置项配置
+ */
+export function delItemConfig(id) {
+ return defHttp.post({
+ url: '/checkout/config/item/delete',
+ params: { id },
+ })
+}
+
+/**
+ * 获取聚合支付配置
+ */
+export function getAggregateConfigs(appId) {
+ return defHttp.get>({
+ url: '/checkout/config/aggregate/list',
+ params: {
+ appId,
+ },
+ })
+}
+
+/**
+ * 获取聚合支付配置
+ */
+export function getAggregateConfig(id) {
+ return defHttp.get>({
+ url: '/checkout/config/aggregate/get',
+ params: {
+ id,
+ },
+ })
+}
+
+/**
+ * 聚合支付配置是否存在
+ */
+export function existsAggregateConfig(appId, type) {
+ return defHttp.get>({
+ url: '/checkout/config/aggregate/exists',
+ params: {
+ appId,
+ type
+ },
+ })
+}
+
+/**
+ * 聚合支付配置是否存在(不包含自身)
+ */
+export function existsAggregateConfigNotId(appId, type, id) {
+ return defHttp.get>({
+ url: '/checkout/config/aggregate/existsNotId',
+ params: {
+ appId,
+ type,
+ id,
+ },
+ })
+}
+
+/**
+ * 保存聚合支付配置
+ */
+export function saveAggregateConfig(data: CheckoutAggregateConfig) {
+ return defHttp.post>({
+ url: '/checkout/config/aggregate/save',
+ data,
+ })
+}
+
+/**
+ * 更新聚合支付配置
+ */
+export function updateAggregateConfig(data: CheckoutAggregateConfig) {
+ return defHttp.post>({
+ url: '/checkout/config/aggregate/update',
+ data,
+ })
+}
+
+/**
+ * 删除聚合支付配置
+ */
+export function delAggregateConfig(id) {
+ return defHttp.post({
+ url: '/checkout/config/aggregate/delete',
+ params: { id },
+ })
+}
+
+/**
+ * 收银台配置
+ */
+export interface CheckoutConfig extends MchEntity {
+ /** 收银台名称 */
+ name?: string
+ /** PC收银台是否同时显示聚合收银码 */
+ aggregateShow?: boolean
+ /** h5收银台自动升级聚合支付 */
+ h5AutoUpgrade?: boolean
+}
+/**
+ * 收银台类目配置
+ */
+export interface CheckoutGroupConfig extends MchEntity {
+ /** 类型 web/h5/小程序 */
+ type?: string
+ /** 名称 */
+ name?: string
+ /** 图标 */
+ icon?: string
+ /** 排序 */
+ sortNo?: number
+}
+/**
+ * 收银台配置项
+ */
+export interface CheckoutItemConfig extends MchEntity {
+ /** 类目配置Id */
+ groupId?: string
+ /** 名称 */
+ name?: string
+ /** 图标 */
+ icon?: string
+ /** 排序 */
+ sortNo?: number
+ /** 发起调用的类型 */
+ callType?: string
+ /** 支付通道 */
+ channel?: string
+ /** 支付方式 */
+ payMethod?: string
+}
+/**
+ * 收银台聚合扫码支付配置
+ */
+export interface CheckoutAggregateConfig extends MchEntity {
+ /** 支付类型 */
+ type?: string
+ /** 通道 */
+ channel?: string
+ /** 支付方式 */
+ payMethod?: string
+ /** 自动拉起支付 */
+ autoLaunch?: boolean
+}
diff --git a/src/views/daxpay/common/config/checkout/CheckoutConfigEdit.vue b/src/views/daxpay/common/config/checkout/CheckoutConfigEdit.vue
new file mode 100644
index 000000000..a9dba1dea
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutConfigEdit.vue
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+
+
+
+
+
+ 不显示
+ 显示
+
+
+
+
+ 不升级
+ 升级
+
+
+
+
+ 取消
+ {{
+ form.id ? '更新' : '保存'
+ }}
+ 编辑信息
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/config/checkout/CheckoutConfigModel.vue b/src/views/daxpay/common/config/checkout/CheckoutConfigModel.vue
new file mode 100644
index 000000000..5c72d9257
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutConfigModel.vue
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/config/checkout/CheckoutGroupConfigEdit.vue b/src/views/daxpay/common/config/checkout/CheckoutGroupConfigEdit.vue
new file mode 100644
index 000000000..5f86497b6
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutGroupConfigEdit.vue
@@ -0,0 +1,148 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/config/checkout/CheckoutGroupConfigList.vue b/src/views/daxpay/common/config/checkout/CheckoutGroupConfigList.vue
new file mode 100644
index 000000000..a999f8721
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutGroupConfigList.vue
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/config/checkout/CheckoutItemConfigEdit.vue b/src/views/daxpay/common/config/checkout/CheckoutItemConfigEdit.vue
new file mode 100644
index 000000000..2bd6bc91e
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutItemConfigEdit.vue
@@ -0,0 +1,186 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/config/checkout/CheckoutItemConfigList.vue b/src/views/daxpay/common/config/checkout/CheckoutItemConfigList.vue
new file mode 100644
index 000000000..1aeaa2a98
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutItemConfigList.vue
@@ -0,0 +1,142 @@
+
+
+
+
+
+ 新建
+
+
+
+
+
+
+
+
+ {{ dictConvert('checkout_call_type', row.callType) }}
+
+
+
+
+ {{ dictConvert('channel', row.channel) }}
+
+
+
+
+ {{ dictConvert('pay_method', row.payMethod) }}
+
+
+
+
+
+
+ 查看
+
+ 编辑
+
+ 删除
+
+
+
+
+
+
+
+
diff --git a/src/views/daxpay/common/merchant/app/MchAppEdit.vue b/src/views/daxpay/common/merchant/app/MchAppEdit.vue
index 7a4675f72..3fd7927e4 100644
--- a/src/views/daxpay/common/merchant/app/MchAppEdit.vue
+++ b/src/views/daxpay/common/merchant/app/MchAppEdit.vue
@@ -117,7 +117,6 @@
const {
initFormEditType,
handleCancel,
- search,
labelCol,
wrapperCol,
title,
diff --git a/src/views/daxpay/common/merchant/app/MchAppList.vue b/src/views/daxpay/common/merchant/app/MchAppList.vue
index 3de9558be..d2600bb23 100644
--- a/src/views/daxpay/common/merchant/app/MchAppList.vue
+++ b/src/views/daxpay/common/merchant/app/MchAppList.vue
@@ -67,9 +67,9 @@
码牌配置
-
-
-
+
+
+
分账接收方
@@ -98,6 +98,7 @@
+
@@ -122,6 +123,7 @@
import AllocationReceiverList from '@/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue'
import AllocationGroupList from '@/views/daxpay/common/allocation/group/AllocationGroupList.vue'
import CashierCodeConfigList from '@/views/daxpay/common/config/cashier/code/CashierCodeConfigList.vue'
+ import CheckoutConfigModel from '@/views/daxpay/common/config/checkout/CheckoutConfigModel.vue'
// 使用hooks
const {
@@ -149,6 +151,7 @@
const channelSetup = ref()
const merchantNotifyConfigList = ref()
const cashierCodeConfigList = ref()
+ const checkoutConfigModel = ref()
const allocationReceiverList = ref()
const allocationGroupList = ref()
@@ -207,13 +210,13 @@
* 收银台配置
*/
function showCheckoutConfig(record) {
+ checkoutConfigModel.value.init(record.appId)
}
/**
* 收银码牌配置
*/
function showCashierCode(record) {
cashierCodeConfigList.value.init(record.appId)
-
}
/**
* 分账配置