From 0b8af1c74e535ba525b5e92e44e7df7806b1e416 Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Thu, 26 Sep 2024 14:45:07 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E9=80=9A=E9=81=93=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wechat/config/WechatPayConfigEdit.vue     |  4 ++--
 .../common/develop/auth/ChannelAuth.vue       | 20 +++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue b/src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue
index c77784018..adc8f8f3a 100644
--- a/src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue
+++ b/src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue
@@ -31,11 +31,11 @@
             placeholder="请输入微信应用AppId"
           />
         </a-form-item>
-        <a-form-item label="AppSecret" name="appSecret">
+        <a-form-item label="公众号AppSecret" name="appSecret">
           <a-input
             v-model:value="form.appSecret"
             :disabled="showable"
-            placeholder="APPID对应的接口密码，用于获取接口调用凭证时使用"
+            placeholder="用于获取接口调用凭证时使用, 如OpenId/AccessToken等"
           />
         </a-form-item>
         <a-form-item label="是否启用" name="enable">
diff --git a/src/views/daxpay/common/develop/auth/ChannelAuth.vue b/src/views/daxpay/common/develop/auth/ChannelAuth.vue
index 549c448f2..ec5b1504a 100644
--- a/src/views/daxpay/common/develop/auth/ChannelAuth.vue
+++ b/src/views/daxpay/common/develop/auth/ChannelAuth.vue
@@ -38,6 +38,7 @@
             placeholder="请选择对账通道"
           />
           <a-button
+            :loading="loading"
             :disabled="!form.channel"
             style="margin-top: 15px"
             type="primary"
@@ -48,6 +49,7 @@
       </a-form-item>
     </a-form>
     <qr-code
+      style="margin-bottom: 20px"
       :options="{ margin: 0 }"
       :width="250"
       :value="authUrl.authUrl"
@@ -105,6 +107,7 @@
   const form = ref<GenerateAuthUrlParam>({})
   const authResult = ref<AuthResult>({})
   const authUrl = ref<AuthUrlResult>({ authUrl: '' })
+  let loading = ref(false)
   let pause: any = () => {}
 
   onMounted(() => {
@@ -138,7 +141,6 @@
    */
   function copy(value) {
     copyText(value)
-    createMessage.info('已复制到剪贴板中')
   }
 
   /**
@@ -146,11 +148,17 @@
    */
   function getUrl() {
     pause()
-    createMessage.info('正在生成链接，请稍等.....')
-    generateAuthUrl(form.value).then((res) => {
-      authUrl.value = res.data
-      query()
-    })
+    authResult.value = {}
+    loading.value = true
+    authUrl.value = {}
+    generateAuthUrl(form.value)
+      .then((res) => {
+        authUrl.value = res.data
+        query()
+      })
+      .finally(() => {
+        loading.value = false
+      })
   }
 
   /**