# 2022-05-07

### 1.4.4开源社区版：
无
### 0.3.9 专业版：
【新增】增加[coreshop-advert]广告组件，对标后台管理功能的广告管理，前端可直接使用代码<coreshop-advert codes="广告位code"></coreshop-advert>来实现在前端任何地方引用广告组件。
【新增】商城栏目页面增加广告组件使用示例。
【新增】用户表增加【是否开启自动升级】【发展用户数量】【订单消费金额】【充值总金额】【权重优先级】字段，并完善用户升级队列处理逻辑。
【调整】文章管理的修改和编辑弹窗模式，修改为单页面模式，解决弹窗情况下编辑器某些按钮因为z-index导致的被阻挡显示的问题。
【优化】优化首页组件的样式，将一些常见方法进行统一封装到混合器里面。

CoreCms.Net.Web.Admin/wwwroot/views/user/usergrade/create.html

@@ -18,6 +18,47 @@
             </div>
         </div>
 
+        <div class="layui-form-item" pane>
+            <label for="isOpenUpgrade" class="layui-form-label  layui-form-required">自动升级</label>
+            <div class="layui-input-inline">
+                <input type="checkbox" lay-filter="switch" name="isOpenUpgrade" lay-skin="switch" lay-text="开启|关闭">
+            </div>
+            <div class="layui-form-mid layui-word-aux">开启后，满足条件将自动升级</div>
+        </div>
+
+        <div class="layui-form-item">
+            <label for="developNum" class="layui-form-label  layui-form-required">下级用户</label>
+            <div class="layui-input-inline">
+                <input type="number" min="0" max="999999" name="developNum" lay-verType="tips" lay-verify="required|number" class="layui-input" value="100" placeholder="请输入发展用户数量" lay-reqText="请输入发展用户数量并为数字" />
+            </div>
+            <div class="layui-form-mid layui-word-aux">发展用户数量</div>
+        </div>
+
+        <div class="layui-form-item">
+            <label for="expenditureMoney" class="layui-form-label  layui-form-required">订单金额</label>
+            <div class="layui-input-inline">
+                <input type="number" min="0" max="999999" name="expenditureMoney" lay-verType="tips" lay-verify="required|number" class="layui-input" value="1000" placeholder="请输入订单消费金额" lay-reqText="请输入订单消费金额并为数字" />
+            </div>
+            <div class="layui-form-mid layui-word-aux">非充值订单消费的总金额。</div>
+        </div>
+
+        <div class="layui-form-item">
+            <label for="rechargeAmount" class="layui-form-label  layui-form-required">充值总金额</label>
+            <div class="layui-input-inline">
+                <input type="number" min="0" max="999999" name="rechargeAmount" lay-verType="tips" lay-verify="required|number" class="layui-input" value="1000" placeholder="请输入充值总金额" lay-reqText="请输入充值总金额并为数字" />
+            </div>
+
+        </div>
+
+        <div class="layui-form-item">
+            <label for="prioritySortId" class="layui-form-label  layui-form-required">权重优先级</label>
+            <div class="layui-input-inline">
+                <input type="number" min="0" max="999999" name="prioritySortId" lay-verType="tips" lay-verify="required|number" class="layui-input" value="1" placeholder="请输入权重优先级" lay-reqText="请输入权重优先级并为数字" />
+            </div>
+            <div class="layui-form-mid layui-word-aux">权重越大，等级越大</div>
+        </div>
+
+
         <div class="layui-form-item core-hidden">
             <label class="layui-form-label"></label>
             <input type="button" class="layui-btn" lay-submit lay-filter="LAY-app-CoreCmsUserGrade-createForm-submit" id="LAY-app-CoreCmsUserGrade-createForm-submit" value="确认添加">

CoreCms.Net.Web.Admin/wwwroot/views/user/usergrade/details.html

@@ -1,11 +1,20 @@
 <script type="text/html" template lay-done="layui.data.done(d);">
     <table class="layui-table layui-form" lay-filter="LAY-app-CoreCmsUserGrade-detailsForm" id="LAY-app-CoreCmsUserGrade-detailsForm">
         <colgroup>
-            <col width="150">
+            <col width="130">
             <col>
         </colgroup>
         <tbody>
 
+            <!--<tr>
+                <td>
+                    <label for="id">id</label>
+                </td>
+                <td>
+                    {{ d.params.data.id || '' }}
+                </td>
+            </tr>-->
+
             <tr>
                 <td>
                     <label for="title">标题</label>
@@ -23,12 +32,61 @@
                     <input type="checkbox" disabled name="isDefault" value="{{d.params.data.isDefault}}" lay-skin="switch" lay-text="开启|关闭" lay-filter="isDefault" {{ d.params.data.isDefault ? 'checked' : '' }}>
                 </td>
             </tr>
+
+            <tr>
+                <td>
+                    <label for="isOpenUpgrade">开启自动升级</label>
+                </td>
+                <td>
+                    <input type="checkbox" disabled name="isOpenUpgrade" value="{{d.params.data.isOpenUpgrade}}" lay-skin="switch" lay-text="开启|关闭" lay-filter="isOpenUpgrade" {{ d.params.data.isOpenUpgrade ? 'checked' : '' }}>
+                </td>
+            </tr>
+
+            <tr>
+                <td>
+                    <label for="developNum">发展用户数量</label>
+                </td>
+                <td>
+                    {{ d.params.data.developNum || '' }}
+                </td>
+            </tr>
+
+            <tr>
+                <td>
+                    <label for="expenditureMoney">订单消费金额</label>
+                </td>
+                <td>
+                    {{ d.params.data.expenditureMoney || '' }}
+                </td>
+            </tr>
+
+            <tr>
+                <td>
+                    <label for="rechargeAmount">充值总金额</label>
+                </td>
+                <td>
+                    {{ d.params.data.rechargeAmount || '' }}
+                </td>
+            </tr>
+
+            <tr>
+                <td>
+                    <label for="prioritySortId">权重优先级</label>
+                </td>
+                <td>
+                    {{ d.params.data.prioritySortId || '' }}
+                </td>
+            </tr>
+
         </tbody>
     </table>
 </script>
 <script>
+    var debug = layui.setter.debug;
     layui.data.done = function (d) {
-        console.log(d);
+        //开启调试情况下获取接口赋值数据
+        if (debug) { console.log(d.params.data); }
+
         layui.use(['admin', 'form', 'coreHelper'], function () {
             var $ = layui.$
                 , setter = layui.setter

CoreCms.Net.Web.Admin/wwwroot/views/user/usergrade/edit.html

@@ -18,6 +18,46 @@
             </div>
         </div>
 
+        <div class="layui-form-item" pane>
+            <label for="isOpenUpgrade" class="layui-form-label  layui-form-required">自动升级</label>
+            <div class="layui-input-inline">
+                <input type="checkbox" lay-filter="switch" name="isOpenUpgrade" {{ d.params.data.isOpenUpgrade ? 'checked' : '' }} lay-skin="switch" lay-text="开启|关闭">
+            </div>
+            <div class="layui-form-mid layui-word-aux">开启后，满足条件将自动升级</div>
+        </div>
+
+        <div class="layui-form-item">
+            <label for="developNum" class="layui-form-label  layui-form-required">下级用户</label>
+            <div class="layui-input-inline">
+                <input type="number" min="0" max="999999" name="developNum" lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.developNum || '0' }}" placeholder="请输入发展用户数量" lay-reqText="请输入发展用户数量并为数字" />
+            </div>
+            <div class="layui-form-mid layui-word-aux">发展用户数量</div>
+        </div>
+
+        <div class="layui-form-item">
+            <label for="expenditureMoney" class="layui-form-label  layui-form-required">订单金额</label>
+            <div class="layui-input-inline">
+                <input type="number" min="0" max="999999" name="expenditureMoney" lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.expenditureMoney || '0' }}" placeholder="请输入订单消费金额" lay-reqText="请输入订单消费金额并为数字" />
+            </div>
+            <div class="layui-form-mid layui-word-aux">非充值订单消费的总金额。</div>
+        </div>
+
+        <div class="layui-form-item">
+            <label for="rechargeAmount" class="layui-form-label  layui-form-required">充值总金额</label>
+            <div class="layui-input-inline">
+                <input type="number" min="0" max="999999" name="rechargeAmount" lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.rechargeAmount || '0' }}" placeholder="请输入充值总金额" lay-reqText="请输入充值总金额并为数字" />
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label for="prioritySortId" class="layui-form-label  layui-form-required">权重优先级</label>
+            <div class="layui-input-inline">
+                <input type="number" min="0" max="999999" name="prioritySortId" lay-verType="tips" lay-verify="required|number" class="layui-input" value="{{d.params.data.prioritySortId || '0' }}" placeholder="请输入权重优先级" lay-reqText="请输入权重优先级并为数字" />
+            </div>
+            <div class="layui-form-mid layui-word-aux">权重越大，等级越大</div>
+        </div>
+
+
         <div class="layui-form-item core-hidden">
             <label class="layui-form-label"></label>
             <input type="button" class="layui-btn" lay-submit lay-filter="LAY-app-CoreCmsUserGrade-editForm-submit" id="LAY-app-CoreCmsUserGrade-editForm-submit" value="确认编辑">

CoreCms.Net.Web.Admin/wwwroot/views/user/usergrade/index.html

@@ -33,6 +33,16 @@
                     </select>
                 </div>
             </div>
+            <div class="layui-inline">
+                <label class="layui-form-label" for="isOpenUpgrade">开启自动升级</label>
+                <div class="layui-input-inline">
+                    <select name="isOpenUpgrade">
+                        <option value="">请选择</option>
+                        <option value="True">是</option>
+                        <option value="False">否</option>
+                    </select>
+                </div>
+            </div>
             <div class="layui-inline">
                 <button class="layui-btn layui-btn-sm" lay-submit lay-filter="LAY-app-CoreCmsUserGrade-search"><i class="layui-icon layui-icon-search"></i>筛选</button>
                 <!--<button class="layui-btn layui-btn-primary layui-btn-sm" type="reset"><i class="layui-icon layui-icon-refresh"></i>重置</button>-->
@@ -92,6 +102,11 @@
                             { field: 'id', title: '序列', sort: false, width: 60 },
                             { field: 'title', title: '标题', sort: false },
                             { field: 'isDefault', title: '是否默认', width: 105, templet: '#switch_isDefault', sort: false, unresize: true },
+                            { field: 'isOpenUpgrade', title: '开启自动升级', width: 95, templet: '#switch_isOpenUpgrade', sort: false, unresize: true },
+                            { field: 'developNum', title: '发展用户数量', sort: false, width: 105 },
+                            { field: 'expenditureMoney', title: '订单消费金额', sort: false, width: 105 },
+                            { field: 'rechargeAmount', title: '充值总金额', sort: false, width: 105 },
+                            { field: 'prioritySortId', title: '权重优先级', sort: false,width: 105 },
                             { width: 142, align: 'center', title: '操作', fixed: 'right', toolbar: '#LAY-app-CoreCmsUserGrade-tableBox-bar' }
                         ]
                     ]
@@ -118,15 +133,6 @@
                         case 'addData':
                             doCreate();
                             break;
-                        case 'batchDelete':
-                            doBatchDelete(checkStatus);
-                            break;
-                        case 'selectExportExcel':
-                            doSelectExportExcel(checkStatus);
-                            break;
-                        case 'queryExportExcel':
-                            doQueryExportexcel();
-                            break;
                     };
                 });
                 //监听工具条
@@ -147,7 +153,7 @@
                             admin.popup({
                                 shadeClose: false,
                                 title: '创建数据',
-                                area: ['400px', '300px'],
+                                area: ['500px', '500px'],
                                 id: 'LAY-popup-CoreCmsUserGrade-create',
                                 success: function (layero, index) {
                                     view(this.id).render('user/usergrade/create', { data: e.data }).done(function () {
@@ -155,7 +161,10 @@
                                         form.on('submit(LAY-app-CoreCmsUserGrade-createForm-submit)',
                                             function (data) {
                                                 var field = data.field; //获取提交的字段
+
                                                 field.isDefault = field.isDefault == 'on';
+                                                field.isOpenUpgrade = field.isOpenUpgrade == 'on';
+
                                                 //提交 Ajax 成功后，关闭当前弹层并重载表格
                                                 coreHelper.Post("Api/CoreCmsUserGrade/DoCreate", field, function (e) {
                                                     console.log(e)
@@ -187,7 +196,7 @@
                             admin.popup({
                                 shadeClose: false,
                                 title: '编辑数据',
-                                area: ['400px', '300px'],
+                                area: ['500px', '500px'],
                                 id: 'LAY-popup-CoreCmsUserGrade-edit',
                                 success: function (layero, index) {
                                     view(this.id).render('user/usergrade/edit', { data: e.data }).done(function () {
@@ -197,6 +206,7 @@
                                                 var field = data.field; //获取提交的字段
 
                                                 field.isDefault = field.isDefault == 'on';
+                                                field.isOpenUpgrade = field.isOpenUpgrade == 'on';
                                                 //提交 Ajax 成功后，关闭当前弹层并重载表格
                                                 coreHelper.Post("Api/CoreCmsUserGrade/DoEdit", field, function (e) {
                                                     console.log(e)
@@ -228,7 +238,7 @@
                             admin.popup({
                                 shadeClose: false,
                                 title: '查看详情',
-                                area: ['400px', '300px'],
+                                area: ['500px', '500px'],
                                 id: 'LAY-popup-CoreCmsUserGrade-details',
                                 success: function (layero, index) {
                                     view(this.id).render('user/usergrade/details', { data: e.data }).done(function () {
@@ -261,6 +271,13 @@
                     });
                 });
 
+                layui.form.on('switch(switch_isOpenUpgrade)', function (obj) {
+                    coreHelper.Post("Api/CoreCmsUserGrade/DoSetisOpenUpgrade", { id: this.value, data: obj.elem.checked }, function (e) {
+                        layui.table.reloadData('LAY-app-CoreCmsUserGrade-tableBox');
+                        layer.msg(e.msg);
+                    });
+                });
+
             });
     };
 </script>
@@ -268,4 +285,10 @@
 <!--设置是否默认-->
 <script type="text/html" id="switch_isDefault">
     <input type="checkbox" name="switch_isDefault" value="{{d.id}}" lay-skin="switch" lay-text="开启|关闭" lay-filter="switch_isDefault" {{ d.isDefault ? 'checked' : '' }}>
-</script>
+</script>
+
+
+<!--设置开启自动升级-->
+<script type="text/html" id="switch_isOpenUpgrade">
+    <input type="checkbox" name="switch_isOpenUpgrade" value="{{d.id}}" lay-skin="switch" lay-text="开启|关闭" lay-filter="switch_isOpenUpgrade" {{ d.isOpenUpgrade ? 'checked' : '' }}>
+</script>