diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index 48f8d9d1..1b66df7d 100644 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -2042,7 +2042,7 @@ class StoreOrderRepository extends BaseRepository $imageInfo = null; } if (!$imageInfo) { - $codeUrl = set_http_type(rtrim($siteUrl, '/') . '/pages/admin/cancellate_result/index?cal_code=' . $verify_code . '&mer_id=' . $mer_id . '&is_jump=1', request()->isSsl() ? 0 : 1);//二维码链接 + $codeUrl = set_http_type(rtrim($siteUrl, '/') . '/pages/admin/cancellate_result/index?code=' . $verify_code . '&mer_id=' . $mer_id . '&is_jump=1', request()->isSsl() ? 0 : 1);//二维码链接 $imageInfo = app()->make(QrcodeService::class)->getQRCodePath($codeUrl, $name); if (is_string($imageInfo)) throw new ValidateException('二维码生成失败'); diff --git a/app/controller/merchant/Common.php b/app/controller/merchant/Common.php index 4eabe1fd..2649048c 100644 --- a/app/controller/merchant/Common.php +++ b/app/controller/merchant/Common.php @@ -251,7 +251,7 @@ class Common extends BaseController 'fileExt' => 'jpg,jpeg,png,bmp', 'fileMime' => 'image/jpeg,image/png', ]])->check(['file' => $file]); - $upload = UploadService::create(1); + $upload = UploadService::create(); $data = $upload->to('attach')->move('file'); if ($data === false) { return app('json')->fail($upload->getError());