Browse Source

完善功能

gorden 10 months ago
parent
commit
d085d53016

+ 3 - 3
app/admin/controller/client/MessageController.php

@@ -66,8 +66,8 @@ class MessageController extends Curd
     {
         $data = $this->inputFilter($request->post());
 
-        if (!empty($data['client_message_datetimes'])) {
-            $data['client_message_datetimes'] = date('Y-m-d H:i:s', strtotime($data['client_message_datetimes']));
+        if (!empty($data['client_message_sendtime'])) {
+            $data['client_message_sendtime'] = date('Y-m-d H:i:s', strtotime($data['client_message_sendtime']));
         }
         if (!empty($data['client_message_header_json']) && !is_json($data['client_message_header_json'])) {
             $data['client_message_header_json'] = json_encode(['header' => $data['client_message_header_json']]);
@@ -89,7 +89,7 @@ class MessageController extends Curd
         }
 
         if (!empty($data['client_message_datetimes'])) {
-            $data['client_message_datetimes'] = date('Y-m-d H:i:s', strtotime($data['client_message_datetimes']));
+            $data['client_message_sendtime'] = date('Y-m-d H:i:s', strtotime($data['client_message_sendtime']));
         }
         if (!empty($data['client_message_header_json']) && !is_json($data['client_message_header_json'])) {
             $data['client_message_header_json'] = json_encode(['header' => $data['client_message_header_json']]);

+ 2 - 1
app/admin/controller/sys_manage/MenuController.php

@@ -274,7 +274,8 @@ class MenuController extends Curd
         $format = $request->get('format', 'tree');
         $order = $request->get('order', 'desc');
         $field = $field ?? 'menu_sort';
-        $where['menu_is_show'] = 1;
+//        $where['menu_is_show'] = 1;
+        $where['menu_status'] = 1;
         $limit = 1000;
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);