diff --git a/application/api/controller/Decorate.php b/application/api/controller/Decorate.php index 393588ee..52d6544a 100644 --- a/application/api/controller/Decorate.php +++ b/application/api/controller/Decorate.php @@ -22,7 +22,8 @@ class Decorate extends BaseCom public function get_type_list() { $have_hot = input('have_hot',0); - $reslut = model('Decorate')->get_type_list($have_hot); + $frome = input('frome',1);//来源:1 道具商城 2 个性装扮 + $reslut = model('Decorate')->get_type_list($have_hot,$frome); return V($reslut['code'],$reslut['msg'], $reslut['data']); } //获取装饰列表 diff --git a/application/api/model/Decorate.php b/application/api/model/Decorate.php index 63ad9af3..4723ff74 100644 --- a/application/api/model/Decorate.php +++ b/application/api/model/Decorate.php @@ -27,7 +27,7 @@ class Decorate extends Model } //获取装扮类型 - public function get_type_list($have_hot = 0) + public function get_type_list($have_hot = 0,$from=1) { $no_show_ids = [7,8,3,10,11]; $label = $this->TypeArray; @@ -40,6 +40,11 @@ class Decorate extends Model if (in_array($k, $no_show_ids)) { continue; } + if($from==2){ + if($k==13){ + continue; + } + } $data[$i]['id'] = $k; $data[$i]['name'] = $v; ++$i;