From 396524ebeb0c459f5ed1bf1c4bd2a1f6b0e14765 Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Sun, 14 Jul 2019 15:04:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/index/view/default/config.json | 2 +-
 application/lang/zh-cn.php                 | 1 +
 application/service/OrderService.php       | 2 +-
 public/core.php                            | 2 +-
 public/static/index/default/css/user.css   | 3 +++
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/application/index/view/default/config.json b/application/index/view/default/config.json
index 20e918add..968947093 100755
--- a/application/index/view/default/config.json
+++ b/application/index/view/default/config.json
@@ -1,6 +1,6 @@
 {
 	"name":"默认模板",
-	"ver":"1.5.0",
+	"ver":"1.6.0",
 	"author":"Devil",
 	"home":"http://shopxo.net/"
 }
\ No newline at end of file
diff --git a/application/lang/zh-cn.php b/application/lang/zh-cn.php
index 81173e7ec..4344a82c6 100755
--- a/application/lang/zh-cn.php
+++ b/application/lang/zh-cn.php
@@ -24,6 +24,7 @@ return array(
             '1.3.0' => array('value' => '1.3.0', 'name' => 'v1.3.0'),
             '1.4.0' => array('value' => '1.4.0', 'name' => 'v1.4.0'),
             '1.5.0' => array('value' => '1.5.0', 'name' => 'v1.5.0'),
+            '1.6.0' => array('value' => '1.6.0', 'name' => 'v1.6.0'),
         ),
 
     // 用户注册类型列表
diff --git a/application/service/OrderService.php b/application/service/OrderService.php
index 74872e6a1..490d426bd 100755
--- a/application/service/OrderService.php
+++ b/application/service/OrderService.php
@@ -316,7 +316,7 @@ class OrderService
 
         // 支付数据校验
         $pay_name = 'payment\\'.$payment_name;
-        $ret = (new $pay_name($payment[0]['config']))->Respond(array_merge($_GET, $_POST));
+        $ret = (new $pay_name($payment[0]['config']))->Respond($params);
         if(isset($ret['code']) && $ret['code'] == 0)
         {
             if(empty($ret['data']['out_trade_no']))
diff --git a/public/core.php b/public/core.php
index 23c658c56..0c98e8bf0 100755
--- a/public/core.php
+++ b/public/core.php
@@ -13,7 +13,7 @@
 if(version_compare(PHP_VERSION,'5.6.0','<'))  die('PHP版本最低 5.6.0');
 
 // 系统版本
-define('APPLICATION_VERSION', 'v1.5.0');
+define('APPLICATION_VERSION', 'v1.6.0');
 
 // 定义系统目录分隔符
 define('DS', '/');
diff --git a/public/static/index/default/css/user.css b/public/static/index/default/css/user.css
index e3ddde188..1c50ce7e9 100755
--- a/public/static/index/default/css/user.css
+++ b/public/static/index/default/css/user.css
@@ -84,6 +84,9 @@
 .register-container .am-tabs-d2 .am-tabs-nav > .am-active:after {
     border-bottom-color: #d2364c;
 }
+.register-container .am-tabs-d2 .am-tabs-bd {
+    z-index: 0;
+}
 
 /**
  * 表单验证码