From 7108cde060e3f3cb2b9eeecd3502d05efff95321 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 18 Aug 2024 15:51:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91=E6=94=AF=E4=BB=98=EF=BC=9A=E6=94=AF=E4=BB=98=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=EF=BC=8C=E5=A2=9E=E5=8A=A0=20appKey=20=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86=EF=BC=8C=E7=94=A8=E4=BA=8E=E4=B8=8D=E5=90=8C=E6=8E=A5?=
 =?UTF-8?q?=E5=85=A5=E6=96=B9=E7=9A=84=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/pay/app/index.ts                 |  1 +
 src/views/pay/app/components/AppForm.vue | 19 +++++++++++--------
 src/views/pay/app/index.vue              | 18 +++++++++++++-----
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/api/pay/app/index.ts b/src/api/pay/app/index.ts
index 4bb06b36..b1a2d0dd 100644
--- a/src/api/pay/app/index.ts
+++ b/src/api/pay/app/index.ts
@@ -2,6 +2,7 @@ import request from '@/config/axios'
 
 export interface AppVO {
   id: number
+  appKey: string
   name: string
   status: number
   remark: string
diff --git a/src/views/pay/app/components/AppForm.vue b/src/views/pay/app/components/AppForm.vue
index b99766c1..bf6553ee 100644
--- a/src/views/pay/app/components/AppForm.vue
+++ b/src/views/pay/app/components/AppForm.vue
@@ -10,6 +10,9 @@
       <el-form-item label="应用名" prop="name">
         <el-input v-model="formData.name" placeholder="请输入应用名" />
       </el-form-item>
+      <el-form-item label="应用标识" prop="name">
+        <el-input v-model="formData.appKey" placeholder="请输入应用标识" />
+      </el-form-item>
       <el-form-item label="开启状态" prop="status">
         <el-radio-group v-model="formData.status">
           <el-radio
@@ -55,16 +58,15 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
   name: undefined,
-  packageId: undefined,
-  contactName: undefined,
-  contactMobile: undefined,
-  accountCount: undefined,
-  expireTime: undefined,
-  domain: undefined,
-  status: CommonStatusEnum.ENABLE
+  appKey: undefined,
+  status: CommonStatusEnum.ENABLE,
+  remark: undefined,
+  orderNotifyUrl: undefined,
+  refundNotifyUrl: undefined
 })
 const formRules = reactive({
   name: [{ required: true, message: '应用名不能为空', trigger: 'blur' }],
+  appKey: [{ required: true, message: '应用标识不能为空', trigger: 'blur' }],
   status: [{ required: true, message: '开启状态不能为空', trigger: 'blur' }],
   orderNotifyUrl: [{ required: true, message: '支付结果的回调地址不能为空', trigger: 'blur' }],
   refundNotifyUrl: [{ required: true, message: '退款结果的回调地址不能为空', trigger: 'blur' }]
@@ -123,7 +125,8 @@ const resetForm = () => {
     status: CommonStatusEnum.ENABLE,
     remark: undefined,
     orderNotifyUrl: undefined,
-    refundNotifyUrl: undefined
+    refundNotifyUrl: undefined,
+    appKey: undefined
   }
   formRef.value?.resetFields()
 }
diff --git a/src/views/pay/app/index.vue b/src/views/pay/app/index.vue
index 6b60d9b1..9ca08134 100644
--- a/src/views/pay/app/index.vue
+++ b/src/views/pay/app/index.vue
@@ -64,8 +64,8 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="应用编号" align="center" prop="id" />
-      <el-table-column label="应用名" align="center" prop="name" />
+      <el-table-column label="应用标识" align="center" prop="appKey" />
+      <el-table-column label="应用名" align="center" prop="name" min-width="90" />
       <el-table-column label="开启状态" align="center" prop="status">
         <template #default="scope">
           <el-switch
@@ -78,7 +78,7 @@
       </el-table-column>
       <el-table-column label="支付宝配置" align="center">
         <el-table-column
-          :label="channel.name"
+          :label="channel.name.replace('支付宝', '')"
           align="center"
           v-for="channel in alipayChannels"
           :key="channel.code"
@@ -89,6 +89,7 @@
               v-if="isChannelExists(scope.row.channelCodes, channel.code)"
               @click="openChannelForm(scope.row, channel.code)"
               circle
+              size="small"
             >
               <Icon icon="ep:check" />
             </el-button>
@@ -96,6 +97,7 @@
               v-else
               type="danger"
               circle
+              size="small"
               @click="openChannelForm(scope.row, channel.code)"
             >
               <Icon icon="ep:close" />
@@ -105,7 +107,7 @@
       </el-table-column>
       <el-table-column label="微信配置" align="center">
         <el-table-column
-          :label="channel.name"
+          :label="channel.name.replace('微信', '')"
           align="center"
           v-for="channel in wxChannels"
           :key="channel.code"
@@ -116,6 +118,7 @@
               v-if="isChannelExists(scope.row.channelCodes, channel.code)"
               @click="openChannelForm(scope.row, channel.code)"
               circle
+              size="small"
             >
               <Icon icon="ep:check" />
             </el-button>
@@ -123,6 +126,7 @@
               v-else
               type="danger"
               circle
+              size="small"
               @click="openChannelForm(scope.row, channel.code)"
             >
               <Icon icon="ep:close" />
@@ -136,6 +140,7 @@
             <el-button
               type="success"
               circle
+              size="small"
               v-if="isChannelExists(scope.row.channelCodes, PayChannelEnum.WALLET.code)"
               @click="openChannelForm(scope.row, PayChannelEnum.WALLET.code)"
             >
@@ -145,6 +150,7 @@
               v-else
               type="danger"
               circle
+              size="small"
               @click="openChannelForm(scope.row, PayChannelEnum.WALLET.code)"
             >
               <Icon icon="ep:close" />
@@ -158,6 +164,7 @@
             <el-button
               type="success"
               circle
+              size="small"
               v-if="isChannelExists(scope.row.channelCodes, PayChannelEnum.MOCK.code)"
               @click="openChannelForm(scope.row, PayChannelEnum.MOCK.code)"
             >
@@ -167,6 +174,7 @@
               v-else
               type="danger"
               circle
+              size="small"
               @click="openChannelForm(scope.row, PayChannelEnum.MOCK.code)"
             >
               <Icon icon="ep:close" />
@@ -255,7 +263,7 @@ const wxChannels = [
   PayChannelEnum.WX_APP,
   PayChannelEnum.WX_NATIVE,
   PayChannelEnum.WX_WAP,
-  PayChannelEnum.WX_BAR,
+  PayChannelEnum.WX_BAR
 ]
 
 /** 查询列表 */