From c3c0419a655effacef82988ea582f05bfcaa0259 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Tue, 8 Jan 2019 13:22:18 +0800
Subject: [PATCH] pay debug

---
 application/index/controller/Order.php               | 3 +--
 application/index/view/default/order/qrcode_pay.html | 2 +-
 extend/payment/WeixinMini.php                        | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/application/index/controller/Order.php b/application/index/controller/Order.php
index fff489a97..1368c4441 100755
--- a/application/index/controller/Order.php
+++ b/application/index/controller/Order.php
@@ -235,8 +235,7 @@ class Order extends Common
             $this->assign('msg', '参数有误');
             return $this->fetch('public/tips_error');
         } else {
-            $this->assign('url', urldecode($params['url']));
-            $this->assign('order_no', $params['order_no']);
+            $this->assign('params', $params);
             return $this->fetch('qrcode_pay');
         }
     }
diff --git a/application/index/view/default/order/qrcode_pay.html b/application/index/view/default/order/qrcode_pay.html
index 9b5eeff66..500c7f2fe 100644
--- a/application/index/view/default/order/qrcode_pay.html
+++ b/application/index/view/default/order/qrcode_pay.html
@@ -21,7 +21,7 @@
     <div class="am-u-md-6 am-u-sm-centered">
         <div class="am-panel am-radius tips-success tips-pay-success">
             <div class="am-panel-bd">
-                <img class="qrcode-images am-img-thumbnail" src="{{:MyUrl('index/qrcode/index', ['content'=>urlencode($url)])}}">
+                <img class="qrcode-images am-img-thumbnail" src="{{:MyUrl('index/qrcode/index', ['content'=>$params['url']])}}">
             </div>
             <div class="tips">扫码支付</div>
         </div>
diff --git a/extend/payment/WeixinMini.php b/extend/payment/WeixinMini.php
index b02965f13..4f2e03ec6 100644
--- a/extend/payment/WeixinMini.php
+++ b/extend/payment/WeixinMini.php
@@ -167,8 +167,8 @@ class WeixinMini
                 $pay_params = [
                     'url'       => urlencode($data['code_url']),
                     'order_no'  => $params['order_no'],
-                    'name'      => '微信支付',
-                    'msg'       => '打开微信APP扫一扫进行支付',
+                    'name'      => urlencode('微信支付'),
+                    'msg'       => urlencode('打开微信APP扫一扫进行支付'),
                 ];
                 $url = MyUrl('index/order/qrcodepay', $pay_params);
                 $result = DataReturn('success', 0, $url);