fix and add

1.  简化支付;
2. 修复余额充值显示错误;
3. 加入关闭订单功能;
4. 改PayJS支付方式为收银台模式cashier,而非扫码模式native
This commit is contained in:
兔姬桑
2020-06-30 04:05:41 +08:00
parent 7d6cf16b86
commit 32e8638363
24 changed files with 353 additions and 308 deletions

View File

@@ -302,7 +302,6 @@ class UserController extends Controller {
// 有重置日时按照重置日为标准,否者就以过期日为标准
$dataPlusDays = $user->reset_time? $user->reset_time : $user->expire_time;
$view['dataPlusDays'] = $dataPlusDays > date('Y-m-d')? round((strtotime($dataPlusDays) - strtotime(date('Y-m-d'))) / Day) : 0;
$view['purchaseHTML'] = PaymentController::purchaseHTML();
return Response::view('user.services', $view);
}
@@ -559,7 +558,6 @@ class UserController extends Controller {
$q->whereType(2);
})
->exists();
$view['purchaseHTML'] = PaymentController::purchaseHTML();
$view['goods'] = $goods;
return Response::view('user.buy', $view);