diff --git a/Laravel/app/Http/Controllers/API/Web/OrderController.php b/Laravel/app/Http/Controllers/API/Web/OrderController.php index 3ec4c20..079fb77 100644 --- a/Laravel/app/Http/Controllers/API/Web/OrderController.php +++ b/Laravel/app/Http/Controllers/API/Web/OrderController.php @@ -503,11 +503,13 @@ class OrderController extends Controller public function SearchOrder(Request $request) { + $type = $request->post('type'); $order_start = $request->post('order_start'); $order_end = $request->post('order_end'); - $list = DB::table('orders'); + $list = DB::table($type == '1' ? 'orders' : 'orders_yuyue'); $list = $list->where('created_at', '>=', $order_start); $list = $list->where('created_at', '<=', $order_end); + $list = $list->where('source', 'web'); $list = $list->orderBy('id', 'desc')->get(); return \Yz::return(true, "操作成功", ['list' => $list]); } diff --git a/Laravel/public/tool/register.html b/Laravel/public/tool/register.html index 7a758fc..be670fc 100644 --- a/Laravel/public/tool/register.html +++ b/Laravel/public/tool/register.html @@ -137,6 +137,12 @@