|
@@ -53,13 +53,14 @@ class Wechat extends Core
|
|
|
if ($type == 1) {
|
|
|
$order = \WxPayApi::unifiedOrder($this->config, $input);
|
|
|
# 下单信息
|
|
|
- $this->updateOrderParam($order_id, $order);
|
|
|
$order['time'] = time();
|
|
|
- return array($order_id, $order);
|
|
|
+ $order['order_id'] = $order_id;
|
|
|
+ $this->updateOrderParam($order_id, $order);
|
|
|
+ return $order;
|
|
|
} else {
|
|
|
# 下单信息
|
|
|
$this->updateOrderParam($order_id, $input);
|
|
|
- return array($order_id, $input);
|
|
|
+ return $input;
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -69,7 +70,7 @@ class Wechat extends Core
|
|
|
public function qrcode($order, $refer)
|
|
|
{
|
|
|
$notify = new \NativePay();
|
|
|
- $result = $notify->GetPayUrl($order[1]);
|
|
|
+ $result = $notify->GetPayUrl($order);
|
|
|
$url = $result['code_url'];
|
|
|
return $url;
|
|
|
}
|
|
@@ -82,7 +83,7 @@ class Wechat extends Core
|
|
|
{
|
|
|
$refer = urldecode($refer);
|
|
|
$tools = new \JsApiPay($this->config);
|
|
|
- $info = $tools->GetJsApiParameters($order[1]);
|
|
|
+ $info = $tools->GetJsApiParameters($order);
|
|
|
|
|
|
$html = '<script type="text/javascript">
|
|
|
function jsApiCall()
|