Merge branch 'coupon_rebate' of http://120.24.33.109:11081/hyzjshwo/lanzu_api_hyperf into coupon_rebate

app/Service/CouponRebateService.php

@@ -42,7 +42,7 @@ class CouponRebateService implements CouponRebateServiceInterface
         // status: 0领取成功  >0领取失败
         $result = [
             'status'        => 1,
-            'coupon_text'   => '继续努力~'
+            'coupon_text'   => '活动已过期~'
         ];
 
         // 错误日志记录

app/Service/CouponService.php

@@ -38,8 +38,8 @@ 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',
-                'receive_bg' => env('OSS_IMG_HOST')."/attachment/images/background/dangmian_dialog_background.png",
+                'share_bg'   => env('OSS_IMG_HOST').'/attachment/images/png/2020/08/11/d697d43b91913f861f931649f0898815.png',
+                'receive_bg' => env('OSS_IMG_HOST')."/attachment/images/png/2020/08/11/9c7d7c95b5de29539fad4bc9a2fcb98d.png",
                 'coupons'    => []
             ]
         ];
@@ -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;
             }