Merge branch 'release/v1.1.4发布'

zhaojs

2023-07-20 8c00bd0245ca4756ca04483a4980ad202714e43e

 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'];
@@ -877,7 +877,7 @@
            }
        } */
        $init_goods['desc'] = isset($goods['extensionContent']) ? $goods['extensionContent'] : '';  //推广文案
        //!empty($goods['imgs']) && $init_goods['imgs'] = explode(",",$goods['imgs']);
        $init_goods['imgs'] = isset($goods['smallImages']) ? $goods['smallImages'] : [];
        empty($goods['smallImages'])&& $init_goods['smallImages'] =explode(",",$goods['smallImages']);
        //!empty($goods['reimgs']) && $init_goods['reimgs'] = explode(",",$goods['reimgs']);
        if(!empty($goods['detailPics'])){
@@ -983,6 +983,8 @@
        $init_goods['fanli'] = self::rebate($goods['actualPrice'],$goods['commissionRate']/100);
        $init_goods['topFanli'] = self::rebate($goods['actualPrice'],$goods['commissionRate']/100,self::$topFanliRate);
        $init_goods['isCollect'] = self::isCollect($init_goods);
        //补充返回值商品类目
        $init_goods['cid'] = isset($goods['cid']) ? $goods['cid'] : '';
        return $init_goods;
    }