feat(menu): 添加菜单全屏属性并优化分账配置

- 在菜单模型中添加全屏属性,用于控制菜单是否全屏显示- 优化分账配置界面,增加分账模式选项
- 修改支付限额帮助信息,明确以应用支付限额为准
- 移除微信支付配置中的沙箱环境选项
- 更新收银台配置和通道配置界面标题
This commit is contained in:
bootx
2024-12-08 22:30:23 +08:00
parent 3c423633c5
commit a67c0bb092
11 changed files with 28 additions and 18 deletions

View File

@@ -16,5 +16,6 @@ export interface PermMenu {
sortNo: number
keepAlive: boolean
targetOutside: boolean
fullScreen: boolean
children: Array<PermMenu>
}

View File

@@ -103,6 +103,7 @@ export const usePermissionStore = defineStore({
targetOutside: o.targetOutside,
iframeUrl: o.iframeUrl,
redirect: o.redirect,
fullScreen: o.fullScreen,
meta: {
orderNo: o.sortNo,
title: o.title,

View File

@@ -8,13 +8,14 @@
@close="visible = false"
>
<a-tabs v-model:activeKey="activeKey" type="card">
<a-tab-pane :key="1" tab="分账配置">
<a-tab-pane :key="1" tab="分账模式">
<AllocationConfig :appId="appId"/>
</a-tab-pane>
<a-tab-pane :key="2" tab="分账接收方">
<AllocationReceiverList ref="allocationReceiverList" :appId="appId"/>
<AllocationReceiverList :appId="appId"/>
</a-tab-pane>
<a-tab-pane :key="3" tab="分账组">
<AllocationGroupList ref="allocationGroupList" :appId="appId" />
<AllocationGroupList :appId="appId" />
</a-tab-pane>
</a-tabs>
</basic-drawer>
@@ -25,9 +26,7 @@
import AllocationGroupList from '@/views/daxpay/common/allocation/group/AllocationGroupList.vue'
import { ref } from 'vue'
import { BasicDrawer } from '@/components/Drawer'
const allocationReceiverList = ref<any>()
const allocationGroupList = ref<any>()
import AllocationConfig from "@/views/daxpay/common/allocation/config/AllocationConfig.vue";
const visible = ref(false)
const activeKey = ref(2)

View File

@@ -0,0 +1,11 @@
<script setup lang="ts">
</script>
<template>
</template>
<style scoped lang="less">
</style>

View File

@@ -34,7 +34,7 @@
<a-form-item name="limitAmount">
<template #label>
<basic-title
helpMessage="每次发起支付的金额不能超过该值,如果同时配置了全局支付限额,则以额度低的为准"
helpMessage="每次发起支付的金额不能超过该值,如果同时配置了应用支付限额,则以额度低的为准"
>
支付限额()
</basic-title>

View File

@@ -38,7 +38,7 @@
<a-form-item name="limitAmount">
<template #label>
<basic-title
helpMessage="每次发起支付的金额不能超过该值,如果同时配置了全局支付限额,则以额度低的为准"
helpMessage="每次发起支付的金额不能超过该值,如果同时配置了应用支付限额,则以额度低的为准"
>
支付限额()
</basic-title>

View File

@@ -60,8 +60,6 @@ export interface WechatPayConfig extends MchEntity {
notifyUrl?: string
// 页面跳转同步通知页面路径
returnUrl?: string
// 是否沙箱环境
sandbox?: boolean
// 备注
remark?: string
}

View File

@@ -62,7 +62,7 @@
<a-form-item name="limitAmount">
<template #label>
<basic-title
helpMessage="每次发起支付的金额不能超过该值,如果同时配置了全局支付限额,则以额度低的为准"
helpMessage="每次发起支付的金额不能超过该值,如果同时配置了应用支付限额,则以额度低的为准"
>
支付限额()
</basic-title>
@@ -74,9 +74,6 @@
placeholder="请输入支付限额(元)"
/>
</a-form-item>
<a-form-item label="沙箱环境" name="sandbox">
<a-switch checked-children="" un-checked-children="" v-model:checked="form.sandbox" />
</a-form-item>
<a-form-item label="API版本" name="apiVersion">
<a-radio-group v-model:value="form.apiVersion" button-style="solid">
<a-radio-button value="apiV2"> API_V2 </a-radio-button>
@@ -99,7 +96,12 @@
placeholder="请输入APIv3密钥"
/>
</a-form-item>
<a-form-item label="证书序列号" name="certSerialNo">
<a-form-item name="certSerialNo">
<template #label>
<basic-title helpMessage="登录微信支付平台进入到账户中心 API安全 查看证书, 查看证书序列号">
证书序列号
</basic-title>
</template>
<a-input
:disabled="showable"
v-model:value="form.certSerialNo"
@@ -247,7 +249,6 @@
apiKeyV3: '',
notifyUrl: '',
returnUrl: '',
sandbox: false,
remark: '',
})

View File

@@ -3,7 +3,7 @@
destroyOnClose
v-bind="$attrs"
width="60%"
title="码牌配置"
title="收银台配置"
:mask-closable="true"
:open="visible"
@close="handleCancel"

View File

@@ -1,6 +1,5 @@
<template>
<basic-drawer
showFooter
v-bind="$attrs"
width="70%"
title="通道配置"