更新查询联营sku列表

app/Http/Controllers/ApiController.php

@@ -157,10 +157,14 @@ class ApiController extends Controller
         dispatch(new JopExportGoodsComList($id));
         dispatch(new JopExportGoodsComList($id));
         Export(0,$id);
         Export(0,$id);
     }
     }
-    //查询品牌
+    //查询自营品牌
     private function GetBrand($request){
     private function GetBrand($request){
         (new ServerFoostoneModel($request->appid,$request->key))->getBrand($request->input("p"),100,2);
         (new ServerFoostoneModel($request->appid,$request->key))->getBrand($request->input("p"),100,2);
     }
     }
+    //查询联营品牌
+    private function GetBrandCom($request){
+        (new ServerFoostoneModel($request->appid,$request->key))->getBrandCom($request->input("p"),100,2);
+    }
     //价格明细弹框
     //价格明细弹框
     private function PurePrice($request){
     private function PurePrice($request){
         ExportLayui2((new ServerFoostoneModel($request->appid,$request->key))->SkuCost($request->input(),2));
         ExportLayui2((new ServerFoostoneModel($request->appid,$request->key))->SkuCost($request->input(),2));

app/Model/Server/ServerFoostoneModel.php

@@ -56,13 +56,20 @@ class ServerFoostoneModel
         $data['goods_type'] = $goods_type;
         $data['goods_type'] = $goods_type;
         return $this->push('/third/api/obtain/list/sku',$data,$type);
         return $this->push('/third/api/obtain/list/sku',$data,$type);
     }
     }
-    //模糊搜索品牌
+    //模糊搜索自营品牌
     public function getBrand($keyword,$limit = 100,$type =1){
     public function getBrand($keyword,$limit = 100,$type =1){
         $data['keyword'] = $keyword;
         $data['keyword'] = $keyword;
         $data['limit'] = $limit;
         $data['limit'] = $limit;
         $s =   $this->push( '/third/api/query/brand/list',$data,$type);
         $s =   $this->push( '/third/api/query/brand/list',$data,$type);
         echo \GuzzleHttp\json_encode($s['data'],JSON_UNESCAPED_UNICODE);
         echo \GuzzleHttp\json_encode($s['data'],JSON_UNESCAPED_UNICODE);
     }
     }
+    //模糊搜索联营品牌
+    public function getBrandCom($keyword,$limit = 100,$type =1){
+        $data['keyword'] = $keyword;
+        $data['limit'] = $limit;
+        $s =   $this->push( '/yunxin/api/pool/brand/list',$data,$type);
+        echo \GuzzleHttp\json_encode($s['data'],JSON_UNESCAPED_UNICODE);
+    }
     /*
     /*
      * 批量上传联营物料
      * 批量上传联营物料
      * @param str $url 上传网址
      * @param str $url 上传网址

public/pc/js/controller/GoodsComList.js

@@ -183,7 +183,7 @@ function initSelectTelephone() {
     selectTelehone.select2({
     selectTelehone.select2({
         ajax: {
         ajax: {
             url: function (params) {
             url: function (params) {
-                return "/api/GetBrand?p=" + params.term;
+                return "/api/GetBrandCom?p=" + params.term;
             },
             },
             dataType: 'json',
             dataType: 'json',
             processResults: function (data, params) {
             processResults: function (data, params) {