From a67c0bb092915cfd04ed6045bc4e3209aa84df00 Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Sun, 8 Dec 2024 22:30:23 +0800
Subject: [PATCH] =?UTF-8?q?feat(menu):=20=E6=B7=BB=E5=8A=A0=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=85=A8=E5=B1=8F=E5=B1=9E=E6=80=A7=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=88=86=E8=B4=A6=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在菜单模型中添加全屏属性，用于控制菜单是否全屏显示- 优化分账配置界面，增加分账模式选项
- 修改支付限额帮助信息，明确以应用支付限额为准
- 移除微信支付配置中的沙箱环境选项
- 更新收银台配置和通道配置界面标题
---
 src/api/sys/model/menuModel.ts                      |  1 +
 src/store/modules/permission.ts                     |  1 +
 .../common/allocation/AllocationConfigModel.vue     | 11 +++++------
 .../allocation/config/AllocationConfig.api.ts       |  0
 .../common/allocation/config/AllocationConfig.vue   | 11 +++++++++++
 .../channel/alipay/config/AlipayConfigEdit.vue      |  2 +-
 .../channel/union/config/UnionPayConfigEdit.vue     |  2 +-
 .../channel/wechat/config/WechatPayConfig.api.ts    |  2 --
 .../channel/wechat/config/WechatPayConfigEdit.vue   | 13 +++++++------
 .../common/config/checkout/CheckoutConfigModel.vue  |  2 +-
 .../common/merchant/channel/ChannelConfigList.vue   |  1 -
 11 files changed, 28 insertions(+), 18 deletions(-)
 create mode 100644 src/views/daxpay/common/allocation/config/AllocationConfig.api.ts
 create mode 100644 src/views/daxpay/common/allocation/config/AllocationConfig.vue

diff --git a/src/api/sys/model/menuModel.ts b/src/api/sys/model/menuModel.ts
index 09c8153a..20f5a4b7 100644
--- a/src/api/sys/model/menuModel.ts
+++ b/src/api/sys/model/menuModel.ts
@@ -16,5 +16,6 @@ export interface PermMenu {
   sortNo: number
   keepAlive: boolean
   targetOutside: boolean
+  fullScreen: boolean
   children: Array<PermMenu>
 }
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index 194bf1d1..f674fb5f 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -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,
diff --git a/src/views/daxpay/common/allocation/AllocationConfigModel.vue b/src/views/daxpay/common/allocation/AllocationConfigModel.vue
index 192f4ada..3040c2e6 100644
--- a/src/views/daxpay/common/allocation/AllocationConfigModel.vue
+++ b/src/views/daxpay/common/allocation/AllocationConfigModel.vue
@@ -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)
diff --git a/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts b/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/src/views/daxpay/common/allocation/config/AllocationConfig.vue b/src/views/daxpay/common/allocation/config/AllocationConfig.vue
new file mode 100644
index 00000000..0a8d203d
--- /dev/null
+++ b/src/views/daxpay/common/allocation/config/AllocationConfig.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+
+</template>
+
+<style scoped lang="less">
+
+</style>
diff --git a/src/views/daxpay/common/channel/alipay/config/AlipayConfigEdit.vue b/src/views/daxpay/common/channel/alipay/config/AlipayConfigEdit.vue
index 1607a0ce..71452ffe 100644
--- a/src/views/daxpay/common/channel/alipay/config/AlipayConfigEdit.vue
+++ b/src/views/daxpay/common/channel/alipay/config/AlipayConfigEdit.vue
@@ -34,7 +34,7 @@
         <a-form-item name="limitAmount">
           <template #label>
             <basic-title
-              helpMessage="每次发起支付的金额不能超过该值，如果同时配置了全局支付限额，则以额度低的为准"
+              helpMessage="每次发起支付的金额不能超过该值，如果同时配置了应用支付限额，则以额度低的为准"
             >
               支付限额(元)
             </basic-title>
diff --git a/src/views/daxpay/common/channel/union/config/UnionPayConfigEdit.vue b/src/views/daxpay/common/channel/union/config/UnionPayConfigEdit.vue
index 5af10284..03052eba 100644
--- a/src/views/daxpay/common/channel/union/config/UnionPayConfigEdit.vue
+++ b/src/views/daxpay/common/channel/union/config/UnionPayConfigEdit.vue
@@ -38,7 +38,7 @@
         <a-form-item name="limitAmount">
           <template #label>
             <basic-title
-              helpMessage="每次发起支付的金额不能超过该值，如果同时配置了全局支付限额，则以额度低的为准"
+              helpMessage="每次发起支付的金额不能超过该值，如果同时配置了应用支付限额，则以额度低的为准"
             >
               支付限额(元)
             </basic-title>
diff --git a/src/views/daxpay/common/channel/wechat/config/WechatPayConfig.api.ts b/src/views/daxpay/common/channel/wechat/config/WechatPayConfig.api.ts
index a863e5c2..fcc946d6 100644
--- a/src/views/daxpay/common/channel/wechat/config/WechatPayConfig.api.ts
+++ b/src/views/daxpay/common/channel/wechat/config/WechatPayConfig.api.ts
@@ -60,8 +60,6 @@ export interface WechatPayConfig extends MchEntity {
   notifyUrl?: string
   // 页面跳转同步通知页面路径
   returnUrl?: string
-  // 是否沙箱环境
-  sandbox?: boolean
   // 备注
   remark?: string
 }
diff --git a/src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue b/src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue
index 89abb11f..c3e5f920 100644
--- a/src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue
+++ b/src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue
@@ -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: '',
   })
 
diff --git a/src/views/daxpay/common/config/checkout/CheckoutConfigModel.vue b/src/views/daxpay/common/config/checkout/CheckoutConfigModel.vue
index 5c72d925..4bb99960 100644
--- a/src/views/daxpay/common/config/checkout/CheckoutConfigModel.vue
+++ b/src/views/daxpay/common/config/checkout/CheckoutConfigModel.vue
@@ -3,7 +3,7 @@
     destroyOnClose
     v-bind="$attrs"
     width="60%"
-    title="码牌配置"
+    title="收银台配置"
     :mask-closable="true"
     :open="visible"
     @close="handleCancel"
diff --git a/src/views/daxpay/common/merchant/channel/ChannelConfigList.vue b/src/views/daxpay/common/merchant/channel/ChannelConfigList.vue
index 2fdff5e2..7fe9a8da 100644
--- a/src/views/daxpay/common/merchant/channel/ChannelConfigList.vue
+++ b/src/views/daxpay/common/merchant/channel/ChannelConfigList.vue
@@ -1,6 +1,5 @@
 <template>
   <basic-drawer
-    showFooter
     v-bind="$attrs"
     width="70%"
     title="通道配置"