1

application/admin/controller/Accounts.php

@@ -81,7 +81,7 @@ class Accounts extends Base
                 }
             }
 
-            $info['account_name'] = $param['account_name'];
+            $info['nick_name'] = $param['nick_name'];
             $info['account_email'] = $param['account_email'];
             $info['account_phone'] = $param['account_phone'];
             $info['address'] = $param['address'];
@@ -90,7 +90,6 @@ class Accounts extends Base
             if(!empty($param['user_id']) && $param['user_id'] != 0){
                 $info['user_id'] = $param['user_id'];
             }
-
             try{
                 db('accounts')->where('id', $param['id'])->update($info);
             }catch(\Exception $e){

application/admin/controller/System.php

@@ -186,10 +186,10 @@ class System extends Base
                 $countTmp = $temp->where('start_time','<',strtotime($end . ' 23:59:59'));
             }
             //开始时间/结束时间都为空(默认查七天)
-            if(empty($start) && empty($end)){
-                $temp = $temp->where('start_time','<',time())->where('start_time','>',time()-604800);
-                $countTmp = $temp->where('start_time','<',time())->where('start_time','>',time()-604800);
-            }
+//            if(empty($start) && empty($end)){
+//                $temp = $temp->where('start_time','<',time())->where('start_time','>',time()-604800);
+//                $countTmp = $temp->where('start_time','<',time())->where('start_time','>',time()-604800);
+//            }
 
             //客服
             if($user_id != 0){
@@ -258,7 +258,7 @@ class System extends Base
             for($i=0;$i<count($users);$i++){
                 $option = $option.'<option value="'.$users[$i]['id'].'">'.$users[$i]['user_name'].'</option>';
             }
-            $useroption = '<select name="user_id" id="user_id" class="form-control">'.$option.'</select>';
+            $useroption = '<select lay-verify="required" lay-filter="user_id">'.$option.'</select>';
         }
         //所有客服组
         $groups = db('groups')->select();
@@ -267,7 +267,7 @@ class System extends Base
             for($j=0;$j<count($groups);$j++){
                 $option = $option.'<option value="'.$groups[$j]['id'].'">'.$groups[$j]['name'].'</option>';
             }
-            $groupoption = '<select name="group_id" id="group_id" class="form-control">'.$option.'</select>';
+            $groupoption = '<select lay-verify="required" lay-filter="group_id">'.$option.'</select>';
         }
 
         $this->assign([

application/admin/view/accounts/edit.html

@@ -25,7 +25,13 @@
                         <div class="form-group">
                             <label class="col-sm-3 control-label">用户名称：</label>
                             <div class="input-group col-sm-4">
-                                <input id="account_name" type="text" class="form-control" name="account_name" required="" aria-required="true" value="{$info['account_name']}">
+                                <input id="account_name" type="text" class="form-control" name="account_name" required="" aria-required="true" value="{$info['account_name']}" disabled="disabled">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">用户昵称：</label>
+                            <div class="input-group col-sm-4">
+                                <input id="nick_name" type="text" class="form-control" name="nick_name" aria-required="true" value="{$info['nick_name']}">
                             </div>
                         </div>
                         <div class="form-group">

application/admin/view/accounts/index.html

@@ -42,8 +42,8 @@
                 <div class="example">
                     <table id="cusTable">
                         <thead>
-                        <th data-field="id">用户ID</th>
                         <th data-field="account_name">用户名称</th>
+                        <th data-field="nick_name">用户昵称</th>
                         <th data-field="account_email">用户邮箱</th>
                         <th data-field="account_phone">用户电话</th>
                         <th data-field="add_time">注册时间</th>

application/admin/view/system/wordslog.html

@@ -24,7 +24,10 @@
             <form id='commentForm' role="form" method="post" class="form-inline pull-right">
                 <div class="content clearfix m-b">
                     <div class="form-group">
+                        <div class="input-group col-sm-4 layui-form" style="width: 100px;">
+                            <input type="hidden" id="user_id"/>
                         {$useroption}
+                        </div>
                     </div>
                     <!--<div class="form-group">-->
                         <!--<label class="col-sm-3 control-label">选择权限：</label>-->
@@ -38,12 +41,15 @@
                         <!--</div>-->
                     <!--</div>-->
                     <div class="form-group">
+                        <div class="input-group col-sm-4 layui-form" style="width: 120px;">
+                            <input type="hidden" id="group_id"/>
                         {$groupoption}
+                        </div>
                     </div>
                     <div class="form-group">
                         <label>聊天日期：</label>
-                        <input type="text" class="form-control" id="start" placeholder="开始日期" style="width: 100px;"> --
-                        <input type="text" class="form-control" id="end" placeholder="结束日期" style="width: 100px;">
+                        <input type="text" class="form-control" id="start" value="<?php echo date('Y-m-d',time()-604800);?>" style="width: 100px;"> --
+                        <input type="text" class="form-control" id="end" value="<?php echo date('Y-m-d',time());?>" style="width: 100px;">
                     </div>
                     &nbsp;&nbsp;
                     <div class="form-group">
@@ -87,6 +93,22 @@
 <script src="__JS__/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
 <script src="__JS__/plugins/layer/layer.min.js"></script>
 <script src="__JS__/layui/layui.js"></script>
+<script type="text/javascript">
+
+    layui.use(['form', 'upload'], function(){
+        var form = layui.form;
+
+        form.on('select(user_id)', function(value){
+            $("#user_id").val(value.value);
+            onSearch()
+        });
+        form.on('select(group_id)', function(value){
+            $("#group_id").val(value.value);
+            onSearch()
+        });
+    });
+
+</script>
 <script type="text/javascript">
     function initTable() {
         //先销毁表格
@@ -97,9 +119,9 @@
             url: "{:url('system/wordsLog')}", //获取数据的地址
             striped: true,  //表格显示条纹
             pagination: true, //启动分页
-            pageSize: 15,  //每页显示的记录数
+            pageSize: 50,  //每页显示的记录数
             pageNumber:1, //当前第几页
-            pageList: [5, 10, 15, 20, 25],  //记录数可选列表
+            pageList: [20,50],  //记录数可选列表
             sidePagination: "server", //表示服务端请求
             paginationFirstText: "首页",
             paginationPreText: "上一页",

application/service/controller/Login.php

@@ -43,7 +43,7 @@ class Login extends Controller
             'expire_time' => time()
         ];
         db('users')->where('id', $user['id'])->update($param);
-        $user = db('users')->field('id,user_name,user_avatar,phone,group_id,token')->where('id', $user['id'])->select();
+        $user = db('users')->field('id,user_account,user_name,user_avatar,phone,group_id,token')->where('id', $user['id'])->select();
         $group = db('groups')->where('id', $user[0]['group_id'])->find();
         $user[0]['group'] = $group['name'];
 

application/service/controller/Services.php

@@ -36,6 +36,7 @@ class Services extends Base
         if(request()->isPost()) {
             $account_id = input("param.account_id/s");
             $account_name = input("param.account_name/s");
+            $nick_name = input("param.nick_name/s");
             $account_email = input("param.account_email/s");
             $phone = input("param.phone/s");
             $address = input("param.address/s");
@@ -45,6 +46,7 @@ class Services extends Base
 
             $param = [
                 'account_name' => $account_name,
+                'nick_name' => $nick_name,
                 'account_email' => $account_email,
                 'phone' => $phone,
                 'address' => $address,