|
@@ -97,7 +97,12 @@ class Pay extends Api
|
|
|
'returnurl' => '',
|
|
|
];
|
|
|
$res = Service::submitOrder($params);
|
|
|
- $this->success('请求成功',json_decode($res,true));
|
|
|
+
|
|
|
+ if($pay_type == 'wechat'){
|
|
|
+ $this->success('success',json_decode($res,true));
|
|
|
+ }else{
|
|
|
+ $this->success('success',$res);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|
|
@@ -191,15 +196,18 @@ class Pay extends Api
|
|
|
'orderid' => $pay_no,
|
|
|
'title' => $data['memo'],
|
|
|
'amount' => $data['money'],
|
|
|
- //'amount' => 0.01,
|
|
|
- //'method' => 'miniapp',
|
|
|
+ 'amount' => 0.01,
|
|
|
'method' => 'app',
|
|
|
- //'openid' => $openid,
|
|
|
'notifyurl' => $this->request->root(true) . '/notify.php',
|
|
|
'returnurl' => '',
|
|
|
];
|
|
|
$res = Service::submitOrder($params);
|
|
|
- $this->success('请求成功',json_decode($res,true));
|
|
|
+
|
|
|
+ if($pay_type == 'wechat'){
|
|
|
+ $this->success('success',json_decode($res,true));
|
|
|
+ }else{
|
|
|
+ $this->success('success',$res);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
}
|