From 8c00bd0245ca4756ca04483a4980ad202714e43e Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 20 七月 2023 09:40:44 +0800
Subject: [PATCH] Merge branch 'release/v1.1.4发布'

---
 application/api/logic/taoke/device/Dataoke.php |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/api/logic/taoke/device/Dataoke.php b/application/api/logic/taoke/device/Dataoke.php
index 6968925..08de0fe 100644
--- a/application/api/logic/taoke/device/Dataoke.php
+++ b/application/api/logic/taoke/device/Dataoke.php
@@ -38,7 +38,7 @@
         'similer_url'=>'https://openapi.dataoke.com/api/goods/list-similer-goods-by-open',
         'gift_money_url'=>'https://openapi.dataoke.com/api/goods/first-order-gift-money',
         'bottom_price_url'=>'https://openapi.dataoke.com/api/goods/get-history-low-price-list',
-        'jdnines_url'=>'https://openapi.dataoke.com/api/dels/jd/column/list-nines',
+        'jdnines_url'=>'https://openapi.dataoke.com/api/dels/jd/column/list-nines'
     ];
 
     const shop_type = ["0"=>"娣樺疂","1"=>"澶╃尗","2"=>"澶╃尗瓒呭競","3"=>"澶╃尗鍥介檯"];
@@ -427,9 +427,9 @@
      *
      * @return void
      */
-    public function superSearch($keyWords,$page = 1,$page_size,$sort)
+    public function superSearch($keyWords,$page = 1,$page_size,$sort,$tmall=0)
     {
-        $params = $this->setParams(['type'=>"0",'keyWords'=>$keyWords,'type'=>0,'pageId'=>$page,'pageSize'=>$page_size,'sort'=>$sort]);
+        $params = $this->setParams(['type'=>"0",'keyWords'=>$keyWords,'type'=>0,'pageId'=>$page,'pageSize'=>$page_size,'sort'=>$sort,'tmall'=>$tmall]);
         $result = send_get(self::request_url['super_search_url'],$params);
         if(empty($result) || $result['code'] != 0) return [];
         $list = $result['data']['list'];

--
Gitblit v1.9.3