Jonlin 6 년 전
부모
커밋
a1803cb9be

+ 33 - 15
application/admin/controller/Messages.php

@@ -17,17 +17,23 @@ class Messages extends Base
             $param  = input('param.');
             $limit  = $param['pageSize'];
             $offset = ($param['pageNumber'] - 1) * $limit;
+
             $where  = [];
             if (empty($param['searchText']) === false) {
                 $where['account_name'] = $param['searchText'];
             }
-            $join   = [
-                'accounts b'      => 'a.account_id = b.id',
-            ];
+            $start = '';$end = '';
+            if (empty($param['start']) === false && empty($param['end']) === false && $param['start'] <= $param['end']) {
+                $start = strtotime($param['start']);
+                $end = strtotime($param['end'] . ' 23:59:59');
+            }
+//            $join   = [
+//                'accounts b'      => 'a.account_id = b.id',
+//            ];
             $leftjoin   = [
                 'users c'      => 'a.user_id = c.id',
             ];
-            $result = model('Accountsmessage')->selectJoin($join,$leftjoin,$where, $offset, $limit);
+            $result = model('Accountsmessage')->selectJoin($leftjoin,$where, $start,$end,$offset, $limit);
             foreach($result as $key=>$vo){
                 // 优化显示附件
                 $result[$key]['image'] = '<img src="' . $vo['image'] . '" width="40px" height="40px">';
@@ -51,7 +57,8 @@ class Messages extends Base
                 $result[$key]['operate'] = $this->makeBtn($vo['message_id']);
             }
 
-            $return['total'] = db('Accountsmessage')->count();  //总数据
+            //$return['total'] = db('Accountsmessage')->count();  //总数据
+            $return['total'] = count($result);  //总数据
             $return['rows'] = $result;
 
             return json($return);
@@ -64,27 +71,38 @@ class Messages extends Base
     // 留言详情
     public function detail()
     {
-
+        if(request()->isAjax()) {
+            //设置留言公开/不公开
+            $param = input('post.');
+            $id = $param['id'];
+            $if_public = $param['if_public'];
+            try{
+                db('accountsmessage')->where('message_id', $id)->update(['if_public' => $if_public]);
+            }catch(\Exception $e){
+                return json(['code' => -1, 'data' => '', 'msg' => $e->getMessage()]);
+            }
+            return json(['code' => 1, 'data' => url('messages/index'), 'msg' => '设置成功']);
+        }
         $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_email'] = $account['account_email'];
+        //$info['account_name'] = $account['account_name'];
+        //$info['account_email'] = $account['account_email'];
         $info['user_name'] = $user['user_name'];
 
         // 优化时间
-        if(null != $info['add_time']){
-            $info['add_time'] = date('Y-m-d H:m:s',$info['add_time']);
+        if (null != $info['add_time']) {
+            $info['add_time'] = date('Y-m-d H:m:s', $info['add_time']);
         }
-        if(null != $info['dealWith_time']){
-            $info['dealWith_time'] = date('Y-m-d H:m:s',$info['dealWith_time']);
+        if (null != $info['dealWith_time']) {
+            $info['dealWith_time'] = date('Y-m-d H:m:s', $info['dealWith_time']);
         }
 
         // 优化显示状态
-        if(1 == $info['message_status']){
+        if (1 == $info['message_status']) {
             $info['message_status'] = '已处理';
-        }else{
+        } else {
             $info['message_status'] = '未处理';
         }
 

+ 15 - 9
application/admin/model/Accountsmessage.php

@@ -11,24 +11,27 @@ class Accountsmessage extends Model
      * select数据筛选
      *
      * @access public
-     * @param mixed $join 关联
+     * @param mixed $leftjoin 关联
      * @param mixed $where 条件
+     * @param mixed $start 开始时间
+     * @param mixed $end 结束时间
      * @param mixed $offset 分页开始
      * @param mixed $limit 分页大小
      * @param mixed $order 排序
      * @return array 返回类型
      */
-    public function selectJoin($join,$leftjoin, $where=[], $offset='', $limit='', $order=['a.message_id'=>'desc'])
+    public function selectJoin($leftjoin, $where=[],$start,$end, $offset='', $limit='', $order=['a.message_id'=>'desc'])
     {
         $result = $this;
-        if (empty($join) === false) {
-            $result = $result->alias('a');
-            foreach ($join as $k => $v) {
-                $result = $result->join($k, $v);
-            }
-        }
+//        if (empty($join) === false) {
+//            $result = $result->alias('a');
+//            foreach ($join as $k => $v) {
+//                $result = $result->join($k, $v);
+//            }
+//        }
 
         if (empty($leftjoin) === false) {
+            $result = $result->alias('a');
             foreach ($leftjoin as $k => $v) {
                 $result = $result->join('users c', 'a.user_id = c.id','LEFT');
             }
@@ -38,6 +41,10 @@ class Accountsmessage extends Model
             $result = $result->where($where);
         }
 
+        if (empty($start) === false && empty($end) === false) {
+            $result = $result->whereBetween('add_time', [$start, $end]);
+        }
+
         //if (empty($offset) === false && empty($limit) === false) {
             $result = $result->limit($offset, $limit);
         //}
@@ -48,7 +55,6 @@ class Accountsmessage extends Model
             }
         }
 
-        //$result = $result->field('a.id','b.user_name','b.user_name')->select();
         $result = $result->select();
         return $result;
 

+ 19 - 15
application/admin/view/messages/detail.html

@@ -20,24 +20,24 @@
                     <h5>留言详情</h5>
                 </div>
                 <div class="ibox-content">
-                    <form class="form-horizontal m-t layui-form" id="commentForm" method="post" action="{:url('users/edituser')}">
+                    <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>
                             <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="name" type="text" class="form-control" name="name" required="" aria-required="true" value="{$info['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="add_time" type="text" class="form-control" name="user_name" required="" aria-required="true" value="{$info['add_time']}">
+                                <input id="add_time" type="text" class="form-control" name="user_name" required="" aria-required="true" value="{$info['add_time']}" 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="content" type="text" class="form-control" name="user_pwd" value="{$info['content']}">
+                                <input id="content" type="text" class="form-control" name="user_pwd" value="{$info['content']}" readonly="readonly">
                             </div>
                         </div>
                         <div class="form-group layui-form-item form-inline" style="height: 60px;">
@@ -51,38 +51,45 @@
                         <div class="form-group">
                             <label class="col-sm-3 control-label">手机:</label>
                             <div class="input-group col-sm-4">
-                                <input id="phone" type="text" class="form-control" name="user_pwd" value="{$info['phone']}">
+                                <input id="phone" type="text" class="form-control" name="user_pwd" value="{$info['phone']}" 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="account_email" type="text" class="form-control" name="account_email" value="{$info['account_email']}">
+                                <input id="email" type="text" class="form-control" name="email" value="{$info['email']}" 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="message_status" type="text" class="form-control" name="user_pwd" value="{$info['message_status']}">
+                                <input id="message_status" type="text" class="form-control" name="user_pwd" value="{$info['message_status']}" 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="user_name" type="text" class="form-control" name="user_pwd" value="{$info['user_name']}">
+                                <input id="user_name" type="text" class="form-control" name="user_pwd" value="{$info['user_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="dealWith_time" type="text" class="form-control" name="user_pwd" value="{$info['dealWith_time']}">
+                                <input id="dealWith_time" type="text" class="form-control" name="user_pwd" value="{$info['dealWith_time']}" 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="no_public" type="radio" class="form-control" name="if_public" value="0" {$info['if_public']==0?'checked':''} title="不公开">
+                                <input id="public" type="radio" class="form-control" name="if_public" value="1" {$info['if_public']==1?'checked':''} title="公开">
                             </div>
                         </div>
 
                         <div class="form-group">
-                            <div class="col-sm-4 col-sm-offset-6" style="margin-left: 30%;">
-                                <!--<button class="btn btn-primary" type="button" id="button">返回</button>-->
-                                <a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;">返回</a>
+                            <div class="col-sm-4 col-sm-offset-6" style="margin-left: 25%;">
+                                <a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;margin-bottom: 5px;height: 35px;line-height: 35px;">返回</a>
+                                <button class="btn btn-primary" type="submit" id="button" style="margin-left: 10%;">提交</button>
                             </div>
                         </div>
                     </form>
@@ -101,9 +108,6 @@
 <script src="__JS__/layui/layui.js"></script>
 <script src="__JS__/jquery.form.js"></script>
 <script type="text/javascript">
-//    $('#button').click(function(){
-//        console.log(1);
-//    });
 
     layui.use(['form', 'upload'], function(){
         var form = layui.form;

+ 35 - 3
application/admin/view/messages/index.html

@@ -22,6 +22,12 @@
             <!--搜索框开始-->
             <form id='commentForm' role="form" method="post" class="form-inline pull-right">
                 <div class="content clearfix m-b">
+                    <div class="form-group">
+                        <label>留言日期:</label>
+                        <input type="text" class="form-control" id="start" placeholder="开始日期"> --
+                        <input type="text" class="form-control" id="end" placeholder="结束日期">
+                    </div>
+                    &nbsp;&nbsp;
                     <div class="form-group">
                         <label>用户名称:</label>
                         <input type="text" class="form-control" id="username" name="user_name">
@@ -37,7 +43,7 @@
                 <div class="example">
                     <table id="cusTable">
                         <thead>
-                        <th class="user_name" id="user_name" data-field="account_name">用户名称</th>
+                        <th class="user_name" id="user_name" data-field="name">用户名称</th>
                         <th class="add_time" id="add_time" data-field="add_time">留言时间</th>
                         <th data-field="content">内容</th>
                         <th data-field="image">附件</th>
@@ -63,6 +69,7 @@
 <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__/plugins/layer/layer.min.js"></script>
+<script src="__JS__/layui/layui.js"></script>
 <script type="text/javascript">
     function initTable() {
         //先销毁表格
@@ -86,7 +93,9 @@
                 var param = {
                     pageNumber: params.pageNumber,
                     pageSize: params.pageSize,
-                    searchText:$('#username').val()
+                    searchText:$('#username').val(),
+                    start:$('#start').val(),
+                    end:$('#end').val()
                 };
                 return param;
             },
@@ -107,7 +116,17 @@
         initTable();
 
         //当点击查询按钮的时候执行
-        $("#search").bind("click", initTable);
+        $("#search").bind("click", function(){
+            var start = $('#start').val();
+            var end = $('#end').val();
+            if(start > end){
+                layer.msg('开始时间不能大于结束时间');
+                return false;
+            }
+
+            initTable();
+        });
+
     });
 
     function userDel(id){
@@ -129,6 +148,19 @@
         })
 
     }
+
+    layui.use('laydate', function(){
+        var laydate = layui.laydate;
+        laydate.render({
+            elem: '#start'
+            ,type: 'date'
+        });
+
+        laydate.render({
+            elem: '#end'
+            ,type: 'date'
+        });
+    });
 </script>
 </body>
 </html>

+ 18 - 15
application/index/controller/User.php

@@ -74,34 +74,38 @@ class User extends Controller
     // 用户留言
     public function LeavingMessage()
     {
-        $token = input("param.token/s");
-        $res = model('Accounts')->checktoken($token);
-        if($res == -1){
-            return $res;
-        }
-        $user_id = explode('/',base64_decode($token))['2'];
 
         if(request()->isPost()){
+            $name = input("param.name/s");
+            $email = input("param.email/s");
             $content = input("param.content/s");
             $phone = input("param.phone/s");
 
             $file = request()->file('file');
 
+            if(empty($name)){
+                return json(['code' => -1, 'data' => '', 'msg' => '用户名称不能为空']);
+            }
+
+            if(empty($email)){
+                return json(['code' => -2, 'data' => '', 'msg' => '邮箱不能为空']);
+            }
+
             if(empty($content)){
-                return json(['code' => -1, 'data' => '', 'msg' => '内容不能为空']);
+                return json(['code' => -3, 'data' => '', 'msg' => '内容不能为空']);
             }
 
             if(empty($phone)){
-                return json(['code' => -2, 'data' => '', 'msg' => '电话不能为空']);
+                return json(['code' => -4, 'data' => '', 'msg' => '电话不能为空']);
             }
 
             if(empty($file)){
-                return json(['code' => -3, 'data' => '', 'msg' => '附件不能为空']);
+                return json(['code' => -5, 'data' => '', 'msg' => '附件不能为空']);
             }
             $fileInfo = $file->getInfo();
             /*if($fileInfo['size'] > 1024 * 1024 * 2){
                 // 上传失败获取错误信息
-                return json( ['code' => -2, 'data' => '', 'msg' => '文件超过2M'] );
+                return json( ['code' => -6, 'data' => '', 'msg' => '文件超过2M'] );
             }*/
 
             //检测图片格式
@@ -110,7 +114,7 @@ class User extends Controller
 
             $extArr = explode('|', 'jpg|png|gif|jpeg');
             if(!in_array($ext, $extArr)){
-                return json(['code' => -3, 'data' => '', 'msg' => '只能上传jpg|png|gif|jpeg的文件']);
+                return json(['code' => -7, 'data' => '', 'msg' => '只能上传jpg|png|gif|jpeg的文件']);
             }
 
             // 移动到框架应用根目录/public/uploads/ 目录下
@@ -119,11 +123,12 @@ class User extends Controller
                 $src =  '/uploads' . '/' . date('Ymd') . '/' . $info->getFilename();
             }else{
                 // 上传失败获取错误信息
-                return json(['code' => -1, 'data' => '', 'msg' => $file->getError()]);
+                return json(['code' => -8, 'data' => '', 'msg' => $file->getError()]);
             }
 
             $param = [
-                'account_id' => $user_id,
+                'name' => $name,
+                'email' => $email,
                 'content' => $content,
                 'image' => $src,
                 'phone' => $phone,
@@ -136,8 +141,6 @@ class User extends Controller
             return json(['code' => 1, 'data' => url('user/index'), 'msg' => '留言成功']);
         }
 
-
-
     }
 
 }

+ 18 - 4
application/service/controller/Message.php

@@ -5,8 +5,20 @@ class Message extends Base
 {
     public function index()
     {
-        // 留言信息
-        $message = db('accountsmessage')->join('accounts','accounts.id=ws_accountsmessage.account_id')->where('message_status', 0)->select();
+        // 留言信息(默认查询前七天的留言)
+        $start = time()-604800;
+        $end = time();
+        if(request()->isPost()){
+            $start_time = input("param.start_time/s");
+            $end_time = input("param.end_time/s");
+            if(!empty($start_time)){
+                $start = strtotime($start_time);
+            }
+            if(!empty($end_time)){
+                $end = strtotime($end_time . ' 23:59:59');
+            }
+        }
+        $message = db('accountsmessage')->whereBetween('add_time', [$start, $end])->select();
         //print_r($message);
         $this->assign([
             'message' => $message,
@@ -21,9 +33,11 @@ class Message extends Base
         if(request()->isPost()){
 
             //客服id
-            $user_id = 2;
+            //$user_id = 2;
+            $user_id = input("param.user_id/s");
             //留言id
-            $message_id = 14;
+            //$message_id = 14;
+            $message_id = input("param.message_id/s");
 
             $user = db('users')->where('id', $user_id)->find();
             if(empty($user)){