From a1457dee663c7bcf1c6ff3b9c0e5174d73234fa2 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Mon, 7 Jan 2019 15:41:04 +0800
Subject: [PATCH] pay debug

---
 extend/payment/WeixinMini.php                       |  2 +-
 .../old/wechat/pages/user-order/user-order.js       | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/extend/payment/WeixinMini.php b/extend/payment/WeixinMini.php
index 776fbe9b2..3b7ff9942 100644
--- a/extend/payment/WeixinMini.php
+++ b/extend/payment/WeixinMini.php
@@ -160,7 +160,7 @@ class WeixinMini
                     'prepay_id'     => $result['prepay_id'],
                     'nonce_str'     => md5(time().rand()),
                     'sign_type'     => $ret['data']['sign_type'],
-                    'timestamp'     => time(),
+                    'timestamp'     => (string) time(),
                 );
             $pay_data['sign'] = $this->GetSign($pay_data);
             return DataReturn('success', 0, $pay_data);
diff --git a/public/appmini/old/wechat/pages/user-order/user-order.js b/public/appmini/old/wechat/pages/user-order/user-order.js
index 4d27b9984..26b8aa489 100755
--- a/public/appmini/old/wechat/pages/user-order/user-order.js
+++ b/public/appmini/old/wechat/pages/user-order/user-order.js
@@ -233,12 +233,13 @@ Page({
 
             app.showToast("支付成功", "success");
           } else {
-            wx.tradePay({
-              timeStamp: res.data.data.timestamp,
-              nonceStr: res.data.data.nonce_str,
-              package: 'partnerid=' + res.data.data.prepay_id,
-              signType: res.data.data.sign_type,
-              paySign: res.data.data.sign,
+            console.log(res.data.data.data)
+            wx.requestPayment({
+              timeStamp: res.data.data.data.timestamp,
+              nonceStr: res.data.data.data.nonce_str,
+              package: 'partnerid=' + res.data.data.data.prepay_id,
+              signType: res.data.data.data.sign_type,
+              paySign: res.data.data.data.sign,
               success: res => {
                 console.log(res);
                 // 数据设置