|
@@ -764,6 +764,7 @@ class OrdersController extends Controller
|
|
|
public function waitPage(Request $request)
|
|
public function waitPage(Request $request)
|
|
|
{
|
|
{
|
|
|
$order = $request->input('order');
|
|
$order = $request->input('order');
|
|
|
|
|
+ $from = 'pay';
|
|
|
//$order = "201712081711401585932843356442";
|
|
//$order = "201712081711401585932843356442";
|
|
|
$order = (string)$order;
|
|
$order = (string)$order;
|
|
|
$order_info = OrderService::getByTradeNo($order);
|
|
$order_info = OrderService::getByTradeNo($order);
|
|
@@ -774,7 +775,7 @@ class OrdersController extends Controller
|
|
|
$page = 'pay.order.bindPhone';
|
|
$page = 'pay.order.bindPhone';
|
|
|
}
|
|
}
|
|
|
$url = urldecode($request->input('redirect'));
|
|
$url = urldecode($request->input('redirect'));
|
|
|
- return view($page, compact('order', 'url'));
|
|
|
|
|
|
|
+ return view($page, compact('order', 'url','from'));
|
|
|
//return view('pay.order.wait');
|
|
//return view('pay.order.wait');
|
|
|
}
|
|
}
|
|
|
|
|
|
