From 72653993c3d37d4ef4e737cf420f5229418015dd Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Tue, 28 Mar 2023 11:47:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=BC=80=E5=A7=8B=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9C=89=E8=AF=AF=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/activity/coupon/StoreCouponUserUserServices.php | 2 +- template/admin/src/pages/marketing/storeCouponUser/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crmeb/app/services/activity/coupon/StoreCouponUserUserServices.php b/crmeb/app/services/activity/coupon/StoreCouponUserUserServices.php index 5e856b673..50b35a3ae 100644 --- a/crmeb/app/services/activity/coupon/StoreCouponUserUserServices.php +++ b/crmeb/app/services/activity/coupon/StoreCouponUserUserServices.php @@ -45,7 +45,7 @@ class StoreCouponUserUserServices extends BaseServices [$page, $limit] = $this->getPageValue(); $list = $this->dao->sysPage($where, $page, $limit); foreach ($list as $k => &$v) { - $v['start_time'] = $v['add_time']; + $v['start_time'] = $v['start_time'] > 0 ? $v['start_time'] : $v['add_time']; if ($v['end_time'] < time() || $v['use_time'] != 0) $v['is_fail'] = 1; } $count = $this->dao->sysCount($where); diff --git a/template/admin/src/pages/marketing/storeCouponUser/index.vue b/template/admin/src/pages/marketing/storeCouponUser/index.vue index f22cfad97..cda0ffae3 100644 --- a/template/admin/src/pages/marketing/storeCouponUser/index.vue +++ b/template/admin/src/pages/marketing/storeCouponUser/index.vue @@ -42,7 +42,7 @@