Update upload.js

app/admin/view/api/upload.js

@@ -21,8 +21,7 @@ define(['md5'], function (SparkMD5, allowMime) {
 
         /*! 初始化上传组件 */
         opt.uploader = layui.upload.render({
-            url: '{:sysuri("admin/api.upload/file")}', auto: false, elem: element, accept: 'file', multiple: opt.mult,
-            exts: opt.exts.join('|'), acceptMime: opt.mimes.join(','), choose: function (object) {
+            url: '{:sysuri("admin/api.upload/file")}', auto: false, elem: element, accept: 'file', multiple: opt.mult, exts: opt.exts.join('|'), acceptMime: opt.mimes.join(','), choose: function (object) {
                 opt.elem.triggerHandler('upload.choose', opt.files = object.pushFile());
                 opt.uploader.config.elem.next().val(''), layui.each(opt.files, function (index, file) {
                     if (opt.size > 0 && file.size > opt.size) return delete opt.files[index], $.msg.tips('文件大小超出限制！');
@@ -75,6 +74,8 @@ define(['md5'], function (SparkMD5, allowMime) {
                     $('[data-upload-progress]').html(number + '%');
                 }
             }, done: function (ret, idx) {
+                // 兼容部分环境不解析 JSON 数据
+                if (typeof ret === 'string') ret = JSON.parse(ret) || ret;
                 /*! 检查单个文件上传返回的结果 */
                 if (ret.code < 1) return $.msg.tips(ret.info || '文件上传失败！');
                 if (typeof opt.cache[idx].xurl !== 'string') return $.msg.tips('无效的文件上传对象！');

app/data/view/base/upgrade/form.html

@@ -145,7 +145,7 @@
 
         <fieldset class="layui-form-item">
             <legend><span class="layui-badge layui-bg-cyan">奖利规则</span></legend>
-            <div class="layui-form-item notselect relative">
+            <div class="notselect relative">
                 {foreach $prizes as $prize}{if isset($vo.rebate_rule) && is_array($vo.rebate_rule) && in_array($prize.code, $vo.rebate_rule)}
                 <label class="think-checkbox"><input lay-ignore name="rebate_rule[]" type="checkbox" value="{$prize.code}" checked> {$prize.name}</label>
                 {else}

app/data/view/base/upgrade/index.html

@@ -29,43 +29,43 @@
                     }
                 },
                 {
-                    field: 'upgrade_team', title: '团队计数', align: 'center', minWidth: 80, templet: function (d) {
+                    field: 'upgrade_team', title: '团队计数', align: 'center', width: 80, templet: function (d) {
                         if (!d.upgrade_team || d.upgrade_team < 1) return '-';
                         return '<b class="layui-icon layui-icon-ok-circle color-green"></b>';
                     }
                 },
                 {
-                    field: 'upgrade_type', title: '升级规则', align: 'center', minWidth: 80, templet: function (d) {
+                    field: 'upgrade_type', title: '升级规则', align: 'center', width: 80, templet: function (d) {
                         if (d.upgrade_type === 1) return '<span class="color-green">全部完成</span>';
                         else return '<span class="color-blue">任何条件</span>';
                     }
                 },
                 {
-                    field: 'goods_vip_status', title: '入会礼包', align: 'center', minWidth: 80, templet: function (d) {
+                    field: 'goods_vip_status', title: '入会礼包', align: 'center', width: 80, templet: function (d) {
                         if (!d.goods_vip_status || d.goods_vip_status < 1) return '-';
                         return '<b class="layui-icon layui-icon-ok-circle color-green"></b>';
                     }
                 },
                 {
-                    field: 'teams_users_status', title: '团队总数', align: 'center', minWidth: 80, templet: function (d) {
+                    field: 'teams_users_status', title: '团队总数', align: 'center', width: 80, templet: function (d) {
                         if (!d.teams_users_status || d.teams_users_status < 1) return '-';
                         return laytpl('<b>{{d.teams_users_number}}</b>').render(d);
                     }
                 },
                 {
-                    field: 'teams_direct_status', title: '直属团队', align: 'center', minWidth: 80, templet: function (d) {
+                    field: 'teams_direct_status', title: '直属团队', align: 'center', width: 80, templet: function (d) {
                         if (!d.teams_direct_status || d.teams_direct_status < 1) return '-';
                         return laytpl('<b>{{d.teams_direct_number}}</b>').render(d);
                     }
                 },
                 {
-                    field: 'teams_indirect_status', title: '间接团队', align: 'center', minWidth: 80, templet: function (d) {
+                    field: 'teams_indirect_status', title: '间接团队', align: 'center', width: 80, templet: function (d) {
                         if (!d.teams_indirect_status || d.teams_indirect_status < 1) return '-';
                         return laytpl('<b>{{d.teams_indirect_number}}</b>').render(d);
                     }
                 },
                 {
-                    field: 'order_amount_status', title: '订单金额', align: 'center', minWidth: 80, templet: function (d) {
+                    field: 'order_amount_status', title: '订单金额', align: 'center', width: 80, templet: function (d) {
                         if (!d.order_amount_status || d.order_amount_status < 1) return '-';
                         return laytpl('<b>{{d.order_amount_number}}</b>').render(d);
                     }
@@ -77,8 +77,8 @@
                         }), d.html || '-';
                     }
                 },
-                {field: 'status', title: '等级状态', align: 'center', minWidth: 110, templet: '#StatusSwitchTpl'},
-                {field: 'create_at', title: '创建时间', align: 'center', minWidth: 170, sort: true},
+                {field: 'status', title: '等级状态', align: 'center', width: 110, templet: '#StatusSwitchTpl'},
+                {field: 'create_at', title: '创建时间', align: 'center', width: 170, sort: true},
                 {toolbar: '#toolbar', title: '操作面板', align: 'center', minWidth: 160, fixed: 'right'},
             ]]
         });

app/data/view/news/item/index.html

@@ -8,6 +8,10 @@
 <!--{if auth("remove")}-->
 <button data-action='{:url("remove")}' data-table-id="NewsTable" data-rule="id#{id}" data-confirm="确定要批量删除文章吗？" class='layui-btn layui-btn-sm layui-btn-primary'>批量删除</button>
 <!--{/if}-->
+
+<!--{if auth("news.mark/index")}-->
+<button class='layui-btn layui-btn-sm layui-btn-primary' data-modal='{:url("news.mark/index")}' data-title="标签管理" data-width="920px">标签管理</button>
+<!--{/if}-->
 {/block}
 
 {block name="content"}

public/static/theme/css/_custom.less

@@ -901,8 +901,8 @@ input:not(.layui-hide,[type=hidden]) {
       padding: 15px 25px;
       position: relative;
       line-height: 3em;
+      box-shadow: @ShadowOuterMax;
       border-radius: @BoxBorderRadius;
-      box-shadow: 0 2px 3px 0 rgba(0, 0, 0, .2);
 
       > div:nth-child(2) {
         font-size: 46px;