From c5702bf1565e2d6f514d8c87116b9e2c2417cb7b Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Sat, 2 Nov 2019 14:49:09 +0800
Subject: [PATCH] =?UTF-8?q?qq=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/payment/QQ.php | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/extend/payment/QQ.php b/extend/payment/QQ.php
index d6c23ccca..c96ada250 100644
--- a/extend/payment/QQ.php
+++ b/extend/payment/QQ.php
@@ -193,24 +193,30 @@ class QQ
         {
             // web支付
             case 'NATIVE' :
-                if(empty($params['ajax_url']))
+                // 手机模式下直接返回微信的支付url地址
+                if(APPLICATION_CLIENT_TYPE == 'h5' || IsMobile())
                 {
-                    return DataReturn('支付状态校验地址不能为空', -50);
+                    $result = DataReturn('success', 0, $data['code_url']);
+                } else {
+                    if(empty($params['ajax_url']))
+                    {
+                        return DataReturn('支付状态校验地址不能为空', -50);
+                    }
+                    $pay_params = [
+                        'url'       => urlencode(base64_encode($data['code_url'])),
+                        'order_no'  => $params['order_no'],
+                        'name'      => urlencode('QQ支付'),
+                        'msg'       => urlencode('打开QQAPP扫一扫进行支付'),
+                        'ajax_url'  => urlencode(base64_encode($params['ajax_url'])),
+                    ];
+                    $url = MyUrl('index/pay/qrcode', $pay_params);
+                    $result = DataReturn('success', 0, $url);
                 }
-                $pay_params = [
-                    'url'       => urlencode(base64_encode($data['code_url'])),
-                    'order_no'  => $params['order_no'],
-                    'name'      => urlencode('QQ支付'),
-                    'msg'       => urlencode('打开QQAPP扫一扫进行支付'),
-                    'ajax_url'  => urlencode(base64_encode($params['ajax_url'])),
-                ];
-                $url = MyUrl('index/pay/qrcode', $pay_params);
-                $result = DataReturn('success', 0, $url);
                 break;
 
             // QQ中公众号支付
             case 'JSAPI' :
-                $result = DataReturn('暂不支持QQ中支付', -1);
+                $result = DataReturn('公众号暂不支持', -1);
                 break;
 
             // QQ小程序支付
@@ -285,19 +291,13 @@ class QQ
     {
         $type_all = [
             'pc'        => 'NATIVE',
-            'h5'        => 'JSAPI',
+            'h5'        => 'NATIVE',
             'qq'        => 'MINIAPP',
             'app'       => 'APP',
             'ios'       => 'APP',
             'android'   => 'APP',
         ];
 
-        // 手机中打开pc版本
-        if(APPLICATION_CLIENT_TYPE == 'pc' && IsMobile())
-        {
-            $type_all['pc'] = $type_all['h5'];
-        }
-
         return isset($type_all[APPLICATION_CLIENT_TYPE]) ? $type_all[APPLICATION_CLIENT_TYPE] : '';
     }