From 4064b48ca976e1c67d56eeabf109397489efb1b0 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Mon, 17 Jun 2019 18:17:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/index/controller/Pay.php           | 1 -
 application/index/view/default/pay/qrcode.html | 2 +-
 extend/payment/Weixin.php                      | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/application/index/controller/Pay.php b/application/index/controller/Pay.php
index 85100daf1..5cd04c674 100644
--- a/application/index/controller/Pay.php
+++ b/application/index/controller/Pay.php
@@ -48,7 +48,6 @@ class Pay extends Common
             $this->assign('msg', '参数有误');
             return $this->fetch('public/tips_error');
         } else {
-            //print_r($params);die;
             $this->assign('params', $params);
             return $this->fetch();
         }
diff --git a/application/index/view/default/pay/qrcode.html b/application/index/view/default/pay/qrcode.html
index 67be49ea7..29111c911 100644
--- a/application/index/view/default/pay/qrcode.html
+++ b/application/index/view/default/pay/qrcode.html
@@ -19,7 +19,7 @@
 <!-- conntent start  -->
 <div class="am-g my-content">
     <div class="am-u-md-6 am-u-sm-centered">
-        <div class="am-panel am-radius qrcode-pay" data-ajax-url="{{:urldecode($params['ajax_url'])}}" data-order-no="{{$params['order_no']}}">
+        <div class="am-panel am-radius qrcode-pay" data-ajax-url="{{:base64_decode(urldecode($params['ajax_url']))}}" data-order-no="{{$params['order_no']}}">
             <div class="am-panel-bd">
                 <div class="name">{{:urldecode($params['name'])}}</div>
                 <img class="qrcode-images am-img-thumbnail" src="{{:MyUrl('index/qrcode/index', ['content'=>$params['url']])}}">
diff --git a/extend/payment/Weixin.php b/extend/payment/Weixin.php
index 2cd2d8a56..96a784d7f 100755
--- a/extend/payment/Weixin.php
+++ b/extend/payment/Weixin.php
@@ -218,7 +218,7 @@ class Weixin
                     'order_no'  => $params['order_no'],
                     'name'      => urlencode('微信支付'),
                     'msg'       => urlencode('打开微信APP扫一扫进行支付'),
-                    'ajax_url'  => urlencode($params['ajax_url']),
+                    'ajax_url'  => urlencode(base64_encode($params['ajax_url'])),
                 ];
                 $url = MyUrl('index/pay/qrcode', $pay_params);
                 $result = DataReturn('success', 0, $url);
-- 
GitLab