diff --git a/crmeb/app/api/controller/v1/PublicController.php b/crmeb/app/api/controller/v1/PublicController.php index 84a9bd61e..f19e9e5c0 100644 --- a/crmeb/app/api/controller/v1/PublicController.php +++ b/crmeb/app/api/controller/v1/PublicController.php @@ -301,7 +301,7 @@ class PublicController ['code', ''], ], true); if (!preg_match('/.*(\.png|\.jpg|\.jpeg|\.gif)$/', $imageUrl) || !preg_match('/.*(\.png|\.jpg|\.jpeg|\.gif)$/', $codeUrl)) { - return app('json')->fail(100100); + return app('json')->success(['code' => false, 'image' => false]); } try { $code = CacheService::get($codeUrl, function () use ($codeUrl) { diff --git a/crmeb/app/services/activity/bargain/StoreBargainServices.php b/crmeb/app/services/activity/bargain/StoreBargainServices.php index 56c8b09f9..66ba986af 100644 --- a/crmeb/app/services/activity/bargain/StoreBargainServices.php +++ b/crmeb/app/services/activity/bargain/StoreBargainServices.php @@ -1047,7 +1047,7 @@ class StoreBargainServices extends BaseServices $item['status'] = '未知'; } $item['add_time'] = date('Y-m-d H:i:s', $item['add_time']); - $item['pay_time'] = date('Y-m-d H:i:s', $item['pay_time']); + $item['pay_time'] = $item['pay_time'] ? date('Y-m-d H:i:s', $item['pay_time']) : ''; } return compact('list', 'count'); } diff --git a/crmeb/app/services/activity/combination/StoreCombinationServices.php b/crmeb/app/services/activity/combination/StoreCombinationServices.php index 3643fb34d..2737acba6 100644 --- a/crmeb/app/services/activity/combination/StoreCombinationServices.php +++ b/crmeb/app/services/activity/combination/StoreCombinationServices.php @@ -683,7 +683,7 @@ class StoreCombinationServices extends BaseServices $item['status'] = '未知'; } $item['add_time'] = date('Y-m-d H:i:s', $item['add_time']); - $item['pay_time'] = date('Y-m-d H:i:s', $item['pay_time']); + $item['pay_time'] = $item['pay_time'] ? date('Y-m-d H:i:s', $item['pay_time']) : ''; } return compact('list', 'count'); } diff --git a/crmeb/app/services/activity/seckill/StoreSeckillServices.php b/crmeb/app/services/activity/seckill/StoreSeckillServices.php index 6d7610066..68cc1f9e7 100644 --- a/crmeb/app/services/activity/seckill/StoreSeckillServices.php +++ b/crmeb/app/services/activity/seckill/StoreSeckillServices.php @@ -923,7 +923,7 @@ class StoreSeckillServices extends BaseServices $item['status'] = '未知'; } $item['add_time'] = date('Y-m-d H:i:s', $item['add_time']); - $item['pay_time'] = date('Y-m-d H:i:s', $item['pay_time']); + $item['pay_time'] = $item['pay_time'] ? date('Y-m-d H:i:s', $item['pay_time']) : ''; } return compact('list', 'count'); }