1

application/admin/controller/Accounts.php

@@ -256,7 +256,7 @@ class Accounts extends Base
                 if($vo['id'] != 1){
                     $result[$key]['operate'] = $this->makeBtnLabel($vo['id']);
                 }else{
-                    $result[$key]['operate'] = $operate = '<a style="margin-left:5px;" href="' . url('Accounts/editlabel', ['id' => $vo['id']]) . '"><button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 编辑</button></a> ';
+                    $result[$key]['operate'] = $operate = '<a style="margin-left:5px;" href="' . url('Accounts/editlabel', ['id' => $vo['id']]) . '"><button type="button" class="btn btn-primary btn-sm"> 编辑</button></a> ';
                 }
             }
             $return['total'] = db('accountslabel')->count();  //总数据

application/admin/controller/Iplimit.php

@@ -187,10 +187,10 @@ class Iplimit extends Base
     private function makeBtn($id)
     {
         $operate = '<a href="' . url('iplimit/edit', ['id' => $id]) . '">';
-        $operate .= '<button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 编辑</button></a> ';
+        $operate .= '<button type="button" class="btn btn-primary btn-sm"> 编辑</button></a> ';
 
         $operate .= '<a href="javascript:Del(' . $id . ')"><button type="button" class="btn btn-danger btn-sm">';
-        $operate .= '<i class="fa fa-trash-o"></i> 删除</button></a> ';
+        $operate .= ' 删除</button></a> ';
 
         return $operate;
     }

application/admin/controller/Messages.php

@@ -279,11 +279,17 @@ class Messages extends Base
                     $result[$key]['addtime'] = date('Y-m-d H:m:s',$result[$key]['addtime']);
                 }
 
-                // 优化显示状态
-                if(1 == $vo['status']){
-                    $result[$key]['status'] = '<span class="label label-primary">启用</span>';
-                }else{
-                    $result[$key]['status'] = '<span class="label label-danger">停用</span>';
+//                // 优化显示状态
+//                if(1 == $vo['status']){
+//                    $result[$key]['status'] = '<span class="label label-primary">启用</span>';
+//                }else{
+//                    $result[$key]['status'] = '<span class="label label-danger">停用</span>';
+//                }
+                // 优化显示状态.
+                if(1 == $vo['status']) {
+                    $result[$key]['status'] = '<span style="color: #2fbe1b">启用</span>';
+                } else {
+                    $result[$key]['status'] = '<span style="color: red">停用</span>';
                 }
 
                 // 生成操作按钮

application/admin/controller/Settings.php

@@ -270,11 +270,11 @@ class Settings extends Base
     // 生成按钮
     private function makeBtn($id)
     {
-        $operate = '<a style="margin-left:5px;" href="' . url('settings/edit', ['id' => $id]) . '">';
-        $operate .= '<button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 编辑</button></a> ';
+        $operate = '<a href="' . url('settings/edit', ['id' => $id]) . '">';
+        $operate .= '<button type="button" class="btn btn-primary btn-sm"> 编辑</button></a> ';
 
-        $operate .= '<a style="margin-left:5px;" href="javascript:Del(' . $id . ')"><button type="button" class="btn btn-danger btn-sm">';
-        $operate .= '<i class="fa fa-trash-o"></i> 删除</button></a> ';
+        $operate .= '<a href="javascript:Del(' . $id . ')"><button type="button" class="btn btn-danger btn-sm">';
+        $operate .= ' 删除</button></a> ';
 
         return $operate;
     }
@@ -284,7 +284,7 @@ class Settings extends Base
     {
 
         $operate = '<a style="margin-left:5px;" href="javascript:DelFile(`' . $fileName . '`)"><button type="button" class="btn btn-danger btn-sm">';
-        $operate .= '<i class="fa fa-trash-o"></i> 删除</button></a> ';
+        $operate .= ' 删除</button></a> ';
 
         return $operate;
     }

application/admin/view/accounts/addlabel.html

@@ -32,7 +32,7 @@
                         <div class="form-group">
                             <div class="col-sm-4 col-sm-offset-6">
                                 <!--<a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;margin-bottom: 5px;height: 35px;line-height: 35px;">返回</a>-->
-                                <button class="btn btn-primary" type="submit">提交</button>
+                                <button class="btn btn-primary btn-sm" type="submit">提交</button>
                             </div>
                         </div>
                     </form>

application/admin/view/accounts/editlabel.html

@@ -31,7 +31,7 @@
                         <div class="form-group">
                             <div class="col-sm-4 col-sm-offset-6">
                                 <!--<a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;margin-bottom: 5px;height: 35px;line-height: 35px;">返回</a>-->
-                                <button class="btn btn-primary" type="submit">提交</button>
+                                <button class="btn btn-primary btn-sm" type="submit">提交</button>
                             </div>
                         </div>
                     </form>

application/admin/view/accounts/label.html

@@ -20,7 +20,7 @@
         </div>
         <div class="ibox-content">
             <a href="/admin/accounts/addlabel.html">
-                <button class="btn btn-primary" type="button" style="margin-top:5px"><strong>新增会员标签</strong>
+                <button class="btn btn-primary btn-sm" type="button" style="margin-top:5px">新增
                 </button>
             </a>
 

application/admin/view/clean/index.html

@@ -56,7 +56,7 @@
                         <div class="form-group" style="margin-top: 40px;">
                             <label class="col-sm-3 control-label"></label>
                             <div class="input-group col-sm-4">
-                                <button class="btn btn-primary" type="submit">提交</button>
+                                <button class="btn btn-primary btn-sm" type="submit">提交</button>
                             </div>
                         </div>
                     </form>

application/admin/view/iplimit/add.html

@@ -42,7 +42,7 @@
                         </div>-->
                         <div class="form-group">
                             <div class="col-sm-4 col-sm-offset-6">
-                                <button class="btn btn-primary" type="submit">提交</button>
+                                <button class="btn btn-primary btn-sm" type="submit">提交</button>
                             </div>
                         </div>
                     </form>

application/admin/view/iplimit/edit.html

@@ -30,7 +30,7 @@
                         </div>
                         <div class="form-group">
                             <div class="col-sm-4 col-sm-offset-6">
-                                <button class="btn btn-primary" type="submit">提交</button>
+                                <button class="btn btn-primary btn-sm" type="submit">提交</button>
                             </div>
                         </div>
                     </form>

application/admin/view/iplimit/index.html

@@ -28,18 +28,18 @@
         </div>
         <div class="ibox-content">
             <a id="add" href="/admin/iplimit/add.html?type=2">
-                <button class="btn btn-primary" type="button" style="margin-top:10px"><strong>新增IP</strong>
+                <button class="btn btn-primary btn-sm" type="button" style="margin-top:5px">新增
                 </button>
             </a>
 
 
             <form action="/admin/sensitivec/disjunctor" enctype="multipart/form-data" method="post" role="form" class="form-inline pull-right">
                 <div class="content clearfix m-b">
-                    <div class="form-group" style="margin-left: 200px">
+                    <div class="form-group" style="margin-left: 20px">
                         <a href="javascript:disjunctor()" class="btn" style="margin-top:5px;" >
                             <input type="hidden" id="account_black_list" value="{$settings['account_black_list']}">
                             <input type="hidden" id="kf_white_list" value="{$settings['kf_white_list']}">
-                            <input type="button" id="disjunctor" class="btn {if($settings['kf_white_list']=='on')}btn-primary{else}btn-danger{/if} btn-sm" value="{$settings['white_list']}" style="font-weight: bold;height: 34px;margin-top: -2px;">
+                            <input type="button" id="disjunctor" class="btn {if($settings['kf_white_list']=='on')}btn-primary{else}btn-danger{/if} btn-sm" value="{$settings['white_list']}" style="height: 30px;margin-top: -7px;">
                         </a>
                     </div>
                 </div>
@@ -48,14 +48,14 @@
 
             <!--搜索框开始-->
             <form id='commentForm' role="form" method="post" class="form-inline pull-right">
-                <div class="content clearfix m-b" style="margin-top: 5px;">
+                <div class="content clearfix m-b">
                     <div class="form-group">
-                        <label>IP地址：</label>
-                        <input type="text" class="form-control" id="content" name="content" value="" placeholder="请输入IP地址">
+                        <label>IP地址:</label>
+                        <input type="text" class="form-control" id="content" name="content" value="" placeholder="请输入IP地址" style="height: 30px;">
                         <input style="display: none">
                     </div>
                     <div class="form-group">
-                        <button class="btn btn-primary" type="button" style="margin-top:5px" id="search"><strong>搜 索</strong>
+                        <button class="btn btn-primary btn-sm" type="button" style="margin-top:5px" id="search">搜索
                         </button>
                     </div>
                 </div>

application/admin/view/material/add.html

@@ -50,7 +50,7 @@
 
                         <div class="form-group">
                             <div class="col-sm-4 col-sm-offset-6">
-                                <button class="btn btn-primary" type="submit">提交</button>
+                                <button class="btn btn-primary btn-sm" type="submit">提交</button>
                             </div>
                         </div>
                     </form>

application/admin/view/material/index.html

@@ -41,7 +41,7 @@
         </div>
         <div class="ibox-content">
             <a href="/admin/material/add.html">
-                <button class="btn btn-primary" type="button" style="margin-top:5px"><strong>新增素材</strong>
+                <button class="btn btn-primary btn-sm" type="button" style="margin-top:5px">新增
                 </button>
             </a>
             <!--搜索框开始-->

application/admin/view/messages/add.html

@@ -38,7 +38,7 @@
                         <div class="form-group">
                             <div class="col-sm-4 col-sm-offset-6">
                                 <!--<a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;margin-bottom: 5px;height: 35px;line-height: 35px;">返回</a>-->
-                                <button class="btn btn-primary" type="submit">提交</button>
+                                <button class="btn btn-primary btn-sm" type="submit">提交</button>
                             </div>
                         </div>
                     </form>

application/admin/view/messages/edit.html

@@ -38,7 +38,7 @@
                         <div class="form-group">
                             <div class="col-sm-4 col-sm-offset-6">
                                 <!--<a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;margin-bottom: 5px;height: 35px;line-height: 35px;">返回</a>-->
-                                <button class="btn btn-primary" type="submit">提交</button>
+                                <button class="btn btn-primary btn-sm" type="submit">提交</button>
                             </div>
                         </div>
                     </form>

application/admin/view/messages/type.html

@@ -20,7 +20,7 @@
         </div>
         <div class="ibox-content">
             <a href="/admin/messages/add.html">
-                <button class="btn btn-primary" type="button" style="margin-top:5px"><strong>新增留言类型</strong>
+                <button class="btn btn-primary btn-sm" type="button" style="margin-top:5px">新增
                 </button>
             </a>
             <!--搜索框开始-->

application/admin/view/settings/add.html

@@ -85,7 +85,7 @@
 
                         <div class="form-group">
                             <div class="col-sm-4 col-sm-offset-6">
-                                <button class="btn btn-primary" type="submit">提交</button>
+                                <button class="btn btn-primary btn-sm" type="submit">提交</button>
                             </div>
                         </div>
                     </form>

application/admin/view/settings/edit.html

@@ -84,9 +84,9 @@
                         </div>
 
                         <div class="form-group">
-                            <div class="col-sm-4 col-sm-offset-6" style="margin-left: 20%;">
+                            <div class="col-sm-4 col-sm-offset-6">
                                 <!--<a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;margin-bottom: 5px;height: 35px;line-height: 35px;">返回</a>-->
-                                <button class="btn btn-primary" type="submit" style="margin-left: 10%;">提交</button>
+                                <button class="btn btn-primary btn-sm" type="submit">提交</button>
                             </div>
                         </div>
                     </form>

application/admin/view/settings/entrancelist.html

@@ -21,7 +21,7 @@
         </div>
         <div class="ibox-content">
             <a href="/admin/settings/index.html" style="margin-top: -10px">
-                <button class="btn btn-primary" type="button" style="margin-top:5px"><strong>新增</strong>
+                <button class="btn btn-primary btn-sm" type="button" style="margin-top:5px">新增
                 </button>
             </a>
             <div class="example-wrap">

application/admin/view/settings/index.html

@@ -24,7 +24,7 @@
             <div class="ibox-title" style="min-height: 0px;">
             </div>
             <a href="/admin/settings/add.html" style="margin-top: -10px">
-                <button class="btn btn-primary" type="button" style="margin-top:5px"><strong>新增入口</strong>
+                <button class="btn btn-primary btn-sm" type="button" style="margin-top:5px">新增
                 </button>
             </a>
             <div class="example-wrap">
@@ -81,8 +81,8 @@
                 </div>
                 <div class="form-group" style="margin-top: 40px;">
                     <div class="input-group col-sm-4" style="margin-left: 20px;">
-                        <a class="btn btn-primary" onclick="goDemo()">预览</a>
-                        <button class="btn btn-primary" type="submit" style="margin-left: 20px;">提交</button>
+                        <a class="btn btn-primary btn-sm" onclick="goDemo()">预览</a>
+                        <button class="btn btn-primary btn-sm" type="submit" style="margin-left: 20px;">提交</button>
                     </div>
                 </div>
             </form>

application/admin/view/system/basics.html

@@ -131,7 +131,7 @@
                         <div class="form-group" style="margin-top: 40px;">
                             <label class="col-sm-3 control-label"></label>
                             <div class="input-group col-sm-4">
-                                <button class="btn btn-primary" type="submit">提交</button>
+                                <button class="btn btn-primary btn-sm" type="submit">提交</button>
                             </div>
                         </div>
                     </form>

application/admin/view/system/conversation.html

@@ -114,7 +114,7 @@
                         <div class="form-group" style="margin-top: 40px;">
                             <label class="col-sm-3 control-label"></label>
                             <div class="input-group col-sm-4">
-                                <button class="btn btn-primary" type="submit">提交</button>
+                                <button class="btn btn-primary btn-sm" type="submit">提交</button>
                             </div>
                         </div>
                     </form>