1

application/admin/controller/Material.php

@@ -184,6 +184,22 @@ class Material extends Base
 
             $file = request()->file('file');
             if (!empty($file)) {
+
+                $fileInfo = $file->getInfo();
+                //return $fileInfo;
+                if ($fileInfo['size'] > 1024 * 512 * 2) {
+                    // 上传失败获取错误信息.
+                    return json(['code' => -2, 'data' => '', 'msg' => '文件超过0.5M'] );
+                }
+
+                //检测图片格式
+                $ext = explode('/', $fileInfo['type']);
+                $ext = array_pop($ext);
+                $extArr = explode('|', 'jpg|png|gif|jpeg');
+                if(!in_array($ext, $extArr)){
+                    return json(['code' => -3, 'data' => '', 'msg' => '只能上传jpg|png|gif|jpeg的文件']);
+                }
+
                 // 移动到框架应用根目录/public/uploads/ 目录下
                 $info = $file->move(ROOT_PATH . 'public' . DS . 'static/material/');
                 if ($info) {

application/admin/controller/Messages.php

@@ -20,10 +20,10 @@ class Messages extends Base
 
             $where  = [];
             $orwhere  = [];
-            //用户名称
+            //用户昵称
             if (strlen($param['searchText'])) {
-                $where['a.name'] = array('like','%'.$param['searchText'].'%');
-                $orwhere['name'] = array('like','%'.$param['searchText'].'%');
+                $where['a.nick_name'] = array('like','%'.$param['searchText'].'%');
+                $orwhere['nick_name'] = array('like','%'.$param['searchText'].'%');
             }
             //处理客服id
             if (empty($param['user_id']) === false) {
@@ -58,6 +58,7 @@ class Messages extends Base
                 'users c'      => 'a.user_id = c.id',
             ];
             $result = model('Accountsmessage')->selectJoin($join,$leftjoin,$where, $start,$end,$offset, $limit);
+            $accounts = db('accounts')->select();
             foreach($result as $key=>$vo){
 
                 if(!empty($result[$key]['image'])){
@@ -78,6 +79,19 @@ class Messages extends Base
                 if(null != $vo['add_time']){
                     $result[$key]['add_time'] = date('Y-m-d H:m:s',$result[$key]['add_time']);
                 }
+
+                $date = explode(' ',$result[$key]['add_time']);
+                $year = explode('-',$result[$key]['add_time']);
+                if($date[0] == date('Y-m-d',time())){
+                    $result[$key]['add_time'] = '<span style="float: right;">'.$date[1].'</span>';
+                }else if($date[0] == date('Y-m-d',strtotime("-1 day"))){
+                    $result[$key]['add_time'] = '<span style="float: right;">'.'昨天 '.$date[1].'</span>';
+                }else{
+                    if($year[0] == date('Y',time())){
+                        $result[$key]['add_time'] = '<span style="float: right;">'.date('m-d H:i:s',strtotime($result[$key]['add_time'])).'</span>';
+                    }
+                }
+
                 if(null != $vo['dealWith_time']){
                     $result[$key]['dealWith_time'] = date('Y-m-d H:m:s',$result[$key]['dealWith_time']);
                 }
@@ -97,6 +111,12 @@ class Messages extends Base
                 }
                 // 生成操作按钮
                 $result[$key]['operate'] = $this->makeBtn($vo['message_id']);
+
+                for($i=0;$i<count($accounts);$i++){
+                    if($result[$key]['account_id'] == $accounts[$i]['id']){
+                        $result[$key]['account_name'] = $accounts[$i]['account_name'];
+                    }
+                }
             }
 
             //$return['total'] = db('Accountsmessage')->where($orwhere)->count();  //总数据
@@ -163,16 +183,28 @@ class Messages extends Base
         }
         $id = input('param.id/d');
         $info = db('Accountsmessage')->where('message_id', $id)->find();
-        //$account = db('Accounts')->where('id', $info['account_id'])->find();
+        $account = db('Accounts')->where('id', $info['account_id'])->find();
         $user = db('Users')->where('id', $info['user_id'])->find();
-        //$info['account_name'] = $account['account_name'];
+        $info['account_name'] = $account['account_name'];
         //$info['account_email'] = $account['account_email'];
         $info['user_name'] = $user['user_name'];
 
         $messagetype = db('messagetype')->select();
 
-        // 优化显示附件
-        $images = $info['image'];
+        // 优化显示留言图片
+        $image = $info['image'];
+        //转换成数组格式
+        $image = explode(",", $image);
+        if(!empty($image)){
+            $img = '';
+            for($i=0;$i<count($image);$i++){
+                $img = $img.'<img src="'.$image[$i].'" width="240px" style="margin-top:20px;">';
+            }
+            $info['image'] = $img;
+        }
+
+        // 优化显示回复图片
+        $images = $info['images'];
         //转换成数组格式
         $images = explode(",", $images);
         if(!empty($images)){
@@ -180,7 +212,7 @@ class Messages extends Base
             for($i=0;$i<count($images);$i++){
                 $img = $img.'<img src="'.$images[$i].'" width="240px" style="margin-top:20px;">';
             }
-            $info['image'] = $img;
+            $info['images'] = $img;
         }
 
         // 优化时间

application/admin/model/Accountsmessage.php

@@ -24,7 +24,7 @@ class Accountsmessage extends Model
     {
         $result = $this;
         $result = $result->alias('a');
-        $result = $result->field('a.message_id,a.name,a.email,a.content,a.add_time,a.message_status,a.user_id,a.dealWith_time,a.image,a.phone,a.qq,a.wechat,a.if_public,a.reply_content,b.name as type_name,c.user_name');
+        $result = $result->field('a.message_id,a.account_id,a.nick_name,a.email,a.content,a.add_time,a.message_status,a.user_id,a.dealWith_time,a.image,a.phone,a.qq,a.wechat,a.if_public,a.reply_content,b.name as type_name,c.user_name');
         if (empty($join) === false) {
             foreach ($join as $k => $v) {
                 $result = $result->join($k, $v,'LEFT');

application/admin/view/messages/detail.html

@@ -23,9 +23,15 @@
                     <form class="form-horizontal m-t layui-form" id="commentForm" method="post" action="{:url('Messages/detail')}">
                         <input type="hidden" value="{$info['message_id']}" name="id"/>
                         <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="name" type="text" class="form-control" name="name" required="" aria-required="true" value="{$info['name']}" readonly="readonly">
+                                <input id="account_name" type="text" class="form-control" name="name" required="" aria-required="true" value="{$info['account_name']}" readonly="readonly">
+                            </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="name" required="" aria-required="true" value="{$info['nick_name']}" readonly="readonly">
                             </div>
                         </div>
                         <div class="form-group">
@@ -42,7 +48,7 @@
                         </div>
                         <div class="form-group layui-form-item form-inline" style="">
                             <input type="hidden" name="user_avatar" id="user_avatar"/>
-                            <label class="col-sm-3 control-label">附件：</label>
+                            <label class="col-sm-3 control-label">留言图片：</label>
 
                             <div class="input-group col-sm-3" id="avatar">
                                 {$info['image']}
@@ -78,6 +84,14 @@
                                 <input id="reply_content" type="text" class="form-control" name="reply_content" value="{$info['reply_content']}" readonly="readonly">
                             </div>
                         </div>
+                        <div class="form-group layui-form-item form-inline" style="">
+                            <input type="hidden" name="user_avatar" id=""/>
+                            <label class="col-sm-3 control-label">回复图片：</label>
+
+                            <div class="input-group col-sm-3" id="">
+                                {$info['images']}
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label class="col-sm-3 control-label">处理时间：</label>
                             <div class="input-group col-sm-4">

application/admin/view/messages/index.html

@@ -71,7 +71,7 @@
                         </div>
                     </div>
                     <div class="form-group" style="margin-left: 10px;">
-                        <label>用户名称:</label>
+                        <label>昵称:</label>
                         <input type="text" class="form-control" id="username" name="user_name" style="width: 100px;height: 30px;">
                     </div>
                     <div class="form-group">
@@ -85,14 +85,15 @@
                 <div class="example">
                     <table id="cusTable">
                         <thead>
-                        <th class="user_name" id="user_name" data-field="name">用户名称</th>
-                        <th style="width: 100px" class="add_time" id="add_time" data-field="add_time">留言时间</th>
+                        <th data-field="account_name">用户账号</th>
+                        <th data-field="nick_name">昵称</th>
+                        <th data-field="add_time">留言时间</th>
                         <th data-field="content">留言内容</th>
-                        <th data-field="image">附件</th>
+                        <!--<th data-field="image">附件</th>-->
                         <th data-field="phone">手机</th>
                         <th data-field="email">邮箱</th>
-                        <th data-field="qq">QQ</th>
-                        <th data-field="wechat">微信</th>
+                        <!--<th data-field="qq">QQ</th>-->
+                        <!--<th data-field="wechat">微信</th>-->
                         <th data-field="status">当前状态</th>
                         <th data-field="user_name">处理人</th>
                         <th data-field="reply_content">回复内容</th>

application/index/controller/User.php

@@ -109,9 +109,9 @@ class User extends Controller
 //                return json(['code' => -4, 'data' => '', 'msg' => '微信不能为空']);
 //            }
 
-            if(empty($content)){
-                return json(['code' => -5, 'data' => '', 'msg' => '内容不能为空']);
-            }
+//            if(empty($content)){
+//                return json(['code' => -5, 'data' => '', 'msg' => '内容不能为空']);
+//            }
 
 //            if(empty($phone)){
 //                return json(['code' => -6, 'data' => '', 'msg' => '电话不能为空']);

application/service/controller/Message.php

@@ -11,6 +11,8 @@ class Message extends Base
         if(request()->isPost()){
             $start_time = input("param.start_time/s");
             $end_time = input("param.end_time/s");
+            $limit  = input("param.pageSize/s");
+            $offset = (input("param.pageNumber/s") - 1) * $limit;
             if(!empty($start_time)){
                 $start = strtotime($start_time);
             }
@@ -18,14 +20,14 @@ class Message extends Base
                 $end = strtotime($end_time . ' 23:59:59');
             }
         }
-        $message = db('accountsmessage')->whereBetween('add_time', [$start, $end])->select();
-//        foreach($message as $key=>$vo){
-//            //转为日期时间格式
-//            $message[$key]['add_time'] = date('Y-m-d H:i:s',$vo['add_time']);
-//            if(!empty($vo['dealWith_time'])){
-//                $message[$key]['dealWith_time'] = date('Y-m-d H:i:s',$vo['dealWith_time']);
-//            }
-//        }
+        $message = db('accountsmessage')->whereBetween('add_time', [$start, $end])->limit($offset, $limit)->order('add_time', 'desc')->select();
+        foreach($message as $key=>$vo){
+            //转为日期时间格式
+            $message[$key]['add_time'] = date('Y-m-d H:i:s',$vo['add_time']);
+            if(!empty($vo['dealWith_time'])){
+                $message[$key]['dealWith_time'] = date('Y-m-d H:i:s',$vo['dealWith_time']);
+            }
+        }
 
         $data = [
             'status'=>1,
@@ -49,6 +51,8 @@ class Message extends Base
             $message_id = input("param.message_id/s");
             //回复内容
             $reply_content = input("param.reply_content/s");
+            //回复图片
+            $images = input("param.images/s");
 
             $user = db('users')->where('id', $user_id)->find();
             if(empty($user)){
@@ -64,6 +68,7 @@ class Message extends Base
                 'user_id' => $user_id,
                 'message_status' => 1,
                 'reply_content' => $reply_content,
+                'images' => $images,
                 'dealWith_time' => time()
             ];