From 8170ff07ba1f007e6d8fb8e79654f7567943e953 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Fri, 3 Dec 2021 14:44:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/payment/Weixin.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/extend/payment/Weixin.php b/extend/payment/Weixin.php
index f89b4377f..515a4975e 100755
--- a/extend/payment/Weixin.php
+++ b/extend/payment/Weixin.php
@@ -511,8 +511,16 @@ class Weixin
         if($client_type == 'h5')
         {
             // 微信中打开
-            // h5则使用NATIVE二维码的方式
-            $type_all['h5'] = IsWeixinEnv() ? $type_all['weixin'] : $type_all['pc'];
+            if(IsWeixinEnv())
+            {
+                $type_all['h5'] = $type_all['weixin'];
+            } else {
+                // 非手机访问h5则使用NATIVE二维码的方式
+                if(!IsMobile())
+                {
+                    $type_all['h5'] = $type_all['pc'];
+                }
+            }
         }
 
         return isset($type_all[$client_type]) ? $type_all[$client_type] : '';