From add9c2de486da5ee13af888fe5e6145f21ac6ddf Mon Sep 17 00:00:00 2001
From: dreamn <dream@dreamn.cn>
Date: Sat, 9 May 2020 11:03:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=85=E7=BD=AE=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E6=97=A0=E6=B3=95=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  | 5 +++++
 install/config.php                            | 2 +-
 protected/controller/admin/BaseController.php | 2 +-
 protected/controller/index/BuyController.php  | 3 ++-
 protected/model/Order.php                     | 2 --
 protected/view/index/buy_return.html          | 4 ++--
 protected/view/index/shop_index.html          | 6 +++---
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e2039e..9f8d904 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 **普通更新，直接删除install目录直接覆盖安装即可，注意修改config.php的相关配置文件**
 
+#### Ver. 2.4(2020.05.09)
+
+1、[BUG]修复内置商城无法使用微信支付的问题
+
 #### Ver. 2.3(2020.05.09)
 
 1、[更新]修复因为文件写入权限问题导致二维码识别失败的情况
@@ -8,6 +12,7 @@
 **重要更新**
 
 1、[BUG]修复核心框架组件导致的客户端无法访问的问题
+
 2、[BUG]修复添加应用失败的问题
 
 #### Ver. 2.1(2020.05.04)
diff --git a/install/config.php b/install/config.php
index fcb8e8c..950d610 100644
--- a/install/config.php
+++ b/install/config.php
@@ -1,6 +1,6 @@
 <?php
 define('APP_NAME','Vpay');
-define('APP_VER','2.3');
+define('APP_VER','2.4');
 define('APP_UPDATE','2020.05.09');
 define('APP_AUTHOR','Dreamn');
 define('APP_TITLE','V免签安装向导');
diff --git a/protected/controller/admin/BaseController.php b/protected/controller/admin/BaseController.php
index de20490..ace1fa3 100644
--- a/protected/controller/admin/BaseController.php
+++ b/protected/controller/admin/BaseController.php
@@ -8,7 +8,7 @@
 class BaseController extends Controller
 {
     public $layout = "layout";
-    public $version='2.3';
+    public $version='2.4';
 
     function init()
     {
diff --git a/protected/controller/index/BuyController.php b/protected/controller/index/BuyController.php
index 1a40330..3c18d9c 100644
--- a/protected/controller/index/BuyController.php
+++ b/protected/controller/index/BuyController.php
@@ -94,7 +94,8 @@ public function actionCreate(){
 
         $payId=$vpay->getPayId($price,$param);
 
-        $type=intval(arg('type'))===1?1:2;
+        
+        $type=intval(arg('type'));
 
         $html=1;//是否使用自带的支付页面，为0表示不使用自带的支付页面
 
diff --git a/protected/model/Order.php b/protected/model/Order.php
index da1ff13..770426c 100644
--- a/protected/model/Order.php
+++ b/protected/model/Order.php
@@ -183,8 +183,6 @@ public function createOrder($arg)
         $timeout=intval($time)*60+$createDate;
         //获得真实的支付金额
         if (!$this->getPayMoney($arg["price"], $arg["type"],$timeout))return false;
-        //对参数进行解码，进行url编码防止传输过程中中断
-        $json=json_decode(urldecode($arg["param"]));
 
         //取得支付二维码
         if (!$this->getPayPic())return false;
diff --git a/protected/view/index/buy_return.html b/protected/view/index/buy_return.html
index d72d39d..5419ca3 100644
--- a/protected/view/index/buy_return.html
+++ b/protected/view/index/buy_return.html
@@ -64,13 +64,13 @@ <h2>优雅的个人自动化收款解决方案</h2>
             form = layui.form;
         form.on('submit(alipay)',function () {
             var arr=form.val('Tsetform');
-            arr.type=1;
+            arr.type=2;
             post('<{url c="buy" a="create"}>',arr);
             return false;
         });
         form.on('submit(wechat)',function () {
             var arr=form.val('Tsetform');
-            arr.type=2;
+            arr.type=1;
             post('<{url c="buy" a="create"}>',arr);
             return false;
         });
diff --git a/protected/view/index/shop_index.html b/protected/view/index/shop_index.html
index 3640938..998af3a 100644
--- a/protected/view/index/shop_index.html
+++ b/protected/view/index/shop_index.html
@@ -47,7 +47,7 @@ <h2>优雅的个人自动化收款解决方案</h2>
     <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
         <legend>支付测试</legend>
     </fieldset>
-    <form class="layui-form layui-form-pane" style="max-width: 500px;margin: 0 auto" lay-filter="Tsetform">
+    <form class="layui-form layui-form-pane" style="max-width: 500px;margin: 0 auto" lay-filter="Testform">
         <div class="layui-form-item">
             <label class="layui-form-label">商品选择</label>
             <div class="layui-input-block">
@@ -85,13 +85,13 @@ <h2>优雅的个人自动化收款解决方案</h2>
             element = layui.element,
             form = layui.form;
         form.on('submit(alipay)',function () {
-            var arr=form.val('Tsetform');
+            var arr=form.val('Testform');
             arr.type=1;
             post('<{url c="buy" a="create"}>',arr);
             return false;
         });
         form.on('submit(wechat)',function () {
-            var arr=form.val('Tsetform');
+            var arr=form.val('Testform');
             arr.type=2;
             post('<{url c="buy" a="create"}>',arr);
             return false;