修改样式

app/admin/controller/Queue.php

@@ -54,7 +54,7 @@ class Queue extends Controller
                 }
             }
         }, function (QueryHelper $query) {
-            $query->equal('status')->like('code,title,command');
+            $query->equal('status')->like('code|title#title,command');
             $query->timeBetween('enter_time,exec_time')->dateBetween('create_at');
         });
     }

app/admin/controller/User.php

@@ -59,7 +59,7 @@ class User extends Controller
 
             // 数据列表搜索过滤
             $query->equal('status,usertype')->dateBetween('login_at,create_at');
-            $query->like('username,nickname,contact_phone#phone,contact_mail#mail');
+            $query->like('username|nickname#username,contact_phone#phone,contact_mail#mail');
         });
     }
 

app/admin/view/queue/index_search.html

@@ -3,16 +3,9 @@
     <form class="layui-form layui-form-pane form-search" action="{:sysuri()}" onsubmit="return false" method="get" autocomplete="off">
 
         <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">任务编号</label>
+            <label class="layui-form-label">编号名称</label>
             <label class="layui-input-inline">
-                <input name="code" value="{$get.code|default=''}" placeholder="请输入任务编号" class="layui-input">
-            </label>
-        </div>
-
-        <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">任务名称</label>
-            <label class="layui-input-inline">
-                <input name="title" value="{$get.title|default=''}" placeholder="请输入任务名称" class="layui-input">
+                <input name="title" value="{$get.title|default=''}" placeholder="请输入名称或编号" class="layui-input">
             </label>
         </div>
 

app/admin/view/user/index.html

@@ -47,13 +47,13 @@
                         return layui.laytpl('<div class="headimg headimg-xs margin-0" data-tips-image data-tips-hover data-lazy-src="{{d.headimg}}"></div>').render(d);
                     }
                 },
-                {field: 'username', title: '登录账号', minWidth: 100, templet: '<div>{{d.username||"-"}}</div>'},
-                {field: 'nickname', title: '用户名称', minWidth: 100, templet: '<div>{{d.nickname||"-"}}</div>'},
+                {field: 'username', title: '登录账号', minWidth: 100, align: 'center', templet: '<div>{{d.username||"-"}}</div>'},
+                {field: 'nickname', title: '用户名称', minWidth: 100, align: 'center', templet: '<div>{{d.nickname||"-"}}</div>'},
                 /* {notempty name='bases'} */
                 {
-                    field: 'usertype', title: '角色身份', minWidth: 140, sort: true, templet: function (d) {
+                    field: 'usertype', title: '角色身份', minWidth: 100, align: 'center', templet: function (d) {
                         d.userinfo = d.userinfo || {};
-                        return d.userinfo.code ? (d.userinfo.name + ' ( ' + d.userinfo.code + ' ) ') : '';
+                        return d.userinfo.code ? (d.userinfo.name + ' ( ' + d.userinfo.code + ' ) ') : '-';
                     }
                 },
                 /* {/notempty} */
@@ -63,7 +63,7 @@
                 {field: 'login_num', title: '登录次数', align: 'center', minWidth: 100, sort: true},
                 {field: 'login_at', title: '最后登录', align: 'center', minWidth: 170, sort: true},
                 {field: 'create_at', title: '创建时间', align: 'center', minWidth: 170, sort: true},
-                {toolbar: '#toolbar', title: '操作面板', align: 'center', minWidth: 160, fixed: 'right'}
+                {toolbar: '#toolbar', title: '操作面板', align: 'center', minWidth: 150, fixed: 'right'}
             ]]
         });
 

app/admin/view/user/index_search.html

@@ -1,16 +1,9 @@
 <form class="layui-form layui-form-pane form-search" action="{:sysuri()}" onsubmit="return false" method="get" autocomplete="off">
 
     <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">登录账号</label>
+        <label class="layui-form-label">账号名称</label>
         <label class="layui-input-inline">
-            <input name="username" value="{$get.username|default=''}" placeholder="请输入登录账号" class="layui-input">
-        </label>
-    </div>
-
-    <div class="layui-form-item layui-inline">
-        <label class="layui-form-label">用户名称</label>
-        <label class="layui-input-inline">
-            <input name="nickname" value="{$get.nickname|default=''}" placeholder="请输入用户名称" class="layui-input">
+            <input name="username" value="{$get.username|default=''}" placeholder="请输入账号或名称" class="layui-input">
         </label>
     </div>
 

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

@@ -61,7 +61,7 @@
                 {field: 'num_read', title: '阅读数', align: 'center', minWidth: 80, sort: true, style: 'color:blue;font-size:16px'},
                 {field: 'status', title: '状态', align: 'center', minWidth: 110, templet: '#StatusSwitchTpl'},
                 {field: 'create_at', title: '创建时间', align: 'center', minWidth: 170, sort: true},
-                {toolbar: '#toolbar', title: '操作面板', align: 'center', minWidth: 160, fixed: 'right'},
+                {toolbar: '#toolbar', title: '操作面板', align: 'center', minWidth: 80, fixed: 'right'},
             ]]
         });
 

public/static/plugs/ckeditor5/ckeditor.css

@@ -69,3 +69,4 @@
 .ck.ck-table-cell-properties-form .ck-form__row.ck-table-cell-properties-form__alignment-row{flex-wrap:wrap}.ck.ck-table-cell-properties-form .ck-form__row.ck-table-cell-properties-form__alignment-row .ck.ck-toolbar:first-of-type{flex-grow:0.57}.ck.ck-table-cell-properties-form .ck-form__row.ck-table-cell-properties-form__alignment-row .ck.ck-toolbar:last-of-type{flex-grow:0.43}.ck.ck-table-cell-properties-form .ck-form__row.ck-table-cell-properties-form__alignment-row .ck.ck-toolbar .ck-button{flex-grow:1}.ck.ck-table-cell-properties-form{width:320px}.ck.ck-table-cell-properties-form .ck-form__row.ck-table-cell-properties-form__padding-row{align-self:flex-end;padding:0;width:25%}.ck.ck-table-cell-properties-form .ck-form__row.ck-table-cell-properties-form__alignment-row .ck.ck-toolbar{background:none;margin-top:var(--ck-spacing-standard)}
 :root{--ck-color-table-column-resizer-hover:var(--ck-color-base-active);--ck-table-column-resizer-width:7px;--ck-table-column-resizer-position-offset:calc(var(--ck-table-column-resizer-width)*-0.5 - 0.5px)}.ck-content .table table{overflow:hidden;table-layout:fixed}.ck-content .table td,.ck-content .table th{position:relative}.ck-content .table .table-column-resizer{bottom:-999999px;cursor:col-resize;position:absolute;right:var(--ck-table-column-resizer-position-offset);top:-999999px;user-select:none;width:var(--ck-table-column-resizer-width);z-index:var(--ck-z-default)}.ck-content .table[draggable] .table-column-resizer{display:none}.ck-content .table .table-column-resizer:hover,.ck-content .table .table-column-resizer__active{background-color:var(--ck-color-table-column-resizer-hover);opacity:.25}.ck-content[dir=rtl] .table .table-column-resizer{left:var(--ck-table-column-resizer-position-offset);right:unset}.ck-content.ck-read-only .table .table-column-resizer{display:none}
 .ck.ck-table-properties-form .ck-form__row.ck-table-properties-form__alignment-row{align-content:baseline;flex-basis:0;flex-wrap:wrap}.ck.ck-table-properties-form .ck-form__row.ck-table-properties-form__alignment-row .ck.ck-toolbar .ck-toolbar__items{flex-wrap:nowrap}.ck.ck-table-properties-form{width:320px}.ck.ck-table-properties-form .ck-form__row.ck-table-properties-form__alignment-row{align-self:flex-end;padding:0}.ck.ck-table-properties-form .ck-form__row.ck-table-properties-form__alignment-row .ck.ck-toolbar{background:none;margin-top:var(--ck-spacing-standard)}.ck.ck-table-properties-form .ck-form__row.ck-table-properties-form__alignment-row .ck.ck-toolbar .ck-toolbar__items>*{width:40px}
+.ck ol,.ck ul{margin:revert;padding:revert}.ck li{list-style:revert}

public/static/theme/css/_config.less

@@ -38,12 +38,18 @@
 @TopHeaderNavNormalBackColor: @TopHeaderBackColor;
 
 // 导航条按钮颜色
-@TopHeaderHeight: 50px;
 @TopHeaderNavHoverTextColor: #000;
 @TopHeaderNavHoverBackColor: rgba(0, 0, 0, 0.05);
 @TopHeaderNavActiveTextColor: #000;
 @TopHeaderNavActiveBackColor: rgba(0, 0, 0, 0.10);
 
+// 布局尺寸设置
+@LayoutLeftMiniSize: 55px;
+@LayoutLeftDefaSize: 200px;
+@LayoutLeftNavHeight: 50px;
+@LayoutHeadTopHeight: 55px;
+@LayoutBodyHeadHeight: 50px;
+
 // 左侧菜单布局颜色
 @LeftMainBackColor: #20222A !important;
 
@@ -62,10 +68,6 @@
 // 窗口页面背景颜色
 @BodyMainBackColor: #EFEFEF;
 
-// 左侧菜单大小
-@LayoutMiniLeftSize: 50px;
-@LayoutDefaLeftSzie: 200px;
-
 // 最小滚动样式
 #defaScrollbar() {
   height: 100%;

public/static/theme/css/_custom.less

@@ -636,8 +636,8 @@
 }
 
 .think-box-notify {
+  padding: 20px;
   display: block;
-  padding: 16px 20px;
   font-size: 14px;
   background: #FFF;
   line-height: 1em;

public/static/theme/css/_layout.less

@@ -16,10 +16,10 @@
 
 .layui-layout {
   > .layui-header {
-    left: @LayoutDefaLeftSzie;
+    left: @LayoutLeftDefaSize;
     right: 0;
     color: @TopHeaderTextColor !important;
-    height: @TopHeaderHeight !important;
+    height: @LayoutHeadTopHeight !important;
     z-index: 222;
     position: absolute;
     box-sizing: content-box;
@@ -54,10 +54,10 @@
       }
 
       .layui-nav-item > a {
-        height: @TopHeaderHeight;
+        height: @LayoutHeadTopHeight;
         padding: 0 18px;
         overflow: hidden;
-        line-height: @TopHeaderHeight;
+        line-height: @LayoutHeadTopHeight;
 
         &:hover {
           color: @TopHeaderNavHoverTextColor
@@ -70,8 +70,8 @@
     }
 
     .layui-nav-item {
-      height: @TopHeaderHeight;
-      line-height: @TopHeaderHeight;
+      height: @LayoutHeadTopHeight;
+      line-height: @LayoutHeadTopHeight;
 
       > a {
         color: @TopHeaderNavNormalTextColor !important;
@@ -88,7 +88,7 @@
       }
 
       .layui-nav-child {
-        top: @TopHeaderHeight;
+        top: @LayoutHeadTopHeight;
         border: 0;
         padding: 0;
         line-height: 48px;
@@ -141,7 +141,7 @@
   > .layui-side {
     top: 0;
     bottom: 0;
-    width: @LayoutDefaLeftSzie;
+    width: @LayoutLeftDefaSize;
     z-index: 333;
     position: fixed;
     overflow: hidden;
@@ -152,13 +152,13 @@
     .layui-logo {
       color: #FFF;
       width: auto;
-      height: @TopHeaderHeight;
+      height: @LayoutHeadTopHeight;
       display: block;
       overflow: hidden;
       position: relative;
       text-align: center;
       box-shadow: none !important;
-      line-height: @TopHeaderHeight;
+      line-height: @LayoutHeadTopHeight;
       border-bottom: @BoxBottomLine;
 
       .headimg {
@@ -211,7 +211,7 @@
     }
 
     .layui-side-scroll {
-      top: @TopHeaderHeight;
+      top: @LayoutHeadTopHeight;
       bottom: 0;
       width: 100% !important;
       height: 100% !important;
@@ -228,13 +228,13 @@
 
       .layui-side-icon:after,
       .layui-side-tree:after {
-        height: @TopHeaderHeight;
+        height: @LayoutHeadTopHeight;
         content: '';
         display: block;
       }
 
       .layui-nav-tree {
-        width: @LayoutDefaLeftSzie;
+        width: @LayoutLeftDefaSize;
         background: none !important;
 
         > li.layui-this {
@@ -270,9 +270,9 @@
         }
 
         a {
-          height: 45px;
+          height: @LayoutLeftNavHeight;
           display: block;
-          line-height: 45px;
+          line-height: @LayoutLeftNavHeight;
           padding-top: 0;
           padding-bottom: 0;
           color: @LeftMainNavNormalTextColor;
@@ -294,14 +294,14 @@
   }
 
   > .layui-body {
-    top: @TopHeaderHeight;
-    left: @LayoutDefaLeftSzie;
+    top: @LayoutHeadTopHeight;
+    left: @LayoutLeftDefaSize;
     padding: 0;
     z-index: 111;
     background: @BodyMainBackColor;
 
     > .think-page-loader {
-      left: @LayoutDefaLeftSzie
+      left: @LayoutLeftDefaSize
     }
 
     > .think-page-body > .layui-card {
@@ -352,25 +352,30 @@
       }
 
       > .layui-card-header {
-        top: @TopHeaderHeight;
-        left: @LayoutDefaLeftSzie;
+        top: @LayoutHeadTopHeight;
+        left: @LayoutLeftDefaSize;
+        box-sizing: border-box;
         border-top: @BoxBottomLine;
         border-bottom: 1px solid #fff !important;
         #NotSelect();
 
         right: 0;
-        height: 45px;
+        height: @LayoutBodyHeadHeight;
         z-index: 4;
         padding: 0 15px;
         position: fixed;
         background: #FFF;
-        line-height: 45px;
+        line-height: @LayoutBodyHeadHeight;
+
+        > div {
+          margin-top: -1px
+        }
 
         & + .layui-card-line {
-          top: 47px;
+          top: @LayoutBodyHeadHeight;
 
           & + .layui-card-body {
-            top: 47px;
+            top: @LayoutBodyHeadHeight;
           }
         }
       }
@@ -380,18 +385,18 @@
 
 .layui-layout-left-mini {
   .layui-header {
-    left: @LayoutMiniLeftSize !important;
+    left: @LayoutLeftMiniSize !important;
   }
 
   > .layui-body {
-    left: @LayoutMiniLeftSize !important;
+    left: @LayoutLeftMiniSize !important;
 
     > .think-page-loader {
-      left: @LayoutMiniLeftSize !important;
+      left: @LayoutLeftMiniSize !important;
     }
 
     > .think-page-body > .layui-card > .layui-card-header {
-      left: @LayoutMiniLeftSize !important;
+      left: @LayoutLeftMiniSize !important;
     }
   }
 
@@ -443,7 +448,7 @@
     .layui-nav-tree,
     .layui-side-scroll,
     .layui-side-scroll .layui-nav-tree {
-      width: @LayoutMiniLeftSize;
+      width: @LayoutLeftMiniSize;
       text-align: center;
     }
   }

public/static/theme/css/login.css.map

@@ -1 +1 @@
-{"version":3,"sources":["login.less","_config.less"],"names":[],"mappings":"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"}
+{"version":3,"sources":["login.less","_config.less"],"names":[],"mappings":"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"}