1

application/admin/controller/Base.php

@@ -25,12 +25,14 @@ class Base extends Controller
                 }
             }
         }
+        $settings = db('settings')->where('id',1)->find();
 
         $this->assign([
             'version' => config('version'),
             'socket' =>config('socket'),
             'menu' =>$menu,
             'admin' =>$admin,
+            'settings' =>$settings,
         ]);
     }
 }

application/admin/controller/System.php

@@ -205,11 +205,6 @@ class System extends Base
                 $temp = $temp->where('start_time','<',strtotime($end . ' 23:59:59'));
                 $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($user_id != 0){
@@ -219,8 +214,8 @@ class System extends Base
 
             //客服组
             if($group_id != 0){
-                $temp = $temp->where('group_id', $group_id);
-                $countTmp = $temp->where('group_id', $group_id);
+                $temp = $temp->where('group_id', 4);
+                $countTmp = $temp->where('group_id', 4);
             }
 
             $result = $temp->limit($offset, $limit)->order('start_time', 'desc')->select();

application/admin/view/index.html

@@ -28,7 +28,7 @@
             <ul class="nav" id="side-menu">
                 <li class="nav-header">
                     <div class="dropdown profile-element">
-                        <span><img alt="image" class="img-circle" src="__IMG__/backlogo.png"/></span>
+                        <span><img alt="image" height="50" class="img-circle" src="{$settings['logo']}"/></span>
                         <a data-toggle="dropdown" class="dropdown-toggle" href="#">
                             <span class="clear">
                                 <span style="font-size: 18px; margin-top: 20px" onclick="change()" class="block m-t-xs">欢迎您 · <strong class="font-bold"></strong>{$admin['user_name']}</span>

application/admin/view/system/wordslog.html

@@ -44,13 +44,13 @@
                       
                     <div class="form-group">
                         <div class="input-group col-sm-4 layui-form" style="width: 100px;">
-                            <input type="hidden" id="user_id"/>
+                            <input type="hidden" id="user_id" value="0"/>
                             {$useroption}
                         </div>
                     </div>
                     <div class="form-group">
                         <div class="input-group col-sm-4 layui-form" style="width: 120px;">
-                            <input type="hidden" id="group_id"/>
+                            <input type="hidden" id="group_id" value="0"/>
                             {$groupoption}
                         </div>
                     </div>

application/admin/view/users/adduser.html

@@ -29,7 +29,7 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="col-sm-3 control-label">客服名称 <span style="color: red;">*</span>：</label>
+                            <label class="col-sm-3 control-label">客服昵称 <span style="color: red;">*</span>：</label>
                             <div class="input-group col-sm-4">
                                 <input id="username" type="text" class="form-control" name="user_name" required="" aria-required="true">
                             </div>

application/admin/view/users/edituser.html

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

application/admin/view/users/index.html

@@ -58,7 +58,7 @@
                     <table id="cusTable">
                         <thead>
                         <th data-field="user_account">客服账号</th>
-                        <th data-field="user_name">客服名称</th>
+                        <th data-field="user_name">客服昵称</th>
                         <th data-field="user_job_number">客服工号</th>
                         <th data-field="user_email">客服邮箱</th>
                         <th data-field="user_avatar">客服头像</th>

application/index/controller/Index.php

@@ -99,7 +99,8 @@ class Index extends Common
     {
         $now = time();
         $time = date('Y-m-d H:i', $now);
-        return json(['code' => 1, 'data' => ['time' => $time], 'msg' => '成功']);
+        $logo = db('settings')->where('id',1)->find();
+        return json(['code' => 1, 'data' => ['time' => $time,'logo' => $logo['logo']], 'msg' => '成功']);
     }
 
 }