From f2528a40b631dd4165484b9fce6b5c2708aae5c7 Mon Sep 17 00:00:00 2001
From: heyuntao <heyuntao@LAPTOP-MP4HD5NS>
Date: 星期六, 07 十月 2023 10:49:30 +0800
Subject: [PATCH] no message
---
application/api/controller/Taoke.php | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/application/api/controller/Taoke.php b/application/api/controller/Taoke.php
index f0c3cef..a783be8 100644
--- a/application/api/controller/Taoke.php
+++ b/application/api/controller/Taoke.php
@@ -1450,24 +1450,21 @@
case 'tb': //娣樺疂鑱旂洘
$LogicDataoke = new LogicDataoke();
$clist = $LogicDataoke->getGoodsList($cids[$page-1],'',0,$page,$page_size,1,0);
- $clist=array_slice($clist, 0, 3);
break;
case 'jd': //浜笢
$LogicJd = new LogicJd();
- $jd_id_list = $LogicJd->search_cid_Goods('','desc','','','inOrderCount30Days',$new_page,10,$cids[$page-1]);
- $clist=array_slice($jd_id_list, 0, 3);
+ $clist = $LogicJd->search_cid_Goods('','desc','','','inOrderCount30Days',1,10,$cids[$page-1]);
break;
case 'pdd': //鎷煎澶�
$LogicPdd = new LogicPdd();
- $pdd_list = $LogicPdd->searchGoods('','',$common_relation_id,'',1,10,0,$cids[$page-1]);
- $clist=array_slice($pdd_list, 0, 3);
+ $clist = $LogicPdd->searchGoods('','',$common_relation_id,'',1,10,0,$cids[$page-1]);
break;
case'dy'://鎶栭煶
$LogicHaodanku = new LogicHaodanku();
- $dy_list = $LogicHaodanku->getDygoodsList($cids[$key],'',0,1,10);
- $clist=array_slice($dy_list, 0, 3);
+ $clist = $LogicHaodanku->getDygoodsList($cids[$key],'',0,1,10);
break;
}
+ $clist=array_slice($clist, 0, 3);
$n_count=$n_count-count($clist);
}
if(empty($platefrom)){
@@ -1476,7 +1473,7 @@
switch($platefrom){
case "tb": //娣樺疂鑱旂洘
$LogicTaobaolianmeng = new LogicTaobaolianmeng();
- $list = $LogicTaobaolianmeng->material('6708','','',$page,$page_size);
+ $list = $LogicTaobaolianmeng->material('6708','','OAID',$page,$page_size);
break;
case "jd": //浜笢
$LogicJd = new LogicJd();
@@ -1498,7 +1495,7 @@
}
$list=array_slice($list, 0, $n_count);
if(!empty($clist)){
- array_unshift($list,$clist);
+ $list=array_merge($clist,$list);
}
$this->success('鑾峰彇鎴愬姛',['list'=>$list]);
}
--
Gitblit v1.9.3