Merge branch 'zjl_service_20211118' into development

app/Http/Controllers/AddOrderController.php

@@ -398,14 +398,17 @@ Class AddOrderController extends Controller
     public function addCart(Request $request)
     {
         if ($request->isMethod('post')) {        
-            $data['uid'] = $request->input('uid');
-            $data['id'] = $request->input('id');
-            $data['num'] = $request->input('num');
-            $data['buy'] = $request->input('buy');
+            $data['uid']            = $request->input('uid');
+            $data['id']             = $request->input('id');
+            $data['num']            = $request->input('num');
+            $data['buy']            = $request->input('buy');
             $data['delivery_place'] = $request->input('delivery_place');
-            $data['type'] = 2; // 后台添加标记
-            $data['pf'] = 4;
+            $data['type']           = 2; // 后台添加标记
+
+            $add_type = $request->input('add_type', 1); // 1-后台订单添加，2-询价订单添加
 
+            $data['pf'] = $add_type == 1 ? 4 : 8;
+ 
             $data['k1'] = time();
             $data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
 

public/js/add_inquiry_order.js

@@ -563,6 +563,7 @@ layui.config({
             num: goods_min_num,
             buy: -1,
             delivery_place: delivery_place, 
+            add_type: 2,
         }
 
         $.ajax({

public/js/add_order.js

@@ -509,6 +509,7 @@
                         num: goods_min_num,
                         buy: -1,
                         delivery_place: delivery_place, 
+                        add_type: 1,
                     }
 
                     $.ajax({