dever 3 anni fa
parent
commit
66c7fc56d7
1 ha cambiato i file con 17 aggiunte e 24 eliminazioni
  1. 17 24
      src/Database.php

+ 17 - 24
src/Database.php

@@ -1207,30 +1207,6 @@ class Database
                 }
             }
 
-            if (isset($config['manage']['search']['day'])) {
-                foreach ($config['manage']['search']['day'] as $k => $v) {
-                    $this->list_search_time($result, $search, $prefix, $k, $v, 'day');
-                }
-            }
-
-            if (isset($config['manage']['search']['date'])) {
-                foreach ($config['manage']['search']['date'] as $k => $v) {
-                    $this->list_search_time($result, $search, $prefix, $k, $v, 'date');
-                }
-            }
-
-            if (isset($config['manage']['search']['year'])) {
-                foreach ($config['manage']['search']['year'] as $k => $v) {
-                    $this->list_search_time($result, $search, $prefix, $k, $v, 'year');
-                }
-            }
-
-            if (isset($config['manage']['search']['month'])) {
-                foreach ($config['manage']['search']['month'] as $k => $v) {
-                    $this->list_search_time($result, $search, $prefix, $k, $v, 'month');
-                }
-            }
-
             if (isset($config['manage']['search']['select'])) {
                 $this->list_search_br($result);
                 foreach ($config['manage']['search']['select'] as $k => $v) {
@@ -1431,6 +1407,23 @@ class Database
                 $result .= '<button class="btn btn-primary layui-btn layuiadmin-btn-list layui-btn-primary sdate_button '.$s3.'" onclick="setDate($(this), 30)" type="button" style="height: 38px;margin-right:20px;margin-top:-4px;">30日</button><style>.sdate_button_border{border-color: #009688;}</style>';
 
                 $result .= '<input type="hidden" name="search_option_sdate" id="search_option_sdate" value="0">';
+            } elseif (isset($config['manage']['search']['day'])) {
+                $result .= '<br />';
+                foreach ($config['manage']['search']['day'] as $k => $v) {
+                    $this->list_search_time($result, $search, $prefix, $k, $v, 'day');
+                }
+            } elseif (isset($config['manage']['search']['date'])) {
+                foreach ($config['manage']['search']['date'] as $k => $v) {
+                    $this->list_search_time($result, $search, $prefix, $k, $v, 'date');
+                }
+            } elseif (isset($config['manage']['search']['year'])) {
+                foreach ($config['manage']['search']['year'] as $k => $v) {
+                    $this->list_search_time($result, $search, $prefix, $k, $v, 'year');
+                }
+            } elseif (isset($config['manage']['search']['month'])) {
+                foreach ($config['manage']['search']['month'] as $k => $v) {
+                    $this->list_search_time($result, $search, $prefix, $k, $v, 'month');
+                }
             }
 
             # 列表页按钮