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 @@ 用户等级
- 等级序号Serial + 等级序号Serial
@@ -135,12 +137,13 @@
奖利规则 -
+
{foreach $prizes as $prize}{if isset($vo.rebate_rule) && is_array($vo.rebate_rule) && in_array($prize.code, $vo.rebate_rule)} {else} {/if}{/foreach} +
默认等级,无需配置升级规则
@@ -162,14 +165,14 @@ diff --git a/app/data/view/base/upgrade/index.html b/app/data/view/base/upgrade/index.html index 5253811ed..658d646df 100644 --- a/app/data/view/base/upgrade/index.html +++ b/app/data/view/base/upgrade/index.html @@ -6,11 +6,10 @@ - + {/block} - {block name="content"}
@@ -24,10 +23,14 @@ $('#UpgradeTable').layTable({ even: true, height: 'full', cols: [[ - {field: 'number', title: '等级名称', align: 'left', minWidth: 140, templet: '
[ VIP{{d.number}} ] {{d.name}}
'}, + { + field: 'number', title: '等级名称', align: 'left', minWidth: 140, templet: function (d) { + return laytpl('
[ VIP{{d.number}} ] {{d.name}}
').render(d); + } + }, { field: 'upgrade_team', title: '团队计数', align: 'center', minWidth: 80, templet: function (d) { - if (!d.upgrade_team || d.upgrade_team < 1) return ''; + if (!d.upgrade_team || d.upgrade_team < 1) return '-'; return ''; } }, @@ -39,7 +42,7 @@ }, { field: 'goods_vip_status', title: '入会礼包', align: 'center', minWidth: 80, templet: function (d) { - if (!d.goods_vip_status || d.goods_vip_status < 1) return ''; + if (!d.goods_vip_status || d.goods_vip_status < 1) return '-'; return ''; } }, @@ -68,7 +71,7 @@ } }, { - field: 'rebate_rule', title: '奖利规则', align: 'center', minWidth: 140, templet: function (d) { + field: 'rebate_rule', title: '奖利规则', align: 'center', minWidth: 100, templet: function (d) { return (d.html = ''), (d.rebate_rule || []).forEach(function (rule) { d.html += laytpl('{{d.v}}').render({v: rule}); }), d.html || '-';