From 924042aa5e0d0d33d73e218e42183460f59e9921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=80=81=E8=83=A1?= <1094551889@qq.com>
Date: Sat, 28 Jun 2025 10:09:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=94=AF=E4=BB=98=E5=AE=9D?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/PayController.php           | 11 ++-
 app/controller/api/PayManageController.php |  2 +-
 view/pay/console.html                      | 83 +++++++++++++---------
 3 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/app/controller/PayController.php b/app/controller/PayController.php
index 5e9c58c..d234d4b 100644
--- a/app/controller/PayController.php
+++ b/app/controller/PayController.php
@@ -68,7 +68,14 @@ class PayController
                 View::assign('passtime', $passtime > 0 ? $passtime : 0);
                 // Alipay免输
                 if (preg_match('/^alipay4#\d+$/', $channel->channel)) {
-                    $payurl = \payclient\AliPayf::getPayUrl($act_order->order_id, $act_order->money, $channel->qrcode);
+                    $chan = request()->get('chan', '');
+                    if ($chan && $chan == 'Alipayf') {
+                        $payurl = \payclient\AliPayf::getPayUrl($act_order->order_id, $act_order->money, $channel->qrcode, 1);
+                        View::assign('payUrl', $payurl['data'] ?? $payurl['msg']);
+                        View::assign('payclient', 'Alipayf');
+                    } else {
+                        $payurl = \payclient\AliPayf::getPayUrl($act_order->order_id, $act_order->money, $channel->qrcode);
+                    }
                     View::assign('payUrl', $payurl['data'] ?? $payurl['msg']);
                 } else {
                     View::assign('payUrl', $channel->qrcode);
@@ -237,7 +244,7 @@ class PayController
         $config = PayAccount::getAccountConfig($req_aid);
         if ($config === false) return json(['code' => 4, 'msg' => '监听收款配置错误']);
         // 登陆账号
-        $pay_config = ['username' => $config['account'], 'password' => $config['password']];
+        $pay_config = ['username' => $config['account'], 'password' => $config['password'], 'aid' => $config['aid']];
         // 配置参数
         $params = $config['params'];
         // 实例监听客户端
diff --git a/app/controller/api/PayManageController.php b/app/controller/api/PayManageController.php
index 391591c..eec7f62 100644
--- a/app/controller/api/PayManageController.php
+++ b/app/controller/api/PayManageController.php
@@ -194,7 +194,7 @@ class PayManageController extends BaseController
         if ($config === false) return json(backMsg(1, '账号配置文件错误'));
         if ($req_aid != $config['aid'] || $req_pid != session('pid')) return json(backMsg(1, '监听收款配置不一致'));
         // 登陆账号
-        $pay_config = ['username' => $config['account'], 'password' => $config['password']];
+        $pay_config = ['username' => $config['account'], 'password' => $config['password'], 'aid' => $config['aid']];
         // 收款查询
         $params = $config['params'];
         // 实例监听客户端
diff --git a/view/pay/console.html b/view/pay/console.html
index dec561b..59de9e8 100644
--- a/view/pay/console.html
+++ b/view/pay/console.html
@@ -6,6 +6,44 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>收银台</title>
     <link rel="stylesheet" href="/component/pear/css/pear.css" />
+    <script>
+        function detectBrowserEnvironment() {
+            const userAgent = navigator.userAgent.toLowerCase();
+            let environment = 'other';
+            if (userAgent.includes('micromessenger')) {
+                if (userAgent.includes('miniprogram')) {
+                    environment = 'wxapp'; // 微信小程序
+                } else if (userAgent.includes('android') || userAgent.includes('iphone') || userAgent.includes('ipad')) {
+                    environment = 'wxphone'; // 手机微信
+                } else {
+                    environment = 'wxpc'; // PC微信
+                }
+            } else if (userAgent.includes('aliapp') || userAgent.includes('alipayclient')) {
+                if (userAgent.includes('android') || userAgent.includes('iphone') || userAgent.includes('ipad')) {
+                    environment = 'aliphone'; // 手机支付宝
+                } else {
+                    environment = 'alipc'; // PC支付宝
+                }
+            } else if (userAgent.includes('android') || userAgent.includes('iphone') || userAgent.includes('ipad')) {
+                // 先判断是否是已知的手机APP内置浏览器，如果不是则认为是手机浏览器
+                if (!userAgent.includes('micromessenger') && !userAgent.includes('aliapp') && !userAgent.includes('qq')) {
+                    environment = 'phone'; // 手机浏览器
+                }
+            } else {
+                environment = 'pc'; // 剩下的情况认为是PC浏览器
+            }
+            return environment;
+        }
+        const payCode = '<?php echo $payUrl; ?>';
+        const codeType = '<?php echo htmlentities($code_type); ?>';
+        const payType = '<?php echo htmlentities($type); ?>';
+        const order = '<?php echo htmlentities($order_id); ?>';
+        const environment = detectBrowserEnvironment();
+        const payclient = '<?php echo htmlentities($payclient ?? ""); ?>';
+        if (payclient == 'Alipayf' && environment == 'aliphone') {
+            window.location.href = payCode;
+        }
+    </script>
     <style>
         body {
             background: #f7f7f7;
@@ -157,39 +195,6 @@
     <script src="/component/layui/layui.js"></script>
     <script src="/static/js/awesome-qr.min.js"></script>
     <script>
-        function detectBrowserEnvironment() {
-            const userAgent = navigator.userAgent.toLowerCase();
-            let environment = 'other';
-            if (userAgent.includes('micromessenger')) {
-                if (userAgent.includes('miniprogram')) {
-                    environment = 'wxapp'; // 微信小程序
-                } else if (userAgent.includes('android') || userAgent.includes('iphone') || userAgent.includes('ipad')) {
-                    environment = 'wxphone'; // 手机微信
-                } else {
-                    environment = 'wxpc'; // PC微信
-                }
-            } else if (userAgent.includes('aliapp') || userAgent.includes('alipayclient')) {
-                if (userAgent.includes('android') || userAgent.includes('iphone') || userAgent.includes('ipad')) {
-                    environment = 'aliphone'; // 手机支付宝
-                } else {
-                    environment = 'alipc'; // PC支付宝
-                }
-            } else if (userAgent.includes('android') || userAgent.includes('iphone') || userAgent.includes('ipad')) {
-                // 先判断是否是已知的手机APP内置浏览器，如果不是则认为是手机浏览器
-                if (!userAgent.includes('micromessenger') && !userAgent.includes('aliapp') && !userAgent.includes('qq')) {
-                    environment = 'phone'; // 手机浏览器
-                }
-            } else {
-                environment = 'pc'; // 剩下的情况认为是PC浏览器
-            }
-            return environment;
-        }
-    </script>
-    <script>
-        const payCode = '<?php echo $payUrl; ?>';
-        const codeType = '<?php echo htmlentities($code_type); ?>';
-        const payType = '<?php echo htmlentities($type); ?>';
-        const order = '<?php echo htmlentities($order_id); ?>';
         const QR = AwesomeQR.AwesomeQR;
         (async () => {
             // 支付类型
@@ -207,7 +212,16 @@
             }
             // 生成二维码
             if (codeType == 0) {
-                document.getElementById('qrcode').src = await getQrcode(payCode, QR);
+                if (payType === 'alipay' && environment === 'pc') {
+                    // 解析网址
+                    const url = new URL(payCode);
+                    const queryParams = new URLSearchParams(url.search);
+                    const qrcode = queryParams.get('qrcode');
+                    const decodedQrcode = decodeURIComponent(qrcode);
+                    document.getElementById('qrcode').src = await getQrcode(decodedQrcode, QR);
+                } else {
+                    document.getElementById('qrcode').src = await getQrcode(payCode, QR);
+                }
             } else {
                 document.getElementById('qrcode').src = payCode;
             }
@@ -284,7 +298,6 @@
         /* <?php } ?> */
 
         // 环境判断
-        const environment = detectBrowserEnvironment();
         if (payType === 'wxpay' && environment === 'aliphone') {
             layer.alert('请使用微信打开此页面');
         } else if (payType === 'alipay' && environment === 'wxphone') {