From 68215280bd137d81ffaca6a34d25b50bb8fcdc83 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GG6FIN9\\Administrator" <15040771@qq.com>
Date: Tue, 11 Aug 2020 19:56:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E9=A2=86=E5=8F=96=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/CouponController.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Controller/CouponController.php b/app/Controller/CouponController.php
index 04adf9c..5585fba 100644
--- a/app/Controller/CouponController.php
+++ b/app/Controller/CouponController.php
@@ -162,10 +162,13 @@ class CouponController extends BaseController
             $coupon->full_amount = '满' . $coupon->full_amount . "可用";
             //判断是折扣优惠券还是满减优惠券
             if($coupon->discount_type == 1){
-                $coupon->discounts = '￥ '.$coupon->discounts;
+                $coupon->discounts = '￥'.$coupon->discounts;
             }elseif($coupon->discount_type == 2){
                 $coupon->discounts = floatval($coupon->discounts)."折";
             }
+            //失效时间格式转换
+            $usable_end_time = date('Y-m-d H:i:s',$coupon->usable_end_time);
+            $coupon->usable_end_time = '有效期至:'.$usable_end_time;
 
             if ($coupon->usable_end_time < $nowTime || $coupon->number_remain <= 0) {
                 $expired[] = $coupon;