From f89917006e1cc34f2eb264bfe236a2e8aa8d9be1 Mon Sep 17 00:00:00 2001
From: heyuntao <heyuntao@LAPTOP-MP4HD5NS>
Date: 星期二, 04 七月 2023 17:19:33 +0800
Subject: [PATCH] no message

---
 application/api/controller/Taoke.php |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/application/api/controller/Taoke.php b/application/api/controller/Taoke.php
index 26e7442..29dd2ba 100644
--- a/application/api/controller/Taoke.php
+++ b/application/api/controller/Taoke.php
@@ -710,7 +710,7 @@
         $this->success('鑾峰彇鎴愬姛',['list'=>$list]);
     }
 
-
+ 
     /**
      * 杈e浼橀��
      */
@@ -1117,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());
 
@@ -1357,17 +1358,22 @@
     public function get_first_free_goods(){
 
         $page = request()->param('page',1);
-        $page_size = request()->param('pageSize',40);
+        $page_size = request()->param('pageSize',100);
         $LogicDataoke = new LogicDataoke();
 
-        $list = $LogicDataoke->getOpGoodsList(1,$page,$page_size);
+        $list = $LogicDataoke->getOpGoodsList(1,$page,100,['6','7','11','12','13']);
+        //濡傛灉涓嶆弧瓒�40涓紝鍒欏啀鍙栦竴椤�
+        if(count($list)<40){
+            $list2 = $LogicDataoke->getOpGoodsList(1,$page+1,100,['6','7','11','12','13']);
+            $list = array_merge($list,$list2);
+        }
 
         if($list === false) $this->error($LogicDataoke->getError());
 
         foreach($list as $key => $value){
             $list[$key]['fanli'] = $value['actualPrice'];
         }
-       // $list= array_slice($list, 0, 40);
+        $list= array_slice($list, 0, 40);
 
         $this->success('鑾峰彇鎴愬姛',['list'=>$list]);
     }

--
Gitblit v1.9.3