diff --git a/plugins/decorate/src/common/services/component/Button.php b/plugins/decorate/src/common/services/component/Button.php index 94f41dcd..19c71080 100644 --- a/plugins/decorate/src/common/services/component/Button.php +++ b/plugins/decorate/src/common/services/component/Button.php @@ -4,6 +4,7 @@ namespace Yunshop\Decorate\common\services\component; use app\backend\modules\member\models\Member; use Yunshop\CollectionRoom\models\CollectionRoomModel; +use Yunshop\TeamDividend\models\Uplog; use Yunshop\WeightValue\models\WeightValue; class Button{ @@ -16,8 +17,11 @@ class Button{ // 处理组件数据 public function index($data = []){ - foreach($data as &$item){ - if($item['remote_data']) $item['remote_data']['list'] = $this->handleList($item['remote_data']['list']); + foreach($data as $dataKey => &$item){ + if($item['remote_data']) { + $item['remote_data']['list'] = $this->handleList($item['remote_data']['list']); + if(empty($item['remote_data']['list'])) unset($data[$dataKey]); + } } return $data; @@ -41,18 +45,14 @@ class Button{ $parsedUrlNew = trim(strstr($parsedUrl['fragment'],"?",false),'?'); parse_str($parsedUrlNew, $params); if((int)$params['team_level_id'] > 0){ - $isHas = (int)WeightValue::uniacid() - ->where('member_id',$uid) - ->where('team_dividend_agency_level_id',$params['team_level_id']) + $isHas = (int)Uplog::uniacid() + ->where('uid',$uid) + ->where('after_level_id',$params['team_level_id']) ->value('id'); if($isHas <= 0) unset($list[$handleListIndex]); } + } - - - - - } diff --git a/plugins/team-dividend/src/models/TeamDividendLevelUpgrade.php b/plugins/team-dividend/src/models/TeamDividendLevelUpgrade.php index 0dd31a08..c1308fbf 100644 --- a/plugins/team-dividend/src/models/TeamDividendLevelUpgrade.php +++ b/plugins/team-dividend/src/models/TeamDividendLevelUpgrade.php @@ -70,6 +70,8 @@ class TeamDividendLevelUpgrade extends BackendModel '1030' => 'agent_love', // 会员累计获得{{ LOVE_NAME }}数量达到 '1031' => 'team_new_order_number', // 团队新订单数量满 '1032' => 'team_shop_order_amount', // 团队自营订单实付金额满 + // '1050' => 'one_or_two', // 直推间推 某个等级 满多少人 + ]; // 等级为 2000 + 等级id return $ret; diff --git a/plugins/team-dividend/views/admin/level-set-add.blade.php b/plugins/team-dividend/views/admin/level-set-add.blade.php index d9415696..6a05c962 100644 --- a/plugins/team-dividend/views/admin/level-set-add.blade.php +++ b/plugins/team-dividend/views/admin/level-set-add.blade.php @@ -706,6 +706,33 @@ + {{-- 直推间推 某个等级 满多少人 START --}} + {{--