From 0492be9b5eca5fd76767e0a39870430f8f2d799e Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Mon, 14 Jan 2019 13:56:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81url=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/index/controller/Goods.php          | 3 +++
 application/index/controller/Qrcode.php         | 2 +-
 application/index/view/default/goods/index.html | 2 +-
 extend/payment/Weixin.php                       | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/application/index/controller/Goods.php b/application/index/controller/Goods.php
index d50a99506..0b76ebea2 100755
--- a/application/index/controller/Goods.php
+++ b/application/index/controller/Goods.php
@@ -71,6 +71,9 @@ class Goods extends Common
             $this->assign('goods', $goods[0]);
             $this->assign('home_seo_site_title', $goods[0]['title']);
 
+            // 二维码
+            $this->assign('qrcode_url', MyUrl('index/qrcode/index', ['content'=>urlencode(base64_encode(MyUrl('index/goods/index', ['id'=>$id], true, true)))]));
+
             // 商品访问统计
             GoodsService::GoodsAccessCountInc(['goods_id'=>$id]);
 
diff --git a/application/index/controller/Qrcode.php b/application/index/controller/Qrcode.php
index 785feaad5..c11c1adcb 100755
--- a/application/index/controller/Qrcode.php
+++ b/application/index/controller/Qrcode.php
@@ -38,7 +38,7 @@ class QrCode extends Common
         $level = isset($params['level']) && in_array($params['level'], array('L','M','Q','H')) ? $params['level'] : 'L';
         $point_size = isset($params['size']) ? min(max(intval($params['size']), 1), 10) : 6;
         $mr = isset($params['mr']) ? intval($params['mr']) : 1;
-        $content = isset($params['content']) ? urldecode(trim($params['content'])) : __MY_URL__;
+        $content = isset($params['content']) ? base64_decode(urldecode(trim($params['content']))) : __MY_URL__;
         \QRcode::png($content, false, $level, $point_size, $mr);
     }
 }
diff --git a/application/index/view/default/goods/index.html b/application/index/view/default/goods/index.html
index 95f264409..68fc8e402 100755
--- a/application/index/view/default/goods/index.html
+++ b/application/index/view/default/goods/index.html
@@ -100,7 +100,7 @@
                     <div class="goods-qrcode am-hide-sm-only">
                         <span>手机扫一扫购买</span>
                         <i class="am-icon-qrcode am-icon-sm"></i>
-                        <img class="qrcode-images am-img-thumbnail" src="{{:MyUrl('index/qrcode/index', ['content'=>urlencode(MyUrl('index/goods/index', ['id'=>$goods['id']], true, true))])}}" />
+                        <img class="qrcode-images am-img-thumbnail" src="{{$qrcode_url}}" />
                     </div>
                 </div>
 
diff --git a/extend/payment/Weixin.php b/extend/payment/Weixin.php
index 97600801a..29ca1e26f 100644
--- a/extend/payment/Weixin.php
+++ b/extend/payment/Weixin.php
@@ -172,7 +172,7 @@ class Weixin
             // web支付
             case 'NATIVE' :
                 $pay_params = [
-                    'url'       => urlencode($data['code_url']),
+                    'url'       => urlencode(base64_encode($data['code_url'])),
                     'order_no'  => $params['order_no'],
                     'name'      => urlencode('微信支付'),
                     'msg'       => urlencode('打开微信APP扫一扫进行支付'),