From 625dc010efc06ba4e080221acc804f493bb3ccbc Mon Sep 17 00:00:00 2001
From: lixiaoyu <1906596264@qq.com>
Date: Fri, 22 Sep 2023 15:11:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=88=A4=E6=96=AD=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/plugins/payment/wxpay.php        | 39 +++++++++++++++++++++------------
 mobile/source/apps/flow/views/done.html |  1 +
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/mobile/plugins/payment/wxpay.php b/mobile/plugins/payment/wxpay.php
index a5a5a5f..9477774 100755
--- a/mobile/plugins/payment/wxpay.php
+++ b/mobile/plugins/payment/wxpay.php
@@ -220,6 +220,7 @@ class wxpay
 
         // wxjsbridge
         $js = '
+
         <script language="javascript">
             function jsApiCall(){
                 WeixinJSBridge.invoke("getBrandWCPayRequest",
@@ -237,21 +238,31 @@ class wxpay
                                 };
             function callpay()
             { 
-                if (typeof WeixinJSBridge == "undefined")
-                {
-                    if( document.addEventListener )
-                    {
-                        document.addEventListener("WeixinJSBridgeReady", jsApiCall, false);
-                    }else if (document.attachEvent)
-                    {
-                        document.attachEvent("WeixinJSBridgeReady", jsApiCall);
-                        document.attachEvent("onWeixinJSBridgeReady", jsApiCall);
-                    }
-                }else
-                {
-                    jsApiCall();
-                }
+                wx.miniProgram.getEnv(function(res) {
                 
+                    if(res.miniprogram){
+                    console.log(123);
+                        // true代表在小程序里
+                    
+                    }else{
+                     console.log(456);
+                        //false代表在公众号里
+                        if (typeof WeixinJSBridge == "undefined")
+                        {
+                            if( document.addEventListener )
+                            {
+                                document.addEventListener("WeixinJSBridgeReady", jsApiCall, false);
+                            }else if (document.attachEvent)
+                            {
+                                document.attachEvent("WeixinJSBridgeReady", jsApiCall);
+                                document.attachEvent("onWeixinJSBridgeReady", jsApiCall);
+                            }
+                        }else
+                        {
+                            jsApiCall();
+                        }
+                    }
+                })
             }
         </script>';
         // window.location.href = "{U(\'flow/index/done\')}";
diff --git a/mobile/source/apps/flow/views/done.html b/mobile/source/apps/flow/views/done.html
index 5770910..0bb3202 100755
--- a/mobile/source/apps/flow/views/done.html
+++ b/mobile/source/apps/flow/views/done.html
@@ -1,4 +1,5 @@
 {include file="page_header"}
+<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
 <div class="con">
     <div class="flow-done">
         <div class="flow-done-con">