diff --git a/application/plugins/view/weixinwebauthorization/index/pay/index.html b/application/plugins/view/weixinwebauthorization/index/pay/index.html index 16e421d4f..80e5b58c0 100644 --- a/application/plugins/view/weixinwebauthorization/index/pay/index.html +++ b/application/plugins/view/weixinwebauthorization/index/pay/index.html @@ -1 +1,47 @@ -pay \ No newline at end of file + \ No newline at end of file diff --git a/application/plugins/weixinwebauthorization/index/Pay.php b/application/plugins/weixinwebauthorization/index/Pay.php index 756aeb3b4..c23c4ee36 100644 --- a/application/plugins/weixinwebauthorization/index/Pay.php +++ b/application/plugins/weixinwebauthorization/index/Pay.php @@ -31,11 +31,12 @@ class Pay extends Controller */ public function Index($params = []) { - if(empty($params['pay_data'])) + if(!empty($params['pay_data'])) { $pay_data = json_decode(urldecode($params['pay_data']), true); - print_r($pay_data);die; - + $redirect_url = empty($params['redirect_url']) ? '' : urldecode($params['redirect_url']); + $this->assign('pay_data', $pay_data); + $this->assign('redirect_url', $redirect_url); return $this->fetch('../../../plugins/view/weixinwebauthorization/index/pay/index'); } else { $this->assign('msg', '支付参数错误'); diff --git a/extend/payment/Weixin.php b/extend/payment/Weixin.php index 58faec31b..7e3794b8d 100755 --- a/extend/payment/Weixin.php +++ b/extend/payment/Weixin.php @@ -166,6 +166,7 @@ class Weixin */ private function PayHandleReturn($pay_params = [], $data = [], $params = []) { + $redirect_url = empty($params['order_id']) ? '' : urlencode(MyUrl('index/order/detail', ['id'=>$params['order_id']])); $result = DataReturn('支付接口异常', -1); switch($pay_params['trade_type']) { @@ -190,7 +191,7 @@ class Weixin case 'MWEB' : if(!empty($params['order_id'])) { - $data['mweb_url'] .= '&redirect_url='.urlencode(MyUrl('index/order/detail', ['id'=>$params['order_id']])); + $data['mweb_url'] .= '&redirect_url='.$redirect_url; } $result = DataReturn('success', 0, $data['mweb_url']); break; @@ -209,7 +210,7 @@ class Weixin // 微信中 if(!empty($_SERVER['HTTP_USER_AGENT']) && stripos($_SERVER['HTTP_USER_AGENT'], 'MicroMessenger') !== false) { - $url = PluginsHomeUrl('weixinwebauthorization', 'pay', 'index', ['pay_data'=>urlencode(json_encode($pay_data))]); + $url = PluginsHomeUrl('weixinwebauthorization', 'pay', 'index', ['pay_data'=>urlencode(json_encode($pay_data)), 'redirect_url'=>$redirect_url]); $result = DataReturn('success', 0, $url); } else { $result = DataReturn('success', 0, $pay_data);