1

application/admin/controller/System.php

@@ -77,13 +77,14 @@ class System extends Base
             }
 
             if(!empty($start) && !empty($end) && $start <= $end){
-                $temp = $temp->whereBetween('time_line', [strtotime($start), strtotime($end . ' 23:59:59')]);
-                $countTmp = $countTmp->whereBetween('time_line', [strtotime($start), strtotime($end . ' 23:59:59')]);
+                $temp = $temp->whereBetween('start_time', [strtotime($start), strtotime($end . ' 23:59:59')]);
+                $countTmp = $countTmp->whereBetween('start_time', [strtotime($start), strtotime($end . ' 23:59:59')]);
             }
 
             $result = $temp->limit($offset, $limit)->order('id', 'desc')->select();
             foreach($result as $key=>$vo){
-                $result[$key]['time_line'] = date('Y-m-d H:i:s', $vo['time_line']);
+                $result[$key]['start_time'] = date('Y-m-d H:i:s', $vo['start_time']);
+                $result[$key]['end_time'] = date('Y-m-d H:i:s', $vo['time_line']);
             }
 
             $return['total'] = $countTmp->count();  //总数据

application/admin/view/system/wordslog.html

@@ -48,7 +48,8 @@
                         <th data-field="from_name">发送者</th>
                         <th data-field="to_name">接受者</th>
                         <th data-field="content">会话内容</th>
-                        <th data-field="time_line">会话时间</th>
+                        <th data-field="start_time">会话开始时间</th>
+                        <th data-field="start_time">会话时间</th>
                         </thead>
                     </table>
                 </div>

application/index/controller/User.php

@@ -65,7 +65,11 @@ class User extends Controller
             'password' => md5($newPassword . config('salt'))
         ];
 
-        db('accounts')->where('id', $user_id)->update($param);
+        try{
+            db('accounts')->where('id', $user_id)->update($param);
+        }catch(\Exception $e){
+            return json(['code' => -1, 'data' => '', 'msg' => $e->getMessage()]);
+        }
 
         return json(['code' => 1, 'data' => url('user/index'), 'msg' => '密码修改成功']);
 
@@ -80,6 +84,8 @@ class User extends Controller
             $email = input("param.email/s");
             $content = input("param.content/s");
             $phone = input("param.phone/s");
+            $qq = input("param.qq/s");
+            $wechat = input("param.wechat/s");
 
             $file = request()->file('file');
 
@@ -87,25 +93,33 @@ class User extends Controller
                 return json(['code' => -1, 'data' => '', 'msg' => '用户名称不能为空']);
             }
 
-            if(empty($email)){
-                return json(['code' => -2, 'data' => '', 'msg' => '邮箱不能为空']);
+//            if(empty($email)){
+//                return json(['code' => -2, 'data' => '', 'msg' => '邮箱不能为空']);
+//            }
+
+            if(empty($qq)){
+                return json(['code' => -3, 'data' => '', 'msg' => 'QQ不能为空']);
+            }
+
+            if(empty($wechat)){
+                return json(['code' => -4, 'data' => '', 'msg' => '微信不能为空']);
             }
 
             if(empty($content)){
-                return json(['code' => -3, 'data' => '', 'msg' => '内容不能为空']);
+                return json(['code' => -5, 'data' => '', 'msg' => '内容不能为空']);
             }
 
             if(empty($phone)){
-                return json(['code' => -4, 'data' => '', 'msg' => '电话不能为空']);
+                return json(['code' => -6, 'data' => '', 'msg' => '电话不能为空']);
             }
 
             if(empty($file)){
-                return json(['code' => -5, 'data' => '', 'msg' => '附件不能为空']);
+                return json(['code' => -7, 'data' => '', 'msg' => '附件不能为空']);
             }
             $fileInfo = $file->getInfo();
             /*if($fileInfo['size'] > 1024 * 1024 * 2){
                 // 上传失败获取错误信息
-                return json( ['code' => -6, 'data' => '', 'msg' => '文件超过2M'] );
+                return json( ['code' => -8, 'data' => '', 'msg' => '文件超过2M'] );
             }*/
 
             //检测图片格式
@@ -114,7 +128,7 @@ class User extends Controller
 
             $extArr = explode('|', 'jpg|png|gif|jpeg');
             if(!in_array($ext, $extArr)){
-                return json(['code' => -7, 'data' => '', 'msg' => '只能上传jpg|png|gif|jpeg的文件']);
+                return json(['code' => -9, 'data' => '', 'msg' => '只能上传jpg|png|gif|jpeg的文件']);
             }
 
             // 移动到框架应用根目录/public/uploads/ 目录下
@@ -123,7 +137,7 @@ class User extends Controller
                 $src =  '/uploads' . '/' . date('Ymd') . '/' . $info->getFilename();
             }else{
                 // 上传失败获取错误信息
-                return json(['code' => -8, 'data' => '', 'msg' => $file->getError()]);
+                return json(['code' => -10, 'data' => '', 'msg' => $file->getError()]);
             }
 
             $param = [
@@ -132,11 +146,17 @@ class User extends Controller
                 'content' => $content,
                 'image' => $src,
                 'phone' => $phone,
+                'qq' => $qq,
+                'wechat' => $wechat,
                 'message_status' => 0,
                 'add_time' => time()
             ];
 
-            db('accountsmessage')->insertGetId($param);
+            try{
+                db('accountsmessage')->insertGetId($param);
+            }catch(\Exception $e){
+                return json(['code' => -1, 'data' => '', 'msg' => $e->getMessage()]);
+            }
 
             return json(['code' => 1, 'data' => url('user/index'), 'msg' => '留言成功']);
         }

application/service/controller/Message.php

@@ -50,9 +50,14 @@ class Message extends Base
                 'message_status' => 1,
                 'dealWith_time' => time()
             ];
-            db('accountsmessage')->where('message_id', $message_id)->update($param);
 
-            return json(['code' => 1, 'data' => url('message/index'), 'msg' => '处理成功']);
+            try{
+                db('accountsmessage')->where('message_id', $message_id)->update($param);
+            }catch(\Exception $e){
+                return json(['code' => -1, 'data' => '', 'msg' => $e->getMessage()]);
+            }
+
+            return json(['code' => 1, 'data' => url('message/index'), 'msg' => '留言处理成功']);
         }
     }