From 8ad62c304cc8d560d23f19e413ad9048eab7c9a0 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Wed, 10 Nov 2021 20:58:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98h5=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=9C=B0=E5=9D=80urlencode=E6=96=B0=E5=A2=9E=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/extend/payment/Weixin.php b/extend/payment/Weixin.php
index 69389ca4b..0dd785436 100755
--- a/extend/payment/Weixin.php
+++ b/extend/payment/Weixin.php
@@ -50,7 +50,7 @@ class Weixin
         // 基础信息
         $base = [
             'name'          => '微信',  // 插件名称
-            'version'       => '1.1.3',  // 插件版本
+            'version'       => '1.1.4',  // 插件版本
             'apply_version' => '不限',  // 适用系统版本描述
             'apply_terminal'=> ['pc', 'h5', 'ios', 'android', 'weixin', 'qq'], // 适用终端 默认全部 ['pc', 'h5', 'app', 'alipay', 'weixin', 'baidu']
             'desc'          => '适用公众号+PC+H5+APP+微信小程序，即时到帐支付方式，买家的交易资金直接打入卖家账户，快速回笼交易资金。 <a href="https://pay.weixin.qq.com/" target="_blank">立即申请</a>',  // 插件描述（支持html）
@@ -140,6 +140,17 @@ class Weixin
                     ['value'=>2, 'name'=>'强制https转http协议'],
                 ],
             ],
+            [
+                'element'       => 'select',
+                'title'         => 'h5跳转地址urlencode',
+                'message'       => '请选择h5跳转地址urlencode',
+                'name'          => 'is_h5_url_encode',
+                'is_multiple'   => 0,
+                'element_data'  => [
+                    ['value'=>1, 'name'=>'是'],
+                    ['value'=>2, 'name'=>'否'],
+                ],
+            ],
         ];
 
         return [
@@ -257,7 +268,9 @@ class Weixin
             case 'MWEB' :
                 if(!empty($params['order_id']))
                 {
-                    $data['mweb_url'] .= '&redirect_url='.urlencode($redirect_url);
+                    // 是否需要urlencode
+                    $redirect_url = (isset($this->config['is_h5_url_encode']) && $this->config['is_h5_url_encode'] == 1) ? urlencode($redirect_url) : $redirect_url;
+                    $data['mweb_url'] .= '&redirect_url='.$redirect_url;
                 }
                 $result = DataReturn('success', 0, $data['mweb_url']);
                 break;