Jason/heping-api
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
knowpia
2022-09-19 14:03:57 +08:00
parent d0053b4db7 b071bf6ede
commit 11034c4dba
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controller/Wechat.php
View File

@@ -101,6 +101,10 @@ class Wechat
{
$clientToken = Request::get('token');
$orderId = Request::get('order_id');
$callback = Request::get('callback');
$sep = str_contains($callback, '?') ? '&' : '?';
$callback = $callback.$sep.'refresh=true';
if ($clientToken) {
$tk = json_decode(authcode($clientToken), true);
$userId = $tk['userid'];
@@ -150,7 +154,7 @@ class Wechat
}
$prepayId = $unify['prepay_id'];
$jssdk = $payment->jssdk->bridgeConfig($prepayId, false);
return View::fetch('', ['jssdk' => $jssdk]);
return View::fetch('', ['jssdk' => $jssdk, 'callback' => $callback]);
}
/**