From 2b6aa0497c9c535defc02ba78e30103c06ff1c52 Mon Sep 17 00:00:00 2001 From: denghy Date: Fri, 12 Apr 2019 19:59:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Domains/Virtual/Services/CardService.php | 4 ++-- frontend/src/views/virtual/cards/index.vue | 2 +- frontend/src/views/virtual/cards/js/index.js | 4 ++-- public/js/app.1267cf46.js | 1 + public/js/app.2d02cf26.js | 1 + public/js/chunk-4443c580.99320ef2.js | 14 ++++++++++++++ public/js/chunk-4443c580.c551493b.js | 14 ++++++++++++++ resources/views/index.blade.php | 2 +- 8 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 public/js/app.1267cf46.js create mode 100644 public/js/app.2d02cf26.js create mode 100644 public/js/chunk-4443c580.99320ef2.js create mode 100644 public/js/chunk-4443c580.c551493b.js diff --git a/app/Domains/Virtual/Services/CardService.php b/app/Domains/Virtual/Services/CardService.php index eb84b14b..4ba9de79 100644 --- a/app/Domains/Virtual/Services/CardService.php +++ b/app/Domains/Virtual/Services/CardService.php @@ -124,7 +124,7 @@ class CardService extends Service return 4; } - if (strtotime($card['service_end_at']) < time()) { + if ($card['service_end_at'] && strtotime($card['service_end_at']) < time()) { return 3; } @@ -136,6 +136,6 @@ class CardService extends Service return 1; } - return 0; + return 1; } } diff --git a/frontend/src/views/virtual/cards/index.vue b/frontend/src/views/virtual/cards/index.vue index 125c5128..2157b1d1 100644 --- a/frontend/src/views/virtual/cards/index.vue +++ b/frontend/src/views/virtual/cards/index.vue @@ -86,7 +86,7 @@