diff --git a/extend/payment/WeixinMini.php b/extend/payment/WeixinMini.php index 487e39f3d..776fbe9b2 100644 --- a/extend/payment/WeixinMini.php +++ b/extend/payment/WeixinMini.php @@ -155,12 +155,12 @@ class WeixinMini { // 返回数据 $pay_data = array( - 'appid' => $this->config['appid'], - 'partnerid' => $this->config['mch_id'], - 'prepayid' => $result['prepay_id'], - 'package' => 'prepay_id='.$result['prepay_id'], - 'noncestr' => md5(time().rand()), - 'timestamp' => time(), + 'appid' => $this->config['appid'], + 'mch_id' => $this->config['mch_id'], + 'prepay_id' => $result['prepay_id'], + 'nonce_str' => md5(time().rand()), + 'sign_type' => $ret['data']['sign_type'], + 'timestamp' => 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 a39f435ca..4d27b9984 100755 --- a/public/appmini/old/wechat/pages/user-order/user-order.js +++ b/public/appmini/old/wechat/pages/user-order/user-order.js @@ -234,24 +234,29 @@ Page({ app.showToast("支付成功", "success"); } else { wx.tradePay({ - tradeNO: res.data.data.data, + 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, success: res => { + console.log(res); // 数据设置 - if (res.resultCode == 9000) { - var temp_data_list = this.data.data_list; - temp_data_list[index]['status'] = 2; - temp_data_list[index]['status_name'] = '待发货'; - this.setData({ data_list: temp_data_list }); - } + // if (res.resultCode == 9000) { + // var temp_data_list = this.data.data_list; + // temp_data_list[index]['status'] = 2; + // temp_data_list[index]['status_name'] = '待发货'; + // this.setData({ data_list: temp_data_list }); + // } - // 跳转支付页面 - wx.navigateTo({ - url: - "/pages/paytips/paytips?code=" + - res.resultCode + - "&total_price=" + - this.data.data_list[index]['total_price'] - }); + // // 跳转支付页面 + // wx.navigateTo({ + // url: + // "/pages/paytips/paytips?code=" + + // res.resultCode + + // "&total_price=" + + // this.data.data_list[index]['total_price'] + // }); }, fail: res => { app.showToast("唤起支付模块失败");