From dbbe10e0ece508971398df0819fd43f9f8e6d742 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Wed, 25 Oct 2023 10:34:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E4=B8=AA=E4=BA=BA?=
=?UTF-8?q?=E4=B8=AD=E5=BF=83=20=E7=BB=8F=E7=BA=AA=E4=BA=BA=E4=B8=AD?=
=?UTF-8?q?=E6=8C=89=E9=92=AE=20=E7=94=B1=E7=94=A8=E6=88=B7=E5=BF=85?=
=?UTF-8?q?=E9=A1=BB=E8=8E=B7=E5=BE=97=E8=BF=87=E8=AF=A5=E7=AD=89=E7=BA=A7?=
=?UTF-8?q?=E7=9A=84=E6=9D=83=E9=87=8D=E5=80=BC=E6=89=8D=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=8F=AA=E8=A6=81=E7=94=A8=E6=88=B7?=
=?UTF-8?q?=E6=88=90=E4=B8=BA=E8=BF=87=E8=AF=A5=E7=AD=89=E7=BA=A7=E7=9A=84?=
=?UTF-8?q?=E7=94=A8=E6=88=B7=E5=B0=B1=E6=98=BE=E7=A4=BA=EF=BC=88=E5=B7=B2?=
=?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/common/services/component/Button.php | 20 ++++++-------
.../src/models/TeamDividendLevelUpgrade.php | 2 ++
.../views/admin/level-set-add.blade.php | 28 ++++++++++++++++++-
.../src/admin/IndexController.php | 2 +-
.../src/models/GoodsWeightValue.php | 1 +
5 files changed, 41 insertions(+), 12 deletions(-)
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 --}}
+ {{----}}
+ {{-- 直推间推 某个等级 满多少人 END --}}
+
+
+
+
+
+
-