Merge branch 'dev' of http://git.bocai108.com:10180/Ethan/Customer-Service into dev

application/admin/controller/Kfnotice.php

@@ -65,11 +65,11 @@ class Kfnotice extends Base
 
             $model = new ServicenoticeModel();
             if (!$bibao) {
-                $result = $model->where($where)->limit($offset, $limit)->order('id', 'desc')->select();
+                $result = $model->where($where)->limit($offset, $limit)->order('sendtime', 'desc')->select();
             } else {
                 $result = $model->where($where)->where(function ($query) use ($biaaodata) {
                     $query->where(['sendtime' => ['>=', $biaaodata['0']]])->where(['sendtime' => ['<=', $biaaodata['1']]]);
-                })->limit($offset, $limit)->order('id', 'desc')->select();
+                })->limit($offset, $limit)->order('sendtime', 'desc')->select();
             }
 
             //管理员
@@ -86,6 +86,42 @@ class Kfnotice extends Base
                         $result[$key]['admin_name'] = $admins[$i]['user_name'];
                     }
                 }
+
+                $date = explode(' ',$vo->ctime);
+                $year = explode('-',$vo->ctime);
+                if($date[0] == date('Y-m-d',time())){
+                    $result[$key]['ctime'] = '<span style="float: right;">'.$date[1].'</span>';
+                }else if($date[0] == date('Y-m-d',strtotime("-1 day"))){
+                    $result[$key]['ctime'] = '<span style="float: right;">'.'昨天 '.$date[1].'</span>';
+                }else{
+                    if($year[0] == date('Y',time())){
+                        $result[$key]['ctime'] = '<span style="float: right;">'.date('m-d H:i:s',strtotime($vo->ctime)).'</span>';
+                    }
+                }
+
+                $date = explode(' ',$vo->readtime);
+                $year = explode('-',$vo->readtime);
+                if($date[0] == date('Y-m-d',time())){
+                    $result[$key]['readtime'] = '<span style="float: right;">'.$date[1].'</span>';
+                }else if($date[0] == date('Y-m-d',strtotime("-1 day"))){
+                    $result[$key]['readtime'] = '<span style="float: right;">'.'昨天 '.$date[1].'</span>';
+                }else{
+                    if($year[0] == date('Y',time())){
+                        $result[$key]['readtime'] = '<span style="float: right;">'.date('m-d H:i:s',strtotime($vo->readtime)).'</span>';
+                    }
+                }
+
+                $date = explode(' ',$vo->sendtime);
+                $year = explode('-',$vo->sendtime);
+                if($date[0] == date('Y-m-d',time())){
+                    $result[$key]['sendtime'] = '<span style="float: right;">'.$date[1].'</span>';
+                }else if($date[0] == date('Y-m-d',strtotime("-1 day"))){
+                    $result[$key]['sendtime'] = '<span style="float: right;">'.'昨天 '.$date[1].'</span>';
+                }else{
+                    if($year[0] == date('Y',time())){
+                        $result[$key]['sendtime'] = '<span style="float: right;">'.date('m-d H:i:s',strtotime($vo->sendtime)).'</span>';
+                    }
+                }
             }
 
             if (!$bibao) {

application/admin/controller/Messages.php

@@ -60,18 +60,21 @@ class Messages extends Base
             $result = model('Accountsmessage')->selectJoin($join,$leftjoin,$where, $start,$end,$offset, $limit);
             foreach($result as $key=>$vo){
 
-                // 优化显示附件
-                $images = $result[$key]['image'];
-                //转换成数组格式
-                $images = explode(",", $images);
-                if(!empty($images)){
-                    $img = '';
-                    for($i=0;$i<count($images);$i++){
-                        $img = $img.'<img src="'.$images[$i].'" width="40px" height="40px" style="margin-left:5px;margin-top:5px;">';
+                if(!empty($result[$key]['image'])){
+                    // 优化显示附件
+                    $images = $result[$key]['image'];
+                    //转换成数组格式
+                    $images = explode(",", $images);
+                    if(!empty($images)){
+                        $img = '';
+                        for($i=0;$i<count($images);$i++){
+                            $img = $img.'<img src="'.$images[$i].'" width="40px" height="40px" style="margin-left:5px;margin-top:5px;">';
+                        }
+                        $result[$key]['image'] = $img;
                     }
-                    $result[$key]['image'] = $img;
                 }
 
+
                 // 优化时间
                 if(null != $vo['add_time']){
                     $result[$key]['add_time'] = date('Y-m-d H:m:s',$result[$key]['add_time']);

application/admin/controller/System.php

@@ -232,16 +232,55 @@ class System extends Base
             foreach($result as $key=>$vo){
                 if($result[$key]['intime'] != 0){
                     $result[$key]['intime'] = date('Y-m-d H:i:s', $vo['intime']);
+
+                    $date = explode(' ',$result[$key]['intime']);
+                    $year = explode('-',$result[$key]['intime']);
+                    if($date[0] == date('Y-m-d',time())){
+                        $result[$key]['intime'] = '<span style="float: right;">'.$date[1].'</span>';
+                    }else if($date[0] == date('Y-m-d',strtotime("-1 day"))){
+                        $result[$key]['intime'] = '<span style="float: right;">'.'昨天 '.$date[1].'</span>';
+                    }else{
+                        if($year[0] == date('Y',time())){
+                            $result[$key]['intime'] = '<span style="float: right;">'.date('m-d H:i:s',strtotime($result[$key]['intime'])).'</span>';
+                        }
+                    }
+
                 }else{
                     $result[$key]['intime'] = '-';
                 }
                 if($result[$key]['start_time'] != 0){
                     $result[$key]['start_time'] = date('Y-m-d H:i:s', $vo['start_time']);
+
+                    $date = explode(' ',$result[$key]['start_time']);
+                    $year = explode('-',$result[$key]['start_time']);
+                    if($date[0] == date('Y-m-d',time())){
+                        $result[$key]['start_time'] = '<span style="float: right;">'.$date[1].'</span>';
+                    }else if($date[0] == date('Y-m-d',strtotime("-1 day"))){
+                        $result[$key]['start_time'] = '<span style="float: right;">'.'昨天 '.$date[1].'</span>';
+                    }else{
+                        if($year[0] == date('Y',time())){
+                            $result[$key]['start_time'] = '<span style="float: right;">'.date('m-d H:i:s',strtotime($result[$key]['start_time'])).'</span>';
+                        }
+                    }
+
                 }else{
                     $result[$key]['start_time'] = '-';
                 }
                 if($result[$key]['end_time'] != 0){
                     $result[$key]['end_time'] = date('Y-m-d H:i:s', $vo['end_time']);
+
+                    $date = explode(' ',$result[$key]['end_time']);
+                    $year = explode('-',$result[$key]['end_time']);
+                    if($date[0] == date('Y-m-d',time())){
+                        $result[$key]['end_time'] = '<span style="float: right;">'.$date[1].'</span>';
+                    }else if($date[0] == date('Y-m-d',strtotime("-1 day"))){
+                        $result[$key]['end_time'] = '<span style="float: right;">'.'昨天 '.$date[1].'</span>';
+                    }else{
+                        if($year[0] == date('Y',time())){
+                            $result[$key]['end_time'] = '<span style="float: right;">'.date('m-d H:i:s',strtotime($result[$key]['end_time'])).'</span>';
+                        }
+                    }
+
                 }else{
                     $result[$key]['end_time'] = '-';
                 }

application/admin/view/report/attendancereport.html

@@ -34,8 +34,9 @@
                     </div>
 
                     <div class="form-group">
-                        <div class="layui-input-inline">
-                            <select name="groupid" id="groupid" class="form-control">
+                        <div class="input-group col-sm-4 layui-form" style="width: 100px;">
+                            <input type="hidden" id="groupid" value="0"/>
+                            <select lay-verify="required" lay-filter="groupid">
                                 <option value="0" selected>所有分组</option>
                                 {volist name="groups" id="vo"}
                                 <option value="{$vo.id}">{$vo.name}</option>
@@ -44,6 +45,17 @@
                         </div>
                     </div>
 
+                    <!--<div class="form-group">-->
+                        <!--<div class="layui-input-inline">-->
+                            <!--<select name="groupid" id="groupid" class="form-control">-->
+                                <!--<option value="0" selected>所有分组</option>-->
+                                <!--{volist name="groups" id="vo"}-->
+                                <!--<option value="{$vo.id}">{$vo.name}</option>-->
+                                <!--{/volist}-->
+                            <!--</select>-->
+                        <!--</div>-->
+                    <!--</div>-->
+
                     <div class="form-group">
                         <button class="btn btn-primary" type="button" id="search"><strong>搜 索</strong>
                         </button>
@@ -89,6 +101,18 @@
 <script src="__JS__/plugins/bootstrap-table/bootstrap-table-mobile.min.js"></script>
 <script src="__JS__/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
 <script src="__JS__/layui/layui.all.js"></script>
+<script type="text/javascript">
+
+    layui.use(['form', 'upload'], function(){
+        var form = layui.form;
+
+        form.on('select(groupid)', function(value){
+            $("#groupid").val(value.value);
+            onSearch()
+        });
+    });
+
+</script>
 <script type="text/javascript">
     var ReturnRes;
 
@@ -123,6 +147,7 @@
                 var param = {
                     pageNumber: params.pageNumber,
                     pageSize: params.pageSize,
+                    groupid:$('#groupid').val(),
                     searchText: getSearch()
                 };
                 return param;

application/admin/view/settings/index.html

@@ -26,21 +26,21 @@
                 </div>
                 <div class="form-group" style="flex-wrap: wrap; display: flex">
                     <p style="width: 100%; margin-left: 20px; color: #9c9c9c; margin-bottom: 15px; font-size: 15px;">访客访问网站时，系统可以自动发起会话邀请，默认0秒为不邀请。</p>
-                    <label class="col-sm-3 control-label">访问停留：</label>
+                    <label class="col-sm-2 control-label">访问停留：</label>
                     <div class="input-group col-sm-1">
                         <input type="hidden" name="id" value="{$settings['id']}">
                         <input type="text" class="form-control" name="overtime" required="" aria-required="true" value="{$settings['stop_time']}">
                     </div>
-                    <label class="control-label" style="margin-left: 20px;">秒，</label>
+                    <label class="control-label" style="margin-left: 20px;">秒</label>
                 </div>
                 <div class="form-group" style="flex-wrap: wrap; display: flex">
-                    <label class="col-sm-3 control-label">发出邀请文案：</label>
+                    <label class="col-sm-2 control-label">发出邀请文案：</label>
                     <div class="input-group col-sm-8">
                         <input type="text" class="form-control" name="overtimeInfo" required="" aria-required="true" value="{$settings['copywriting']}">
                     </div>
                 </div>
                 <div class="form-group" style="margin-top: 40px;">
-                    <label class="col-sm-3 control-label"></label>
+                    <label class="col-sm-2 control-label"></label>
                     <div class="input-group col-sm-4">
                         <button class="btn btn-primary" type="submit">提交</button>
                     </div>
@@ -54,15 +54,15 @@
             <form class="form-horizontal m-t layui-form" id="marginForm" method="post" action="{:url('settings/margin')}">
                 <div class="form-group" style="flex-wrap: wrap; display: flex">
                     <p style="width: 100%; margin-left: 20px; color: #9c9c9c; margin-bottom: 15px; font-size: 15px;">访客端入口上边距设置</p>
-                    <label class="col-sm-3 control-label">上边距：</label>
+                    <label class="col-sm-2 control-label">上边距：</label>
                     <div class="input-group col-sm-1">
                         <input type="hidden" name="id" value="{$settings['id']}">
                         <input type="text" class="form-control" name="margin-top" required="" aria-required="true" value="{$settings['margin_top']}">
                     </div>
-                    <label class="control-label" style="margin-left: 20px;">px，</label>
+                    <label class="control-label" style="margin-left: 20px;">px</label>
                 </div>
                 <div class="form-group" style="margin-top: 40px;">
-                    <label class="col-sm-3 control-label"></label>
+                    <label class="col-sm-2 control-label"></label>
                     <div class="input-group col-sm-4">
                         <button class="btn btn-primary" type="submit">提交</button>
                     </div>

application/database.php

@@ -13,13 +13,13 @@ return [
     // 数据库类型
     'type'            => 'mysql',
     // 服务器地址
-    'hostname'        => '192.168.2.200',
+    'hostname'        => '192.168.2.220',
     // 数据库名
     'database'        => 'customer_service',
     // 用户名
-    'username'        => 'vali',
+    'username'        => 'ethan',
     // 密码
-    'password'        => '1234',
+    'password'        => 'ethan1234',
     // 端口
     'hostport'        => '3306',
     // 连接dsn