1

application/admin/controller/Users.php

@@ -45,9 +45,9 @@ class Users extends Base
 
                 // 优化显示状态
                 if(1 == $vo['user_overview']){
-                    $result[$key]['user_overview'] = '<span class="label label-primary">启用</span>';
+                    $result[$key]['user_overview'] = '<span style="color: #2fbe1b">启用</span>';
                 }else{
-                    $result[$key]['user_overview'] = '<span class="label label-danger">禁用</span>';
+                    $result[$key]['user_overview'] = '<span style="color: red">禁用</span>';
                 }
 
                 // 查询分组

application/admin/view/robot/index.html

@@ -24,9 +24,9 @@
                 </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" style="margin-top:-7px">
+                <div class="content clearfix m-b" style="margin-top:5px">
                     <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>
+                        <a href="javascript:allDel()" class="" 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,8 +38,8 @@
                     <!--<div class="form-group">-->
                         <!--<input type="submit" class="btn btn-primary" style="margin-top:5px" value="导入">-->
                     <!--</div>-->
-                    <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 class="form-group" style="margin-left: 20px;">
+                        <a href="javascript:leadingin()" class="" style="margin-top:5px;" ><button type="button" class="btn btn-primary btn-sm">导入智能问答</button></a>
                     </div>
                 </div>
             </form>

application/admin/view/sensitivec/index.html

@@ -32,9 +32,9 @@
                 </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" style="margin-top: -2px;">
+                <div class="content clearfix m-b" style="margin-top: 5px;">
                     <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>
+                        <a href="javascript:allDel()" class="" style="" ><button type="button" class="btn btn-danger btn-sm">全部删除</button></a>
                     </div>
                     <!--<div class="form-group">-->
                         <!--<a href="/static/admin/file/sensitivewords.xlsx" class="btn btn-primary"  >下载敏感词模板文件</a>-->
@@ -46,8 +46,8 @@
                     <!--<div class="form-group">-->
                         <!--<input type="submit" class="btn btn-primary"  value="导入">-->
                     <!--</div>-->
-                    <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 class="form-group" style="margin-left: 20px;">
+                        <a href="javascript:leadingin()" class="" ><button type="button" class="btn btn-primary btn-sm">导入敏感词</button></a>
                     </div>
                 </div>
             </form>

application/admin/view/words/index.html

@@ -35,9 +35,9 @@
                 </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" style="margin-top: -7px;">
+                <div class="content clearfix m-b" style="margin-top: 5px;">
                     <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>
+                        <a href="javascript:allDel()" class="" 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" 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 class="form-group" style="margin-left:20px;">
+                        <a href="javascript:leadingin()" class="" style="margin-top:5px;" ><button type="button" class="btn btn-primary btn-sm">导入快捷回复</button></a>
                     </div>
                 </div>
 

application/service/controller/Services.php

@@ -42,15 +42,24 @@ class Services extends Base
             $label_id = input("param.label_id/s");
             $nick_name = input("param.nick_name/s");
 
-
-            $param = [
-                'account_email' => $account_email,
-                'account_phone' => $phone,
-                'address' => $address,
-                'label_id' => $label_id,
-                'nick_name' => $nick_name,
-                'remark' => $remark
-            ];
+            if(empty($label_id) || $label_id == 0){
+                $param = [
+                    'account_email' => $account_email,
+                    'account_phone' => $phone,
+                    'address' => $address,
+                    'nick_name' => $nick_name,
+                    'remark' => $remark
+                ];
+            }else{
+                $param = [
+                    'account_email' => $account_email,
+                    'account_phone' => $phone,
+                    'address' => $address,
+                    'label_id' => $label_id,
+                    'nick_name' => $nick_name,
+                    'remark' => $remark
+                ];
+            }
 
             $account = db('accounts')->where('id', $account_id)->select();
             if(!empty($account)){