Просмотр исходного кода

【程序目录】修复活动统计无法正常加载的问题,修复海报无法正常加载的问题

吴昊天 3 лет назад
Родитель
Сommit
e5ecb82ccd

+ 1 - 1
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) {

+ 1 - 1
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');
     }

+ 1 - 1
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');
     }

+ 1 - 1
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');
     }