From 2ca3644d7bc09271a253014a8cd199dae73470ca Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期一, 19 六月 2023 11:57:50 +0800
Subject: [PATCH] Merge branch 'hotfix/618修复' into feature/1.1.3api开发

---
 application/api/controller/Taoke.php |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/application/api/controller/Taoke.php b/application/api/controller/Taoke.php
index 554b83e..3f64396 100644
--- a/application/api/controller/Taoke.php
+++ b/application/api/controller/Taoke.php
@@ -323,6 +323,9 @@
                 {
                     $info['dy_deeplink'] = $info['dy_zlink'];
                 }
+                else{
+                    $info['dy_zlink']=$info['detail_url'];
+                }
 		        
             break;  
         }
@@ -1078,16 +1081,21 @@
     public function identify_goods()
     {
         $goods_url = request()->param('goods_url','', 'urldecode');
-        
-        log::write('鏅鸿兘鎼滅储鍐呭'.$goods_url);
 
         if (empty($goods_url)) $this->error('閾炬帴涓嶈兘涓虹┖');
 
         $LogicSearch = new LogicSearch();
 
         $info = $LogicSearch->ast($goods_url);
+        if(!$info["goodsId"]&&$info["title"]){
+            $this->success('鑾峰彇鎴愬姛',['goods_url'=>$info["title"],'goods'=>[]]);
+           
+        }
+        else{
+            $this->success('鑾峰彇鎴愬姛',['goods_url'=>$goods_url,'goods'=>$info]);
+        }
 
-        $this->success('鑾峰彇鎴愬姛',['goods_url'=>$goods_url,'goods'=>$info]);
+      
     }
 
 
@@ -1109,10 +1117,11 @@
         $sort = request()->param('sort',0);
         
         $tchaoshi=request()->param('tchaoshi',0);
-
+        //浜岀骇绛涢��
+        $secrend_search=request()->param('secrend_search',0);
         $LogicDataoke = new LogicDataoke();
 
-        $list = $LogicDataoke->getGoodsList($cateId,$subcid,$sort,$page,$page_size,$tchaoshi);
+        $list = $LogicDataoke->getGoodsList($cateId,$subcid,$sort,$page,$page_size,$tchaoshi,$secrend_search);
 
         if($list === false) $this->error($LogicDataoke->getError());
 
@@ -1359,6 +1368,7 @@
         foreach($list as $key => $value){
             $list[$key]['fanli'] = $value['actualPrice'];
         }
+       // $list= array_slice($list, 0, 40);
 
         $this->success('鑾峰彇鎴愬姛',['list'=>$list]);
     }

--
Gitblit v1.9.3