diff --git a/app/data/controller/base/Upgrade.php b/app/data/controller/base/Upgrade.php index 21e6e8452..8c4de2b37 100644 --- a/app/data/controller/base/Upgrade.php +++ b/app/data/controller/base/Upgrade.php @@ -80,6 +80,11 @@ class Upgrade extends Controller $vo['teams_direct_status'] = isset($vo['teams_direct_status']) ? 1 : 0; $vo['teams_indirect_status'] = isset($vo['teams_indirect_status']) ? 1 : 0; $vo['order_amount_status'] = isset($vo['order_amount_status']) ? 1 : 0; + // 默认等级去除条件 + if (empty($vo['number'])) { + $vo['rebate_rule'] = []; + foreach ($vo as $k => &$v) if (is_numeric(stripos($k, '_status'))) $v = 0; + } // 根据数量判断状态 $vo['teams_users_status'] = intval($vo['teams_users_status'] && $vo['teams_users_number'] > 0); $vo['teams_direct_status'] = intval($vo['teams_direct_status'] && $vo['teams_direct_number'] > 0); @@ -108,7 +113,7 @@ class Upgrade extends Controller $order = 'number asc,utime desc'; } foreach (BaseUserUpgrade::mk()->order($order)->select() as $number => $upgrade) { - $upgrade->save(['number' => $number + 1]); + $upgrade->save(['number' => $number]); } } } diff --git a/app/data/view/base/upgrade/form.html b/app/data/view/base/upgrade/form.html index 1e8d8e964..91b471d6f 100644 --- a/app/data/view/base/upgrade/form.html +++ b/app/data/view/base/upgrade/form.html @@ -3,14 +3,16 @@ top: 0; left: -10px; right: -10px; - bottom: 2px; - color: #fff; + bottom: 3px; + color: #FFF; + display: flex; position: absolute; - font-size: 24px; - text-align: center; - line-height: 190px; - border-radius: 5px; - background: rgba(0, 0, 0, 0.6); + font-size: 18px; + border-radius: 3px; + align-items: center; + justify-content: center; + background: rgba(0, 0, 0, 0.4); + text-shadow: #666 1px 1px 3px; } @@ -21,9 +23,9 @@