From 41ef4aea30355654ff3a7b0d8d6454d492990928 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 18 Feb 2023 21:16:22 +0800
Subject: [PATCH] =?UTF-8?q?pay:=20=E6=8E=A5=E5=85=A5=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=AE=9D=20PC=20=E6=94=AF=E4=BB=98=E7=9A=84=E5=89=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E3=80=90=E5=A4=B1=E8=B4=A5=E3=80=91=EF=BC=9A?=
 =?UTF-8?q?=E7=9B=AE=E5=89=8D=E6=9C=89=E7=82=B9=E5=A5=87=E6=80=AA=EF=BC=8C?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E6=80=BB=E6=98=AF=E4=BC=9A=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E2=80=9C=E6=94=AF=E4=BB=98=E7=8E=AF=E5=A2=83=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E9=A3=8E=E9=99=A9=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/impl/alipay/AlipayPcPayClient.java    |  4 ----
 yudao-ui-admin/src/views/pay/order/submit.vue    | 16 +++++++++-------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPcPayClient.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPcPayClient.java
index 4da7d78d0..176a67caa 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPcPayClient.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPcPayClient.java
@@ -69,10 +69,6 @@ public class AlipayPcPayClient extends AbstractAlipayClient {
             log.error("[unifiedOrder][request({}) 发起支付失败]", JsonUtils.toJsonString(reqDTO), e);
             return PayCommonResult.build(e.getErrCode(), e.getErrMsg(), null, codeMapping);
         }
-        // 1. form
-        // 2. url
-        // 3. code
-        // 4. code url
 
         // 2.2 处理结果
         System.out.println(response.getBody());
diff --git a/yudao-ui-admin/src/views/pay/order/submit.vue b/yudao-ui-admin/src/views/pay/order/submit.vue
index 7e8849ee1..8de811283 100644
--- a/yudao-ui-admin/src/views/pay/order/submit.vue
+++ b/yudao-ui-admin/src/views/pay/order/submit.vue
@@ -203,7 +203,7 @@ export default {
         // 4：订单码-可定义宽度的嵌入式二维码，商户可根据需要设定二维码的大小
         // return {
         //   "channelExtras": {
-        //     "qr_pay_mode": "2"
+        //     "qr_pay_mode": "4"
         //   }
         // }
         // 情况【跳转模式】：跳转模式下，用户的扫码界面是由支付宝生成的，不在商户的域名下。支持传入的枚举值有
@@ -224,13 +224,15 @@ export default {
       }
       this.submitLoading = false
     },
+    /** 提交支付后，IFrame 内置 URL 的展示形式 */
     displayIFrame(channelCode, data) {
-      // this.iframe = {
-      //   title: '支付窗口',
-      //   url: data.displayContent,
-      //   visible: true
-      // }
-      window.open(data.displayContent)
+      // TODO 芋艿：目前有点奇怪，支付宝总是会显示“支付环境存在风险”
+      this.iframe = {
+        title: '支付窗口',
+        url: data.displayContent,
+        visible: true
+      }
+      this.submitLoading = false
     },
     /** 提交支付后，URL 的展示形式 */
     displayUrl(channelCode, data) {