vali 6 年之前
父節點
當前提交
e3be6170fe
共有 2 個文件被更改,包括 43 次插入37 次删除
  1. 37 36
      application/admin/controller/Kfnotice.php
  2. 6 1
      application/admin/view/kfnotice/add.html

+ 37 - 36
application/admin/controller/Kfnotice.php

@@ -74,15 +74,15 @@ class Kfnotice extends Base
 
             //管理员
             $admins = db('admins')->select();
-            $adminKey = [] ;
-            foreach ($admins as $nowadmin){
+            $adminKey = [];
+            foreach ($admins as $nowadmin) {
                 $adminKey[$nowadmin['id']] = $nowadmin;
             }
 
             //客服
             $users = db('users')->select();
-            $userKey = [] ;
-            foreach ($users as $nowuser){
+            $userKey = [];
+            foreach ($users as $nowuser) {
                 $userKey[$nowuser['id']] = $nowuser;
             }
 
@@ -91,44 +91,44 @@ class Kfnotice extends Base
                 $vo->readtime = empty($vo->readtime) ? '' : date('Y-m-d H:i:s', $vo->readtime);
                 $vo->sendtype = $vo->sendtype == 1 ? '即时发送' : '预约发送';
                 $result[$key] = array_merge($vo->toArray(), ['operate' => $this->makeBtn($vo->id)]);
-                $result[$key]['admin_name'] =  isset($adminKey[$vo['admin_id']]) ? $adminKey[$vo['admin_id']]['user_name'] : '-err' ;
+                $result[$key]['admin_name'] = isset($adminKey[$vo['admin_id']]) ? $adminKey[$vo['admin_id']]['user_name'] : '-err';
 
-                $result[$key]['user_name'] =  isset($userKey[$vo['uid']]) ? $userKey[$vo['uid']]['user_name'] : $result[$key]['uid'] ;
+                $result[$key]['user_name'] = isset($userKey[$vo['uid']]) ? $userKey[$vo['uid']]['user_name'] : $result[$key]['uid'];
 
 
-                $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->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->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>';
+                $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>';
                     }
                 }
             }
@@ -160,8 +160,8 @@ class Kfnotice extends Base
 
         if (request()->isPost()) {
 
-            $atext = input('post.atext');
-            $title = input('post.title', 0);
+            $atext = trim(input('post.atext'));
+            $title = trim(input('post.title', 0));
             $group = intval(input('post.groupid', 0));
 
 
@@ -175,7 +175,8 @@ class Kfnotice extends Base
             }
             $sendtype = (strtotime($sendtime) >= (time() + 60)) ? 2 : 1;
             if (strtotime($sendtime) < time()) {
-                return json(['code' => -1, 'data' => '', 'msg' => '时间不能小于当前时间!']);
+                $sendtime = date("Y-m-d H:i:s", time() + 10);
+                //return json(['code' => -1, 'data' => '', 'msg' => '时间不能小于当前时间!']);
             }
 
 

+ 6 - 1
application/admin/view/kfnotice/add.html

@@ -126,7 +126,12 @@
                     });
                 } else {
                     var index = parent.layer.getFrameIndex(window.name);
-                    parent.layer.close(index);
+                    //alert("公告添加成功");
+                    //parent.layer.close(index);
+                    layer.msg("公告添加成功");
+                    setTimeout(function () {
+                        parent.layer.close(index)
+                    }, 1500);
                 }
             } else if (111 == res.code) {
                 window.location.reload();