调整

app/Http/Controllers/ApiController.php

@@ -33,12 +33,17 @@ class ApiController extends Controller
     public $user_id = ""; //用户id
     public $user_id = ""; //用户id
     public $user_name = ""; //用户名称
     public $user_name = ""; //用户名称
 
 
-    public function Entrance(Request $request, $id){
-
+    public function Entrance(Request $request, $id)
+    {
         $loginInfo = (new LoginModel())->checkLogin($request);
         $loginInfo = (new LoginModel())->checkLogin($request);
-        $this->user_id = $loginInfo["user_id"];
+        $this->user_id   = $loginInfo["user_id"];
         $this->user_name = $loginInfo["user_name"];
         $this->user_name = $loginInfo["user_name"];
-        $this->$id($request, $id);
+
+        $input = $_REQUEST;
+        $input["user_id"]   = $this->user_id;
+        $input["user_name"] = $this->user_name;
+
+        $this->$id($input, $id);
     }
     }
 
 
     //关闭整个询价单
     //关闭整个询价单
@@ -54,24 +59,18 @@ class ApiController extends Controller
         Export((new InquiryModel())->inquiryClose($request->input('inquiry_id')));
         Export((new InquiryModel())->inquiryClose($request->input('inquiry_id')));
     }
     }
     //询价列表
     //询价列表
-    private function ApiInquiryList($request, $id){
-        $input = $_REQUEST;
-        $input["user_id"]=$this->user_id;
-        $input["email"]=$this->user_name;
+    private function ApiInquiryList($input, $id){
         ExportLayui((new InquiryModel())->getList($input));
         ExportLayui((new InquiryModel())->getList($input));
     }
     }
 
 
     //询价池
     //询价池
-    private function ApiInquiryListPool($request, $id){
-        $input = $_REQUEST;
-        $input["user_id"]=$this->user_id;
-        $input["email"]=$this->user_name;
+    private function ApiInquiryListPool($input, $id){
         ExportLayui((new InquiryModel())->getListPool($input));
         ExportLayui((new InquiryModel())->getListPool($input));
     }
     }
 
 
     //报价明细列表列表
     //报价明细列表列表
-    private function ApiQuoteItemsList($request, $id){
-        ExportLayui((new QuoteModel())->ItemsList($_REQUEST));
+    private function ApiQuoteItemsList($input, $id){
+        ExportLayui((new QuoteModel())->ItemsList($input));
     }
     }
 
 
     //搜索品牌
     //搜索品牌
@@ -118,11 +117,8 @@ class ApiController extends Controller
     }
     }
 
 
     // 领取询价
     // 领取询价
-    public function ApiTakeInquiry($request, $id)
+    public function ApiTakeInquiry($input, $id)
     {
     {
-        $input = $_REQUEST;
-        $input["user_id"] = $this->user_id;
-        $input["email"]   = $this->user_name;
         Export((new InquiryItemsModel())->takeInquiry($input));
         Export((new InquiryItemsModel())->takeInquiry($input));
     }
     }