Jonlin 6 년 전
부모
커밋
1a288952a7

+ 2 - 2
application/admin/controller/Robot.php

@@ -183,10 +183,10 @@ class Robot extends Base
     private function makeBtn($id)
     {
         $operate = '<a href="' . url('robot/editword', ['robot_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:userDel(' . $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;
     }

+ 10 - 4
application/admin/controller/Words.php

@@ -35,10 +35,16 @@ class Words extends Base
                 ->select();
             foreach($result as $key=>$vo){
                 // 优化显示状态
+//                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>';
+                    $result[$key]['status'] = '<span style="color: #2fbe1b">启用</span>';
                 }else{
-                    $result[$key]['status'] = '<span class="label label-danger">禁用</span>';
+                    $result[$key]['status'] = '<span style="color: red">禁用</span>';
                 }
 
                 if ($param['type'] == 1) {
@@ -157,10 +163,10 @@ class Words extends Base
     private function makeBtn($id)
     {
         $operate = '<a href="' . url('words/editword', ['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:userDel(' . $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;
     }

+ 1 - 1
application/admin/view/robot/addword.html

@@ -84,7 +84,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>

+ 1 - 1
application/admin/view/robot/editword.html

@@ -84,7 +84,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>

+ 10 - 10
application/admin/view/robot/index.html

@@ -20,13 +20,13 @@
         </div>
         <div class="ibox-content">
             <a href="/admin/robot/addword.html">
-                <button class="btn btn-primary" type="button" style="margin-top:10px"><strong>新增智能问答</strong>
+                <button class="btn btn-primary btn-sm" type="button" style="margin-top:5px">新增
                 </button>
             </a>
             <form action="/admin/robot/inserExcel" enctype="multipart/form-data" method="post" role="form" class="form-inline pull-right">
-                <div class="content clearfix m-b">
-                    <div class="form-group">
-                        <a href="javascript:allDel()" class="btn" style="margin-top:5px;" ><button type="button" class="btn btn-danger btn-sm"><i class="fa fa-trash-o"></i>全部删除</button></a>
+                <div class="content clearfix m-b" style="margin-top:-7px">
+                    <div class="form-group" style="margin-left: 20px;">
+                        <a href="javascript:allDel()" class="btn" style="margin-top:5px;" ><button type="button" class="btn btn-danger btn-sm">全部删除</button></a>
                     </div>
                     <!--<div class="form-group">-->
                         <!--<a href="/static/admin/file/robot.xlsx" class="btn btn-primary" style="margin-top:5px" >下载智能问答模板文件</a>-->
@@ -38,21 +38,21 @@
                     <!--<div class="form-group">-->
                         <!--<input type="submit" class="btn btn-primary" style="margin-top:5px" value="导入">-->
                     <!--</div>-->
-                    <div class="form-group">
-                        <a href="javascript:leadingin()" class="btn" style="margin-top:5px;" ><button type="button" class="btn btn-primary">导入智能问答</button></a>
+                    <div class="form-group" style="margin-left: 10px;">
+                        <a href="javascript:leadingin()" class="btn" style="margin-top:5px;" ><button type="button" class="btn btn-primary btn-sm">导入智能问答</button></a>
                     </div>
                 </div>
             </form>
             <!--搜索框开始-->
             <form id='commentForm' role="form" method="post" class="form-inline pull-right">
                 <input style="display: none">
-                <div class="content clearfix m-b" style="margin-top:5px">
+                <div class="content clearfix m-b">
                     <div class="form-group">
-                        <label>问题</label>
-                        <input type="text" class="form-control" id="content" name="content">
+                        <label>问题:</label>
+                        <input type="text" class="form-control" id="content" name="content" style="height: 30px;">
                     </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>

+ 6 - 6
application/admin/view/sensitivec/index.html

@@ -32,7 +32,7 @@
                 </button>
             </a>
             <form action="/admin/sensitivec/inserExcel" enctype="multipart/form-data" method="post" role="form" class="form-inline pull-right">
-                <div class="content clearfix m-b">
+                <div class="content clearfix m-b" style="margin-top: -2px;">
                     <div class="form-group" style="margin-left: 20px">
                         <a href="javascript:allDel()" class="btn" style="" ><button type="button" class="btn btn-danger btn-sm">全部删除</button></a>
                     </div>
@@ -46,21 +46,21 @@
                     <!--<div class="form-group">-->
                         <!--<input type="submit" class="btn btn-primary"  value="导入">-->
                     <!--</div>-->
-                    <div class="form-group">
+                    <div class="form-group" style="margin-left: 10px">
                         <a href="javascript:leadingin()" class="btn" ><button type="button" class="btn btn-primary btn-sm">导入敏感词</button></a>
                     </div>
                 </div>
             </form>
             <!--搜索框开始-->
             <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>敏感词</label>
-                        <input type="text" class="form-control" id="content" name="content" value="" placeholder="请输入敏感词">
+                        <label>敏感词:</label>
+                        <input type="text" class="form-control" id="content" name="content" value="" placeholder="请输入敏感词" style="height: 30px;">
                         <input style="display: none">
                     </div>
                     <div class="form-group">
-                        <button class="btn btn-primary btn-sm" type="button" style="margin-top:2px" id="search">搜索</button>
+                        <button class="btn btn-primary btn-sm" type="button" style="margin-top:5px" id="search">搜索</button>
                     </div>
                 </div>
             </form>

+ 1 - 1
application/admin/view/words/addword.html

@@ -46,7 +46,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>

+ 1 - 1
application/admin/view/words/editword.html

@@ -46,7 +46,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>

+ 11 - 11
application/admin/view/words/index.html

@@ -29,15 +29,15 @@
         <div class="ibox-title">
             <h5>系统常用语列表</h5>
         </div>
-        <div class="ibox-content" style="border-top: 0;">
+        <div class="ibox-content">
             <a href="/admin/words/addword.html">
-                <button class="btn btn-primary" type="button" style="margin-top:10px"><strong>新增常用语</strong>
+                <button class="btn btn-primary btn-sm" type="button" style="margin-top:5px">新增
                 </button>
             </a>
             <form action="/admin/words/inserExcel" enctype="multipart/form-data" method="post" role="form" class="form-inline pull-right">
-                <div class="content clearfix m-b">
-                    <div class="form-group">
-                        <a href="javascript:allDel()" class="btn" style="margin-top:5px;" ><button type="button" class="btn btn-danger btn-sm"><i class="fa fa-trash-o"></i>全部删除</button></a>
+                <div class="content clearfix m-b" style="margin-top: -7px;">
+                    <div class="form-group" style="margin-left:20px;">
+                        <a href="javascript:allDel()" class="btn" style="margin-top:5px;" ><button type="button" class="btn btn-danger btn-sm">全部删除</button></a>
                     </div>
                     <!--<div class="form-group">-->
                         <!--<a href="/static/admin/file/words.xlsx" class="btn btn-primary" style="margin-top:5px" >下载快捷回复模板文件</a>-->
@@ -49,8 +49,8 @@
                     <!--<div class="form-group">-->
                         <!--<input type="submit" class="btn btn-primary" style="margin-top:5px" value="导入">-->
                     <!--</div>-->
-                    <div class="form-group">
-                        <a href="javascript:leadingin()" class="btn" style="margin-top:5px;" ><button type="button" class="btn btn-primary">导入快捷回复</button></a>
+                    <div class="form-group" style="margin-left:10px;">
+                        <a href="javascript:leadingin()" class="btn" style="margin-top:5px;" ><button type="button" class="btn btn-primary btn-sm">导入快捷回复</button></a>
                     </div>
                 </div>
 
@@ -58,13 +58,13 @@
             <!--搜索框开始-->
             <form id='commentForm' role="form" method="post" class="form-inline pull-right">
                 <input style="display: none">
-                <div class="content clearfix m-b"  style="margin-top:5px;">
+                <div class="content clearfix m-b">
                     <div class="form-group">
-                        <label>常用语</label>
-                        <input type="text" class="form-control" id="content" name="content">
+                        <label>常用语:</label>
+                        <input type="text" class="form-control" id="content" name="content" style="height: 30px;">
                     </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>