From 6d4c4d32402365886a17cd117b3ce788560ca8e4 Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Tue, 11 Aug 2020 15:54:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E8=BF=94?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8--=E4=BF=AE=E6=94=B9=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Service/CouponService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Service/CouponService.php b/app/Service/CouponService.php index 8ee46a2..afcb702 100644 --- a/app/Service/CouponService.php +++ b/app/Service/CouponService.php @@ -38,7 +38,7 @@ class CouponService implements CouponServiceInterface 'jump_data' => [ 'src' => "/zh_cjdianc/pages/couponrebate/index?activity_type=".$activityType, 'src2' => "/zh_cjdianc/pages/couponrebate/index?activity_type=".$activityType, - 'share_bg' => env('OSS_IMG_HOST').'/attachment/images/png/2020/08/11/23245eea88db680670df67e77e0d8d7e.png', + 'share_bg' => env('OSS_IMG_HOST').'/attachment/images/png/2020/08/11/d697d43b91913f861f931649f0898815.png', 'receive_bg' => env('OSS_IMG_HOST')."/attachment/images/background/dangmian_dialog_background.png", 'coupons' => [] ] From 33ad505c93bc4fdb2b14a895c172963868dd787f Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Tue, 11 Aug 2020 17:31:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E8=BF=94?= =?UTF-8?q?=E5=88=B8=E6=B4=BB=E5=8A=A8--=E4=BF=AE=E6=94=B9=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Service/CouponService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Service/CouponService.php b/app/Service/CouponService.php index afcb702..2d76319 100644 --- a/app/Service/CouponService.php +++ b/app/Service/CouponService.php @@ -39,7 +39,7 @@ class CouponService implements CouponServiceInterface 'src' => "/zh_cjdianc/pages/couponrebate/index?activity_type=".$activityType, 'src2' => "/zh_cjdianc/pages/couponrebate/index?activity_type=".$activityType, 'share_bg' => env('OSS_IMG_HOST').'/attachment/images/png/2020/08/11/d697d43b91913f861f931649f0898815.png', - 'receive_bg' => env('OSS_IMG_HOST')."/attachment/images/background/dangmian_dialog_background.png", + 'receive_bg' => env('OSS_IMG_HOST')."/attachment/images/png/2020/08/11/9c7d7c95b5de29539fad4bc9a2fcb98d.png", 'coupons' => [] ] ]; From dbb96dad6b884b82b22e8069bc925bf15f270ade Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Tue, 11 Aug 2020 18:18:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E8=BF=94?= =?UTF-8?q?=E5=88=B8=E6=B4=BB=E5=8A=A8--=E4=BF=AE=E6=94=B9=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Service/CouponService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Service/CouponService.php b/app/Service/CouponService.php index 2d76319..b0aa716 100644 --- a/app/Service/CouponService.php +++ b/app/Service/CouponService.php @@ -96,7 +96,7 @@ class CouponService implements CouponServiceInterface foreach ($coupons as $k => &$v){ if($v->active_type == 1){ - $result['not_receive'] = $v; + $result['not_receive'][] = $v; }else if($v->active_type == 2){ $result['jump_data']['coupons'][] = $v->id; } From c0ac902090e7e93af78b3f18ef7ad9af07696c1e Mon Sep 17 00:00:00 2001 From: liangyuyan <1103300295@qq.com> Date: Wed, 12 Aug 2020 09:49:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E8=BF=94?= =?UTF-8?q?=E5=88=B8=E6=B4=BB=E5=8A=A8--=E6=B7=BB=E5=8A=A0=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E8=BF=87=E6=9C=9F=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Service/CouponRebateService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Service/CouponRebateService.php b/app/Service/CouponRebateService.php index 8d27c16..c907186 100644 --- a/app/Service/CouponRebateService.php +++ b/app/Service/CouponRebateService.php @@ -42,7 +42,7 @@ class CouponRebateService implements CouponRebateServiceInterface // status: 0领取成功 >0领取失败 $result = [ 'status' => 1, - 'coupon_text' => '继续努力~' + 'coupon_text' => '活动已过期~' ]; // 错误日志记录