From a56d2ca71fcca6dcbd2d6c045e635c6280e643f4 Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Wed, 9 Oct 2024 18:44:33 +0800
Subject: [PATCH] =?UTF-8?q?style=20=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../receiver/AllocationReceiverEdit.vue       | 70 +++++++++++++++----
 .../allocation/receiver/OpenIdQrCode.vue      | 11 +--
 .../common/develop/trade/DevelopTradePay.vue  |  6 +-
 .../daxpay/common/merchant/app/MchAppList.vue |  2 +-
 .../daxpay/common/order/pay/PayOrderInfo.vue  |  4 +-
 5 files changed, 72 insertions(+), 21 deletions(-)

diff --git a/src/views/daxpay/common/allocation/receiver/AllocationReceiverEdit.vue b/src/views/daxpay/common/allocation/receiver/AllocationReceiverEdit.vue
index a2823dcbc..90883895c 100644
--- a/src/views/daxpay/common/allocation/receiver/AllocationReceiverEdit.vue
+++ b/src/views/daxpay/common/allocation/receiver/AllocationReceiverEdit.vue
@@ -22,7 +22,11 @@
           <a-input v-model:value="form.id" :disabled="showable" />
         </a-form-item>
         <a-form-item label="接收方编号" validate-first name="receiverNo">
-          <a-input v-model:value="form.receiverNo" :disabled="!addable" placeholder="请输入接收方编号" />
+          <a-input
+            v-model:value="form.receiverNo"
+            :disabled="!addable"
+            placeholder="请输入接收方编号"
+          />
         </a-form-item>
         <a-form-item label="所属通道" name="channel">
           <a-select
@@ -44,14 +48,22 @@
           />
         </a-form-item>
         <a-form-item label="接收方账号" name="receiverAccount">
-          <a-input v-model:value="form.receiverAccount" :disabled="!addable" placeholder="请输入接收方账号">
+          <a-input
+            v-model:value="form.receiverAccount"
+            :disabled="!addable"
+            placeholder="请输入接收方账号"
+          >
             <template v-if="['open_id'].includes(form.receiverType as string) && addable" #suffix>
               <icon icon="ant-design:qrcode-outlined" @click="showQrCode" />
             </template>
           </a-input>
         </a-form-item>
         <a-form-item label="接收方姓名" name="receiverName">
-          <a-input v-model:value="form.receiverName" :disabled="!addable" placeholder="请输入接收方姓名" />
+          <a-input
+            v-model:value="form.receiverName"
+            :disabled="!addable"
+            placeholder="请输入接收方姓名"
+          />
         </a-form-item>
         <a-form-item label="分账关系类型" name="relationType">
           <a-select
@@ -62,27 +74,50 @@
             placeholder="请选择分账关系类型"
           />
         </a-form-item>
-        <a-form-item v-if="form.relationType === 'custom'" label="接收者关系名称" name="relationName">
-          <a-input v-model:value="form.relationName" :disabled="!addable" placeholder="请输入接收者关系名称" />
+        <a-form-item
+          v-if="form.relationType === 'custom'"
+          label="接收者关系名称"
+          name="relationName"
+        >
+          <a-input
+            v-model:value="form.relationName"
+            :disabled="!addable"
+            placeholder="请输入接收者关系名称"
+          />
         </a-form-item>
       </a-form>
     </a-spin>
     <template #footer>
       <a-space>
         <a-button key="cancel" @click="handleCancel">取消</a-button>
-        <a-button v-if="!showable" key="forward" :loading="confirmLoading" type="primary" @click="handleOk">保存</a-button>
+        <a-button
+          v-if="!showable"
+          key="forward"
+          :loading="confirmLoading"
+          type="primary"
+          @click="handleOk"
+          >保存</a-button
+        >
       </a-space>
     </template>
-    <open-id-qr-code ref="openIdQrCode"  @close="pauseFun" />
+    <open-id-qr-code ref="openIdQrCode" @close="pauseFun" />
   </basic-modal>
 </template>
 
 <script setup lang="ts">
   import useFormEdit from '@/hooks/bootx/useFormEdit'
   import { useMessage } from '@/hooks/web/useMessage'
-  import {computed, nextTick, ref} from 'vue'
+  import { computed, nextTick, ref } from 'vue'
   import { FormInstance, Rule } from 'ant-design-vue/lib/form'
-  import { add, get, AllocReceiver, update, findChannels, findReceiverTypeByChannel, existsByNo } from './AllocationReceiver.api'
+  import {
+    add,
+    get,
+    AllocReceiver,
+    update,
+    findChannels,
+    findReceiverTypeByChannel,
+    existsByNo,
+  } from './AllocationReceiver.api'
   import { FormEditType } from '@/enums/formTypeEnum'
   import { BasicModal } from '@/components/Modal'
   import { useDict } from '@/hooks/bootx/useDict'
@@ -128,7 +163,9 @@
       receiverType: [{ required: true, message: '请选择分账接收方类型' }],
       receiverAccount: [{ required: true, message: '请输入接收方账号' }],
       relationType: [{ required: true, message: '请选择分账关系类型' }],
-      relationName: [{ required: form.value.relationType === 'custom', message: '请输入类型关系名称' }],
+      relationName: [
+        { required: form.value.relationType === 'custom', message: '请输入类型关系名称' },
+      ],
     } as Record<string, Rule[]>
   })
 
@@ -176,7 +213,9 @@
    * 通道变动
    */
   function channelChange() {
-    findReceiverTypeByChannel(form.value.channel).then(({ data }) => (receiverTypeList.value = data))
+    findReceiverTypeByChannel(form.value.channel).then(
+      ({ data }) => (receiverTypeList.value = data),
+    )
     form.value.receiverType = undefined
   }
 
@@ -190,7 +229,10 @@
         if (formEditType.value === FormEditType.Add) {
           await add(form.value)
         } else if (formEditType.value === FormEditType.Edit) {
-          await update({ ...form.value, ...diffForm(rawForm.value, form.value, 'receiverAccount', 'receiverName') })
+          await update({
+            ...form.value,
+            ...diffForm(rawForm.value, form.value, 'receiverAccount', 'receiverName'),
+          })
         }
       } finally {
         confirmLoading.value = false
@@ -209,8 +251,8 @@
    * 校验编码重复
    */
   async function validateCode() {
-    const { receiverNo,appId } = form.value
-    const res = await existsByNo(receiverNo,appId)
+    const { receiverNo, appId } = form.value
+    const res = await existsByNo(receiverNo, appId)
     return res.data ? Promise.reject('该接收方编号已经存在') : Promise.resolve()
   }
 
diff --git a/src/views/daxpay/common/allocation/receiver/OpenIdQrCode.vue b/src/views/daxpay/common/allocation/receiver/OpenIdQrCode.vue
index bd40cd0dd..c2bf5033b 100644
--- a/src/views/daxpay/common/allocation/receiver/OpenIdQrCode.vue
+++ b/src/views/daxpay/common/allocation/receiver/OpenIdQrCode.vue
@@ -2,7 +2,10 @@
   <a-modal :open="visible" title="扫码获取OpenId" @cancel="handleClose" :footer="null" :width="300">
     <div style="display: flex; flex-direction: column; align-items: center; padding: 20px 0">
       <qr-code :options="{ margin: 0 }" :width="250" :value="qrUrl" />
-      <div class="mt-15px mb-15px" style="display: flex; flex-direction: row; align-items: center; justify-content: center">
+      <div
+        class="mt-15px mb-15px"
+        style="display: flex; flex-direction: row; align-items: center; justify-content: center"
+      >
         {{ bottomTitle }}
       </div>
     </div>
@@ -11,7 +14,7 @@
 
 <script lang="ts" setup>
   import QrCode from '@/components/Qrcode/src/Qrcode.vue'
-  import {ref} from "vue";
+  import { ref } from 'vue'
 
   let visible = ref(false)
   let qrUrl = ref('')
@@ -23,8 +26,8 @@
    */
   function init(url, title) {
     visible.value = true
-    qrUrl = url
-    bottomTitle = title
+    qrUrl.value = url
+    bottomTitle.value = title
   }
 
   /**
diff --git a/src/views/daxpay/common/develop/trade/DevelopTradePay.vue b/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
index cec51e9cd..44ad905ec 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
@@ -62,7 +62,11 @@
           <a-textarea v-model:value="form.extraParam" :rows="3" placeholder="请输入支付扩展参数" />
         </a-form-item>
         <a-form-item label="商户扩展参数" name="attach">
-          <a-textarea v-model:value="form.attach" :rows="3" placeholder="请输入商户扩展参数" />
+          <a-textarea
+            v-model:value="form.attach"
+            :rows="3"
+            placeholder="请输入商户扩展参数, 会原样回调返回"
+          />
         </a-form-item>
         <a-form-item label="异步通知地址" name="notifyUrl">
           <a-input v-model:value="form.notifyUrl" placeholder="请输入异步通知地址" />
diff --git a/src/views/daxpay/common/merchant/app/MchAppList.vue b/src/views/daxpay/common/merchant/app/MchAppList.vue
index 5183a0339..ad70c758f 100644
--- a/src/views/daxpay/common/merchant/app/MchAppList.vue
+++ b/src/views/daxpay/common/merchant/app/MchAppList.vue
@@ -220,7 +220,7 @@
    * 分账配置
    */
   function showAllocConfig(record) {
-    // TODO
+    createMessage.warn('暂未开放')
   }
   /**
    * 分账接收方
diff --git a/src/views/daxpay/common/order/pay/PayOrderInfo.vue b/src/views/daxpay/common/order/pay/PayOrderInfo.vue
index 08614eee8..1a793c35c 100644
--- a/src/views/daxpay/common/order/pay/PayOrderInfo.vue
+++ b/src/views/daxpay/common/order/pay/PayOrderInfo.vue
@@ -104,7 +104,9 @@
   const { dictConvert } = useDict()
 
   let order = ref<PayOrder>({})
-  // 入口
+  /**
+   * 入口
+   */
   async function init(orderNo: string) {
     visible.value = true
     confirmLoading.value = true