diff --git a/client/components/Search/BaseList.js b/client/components/Search/BaseList.js index 420f2df..ffc1555 100644 --- a/client/components/Search/BaseList.js +++ b/client/components/Search/BaseList.js @@ -407,8 +407,9 @@ export default class BaseList { //date let dateFound = !s.date; if (!dateFound) { - const date = this.queryDate(s.date.split(',')); + const date = this.queryDate(s.date).split(','); let [from = '0000-00-00', to = '9999-99-99'] = date; + dateFound = (book.date >= from && book.date <= to); } @@ -471,7 +472,7 @@ export default class BaseList { } queryDate(date) { - if (!(utils.isDigit(date[0]) && utils.isDigit(date[1]))) {//!manual + if (!utils.isManualDate(date)) {//!manual /* {label: 'сегодня', value: 'today'}, {label: 'за 3 дня', value: '3days'}, diff --git a/client/components/Search/Search.vue b/client/components/Search/Search.vue index d92e151..f512e30 100644 --- a/client/components/Search/Search.vue +++ b/client/components/Search/Search.vue @@ -971,18 +971,14 @@ class Search { } } - isManualDate(date) { - return date && utils.isDigit(date[0]) && utils.isDigit(date[1]); - } - updateSearchDate(toLocal) { if (toLocal) { let local = this.search.date || ''; - if (this.isManualDate(local) || !local) + if (utils.isManualDate(local) || !local) this.prevManualDate = local; - if (this.isManualDate(local)) + if (utils.isManualDate(local)) local = 'manual'; this.searchDate = local; @@ -995,7 +991,7 @@ class Search { get formatSearchDate() { const result = []; const date = this.search.date; - if (this.isManualDate(date)) { + if (utils.isManualDate(date)) { const [from, to] = date.split(',') if (from) result.push(`