diff --git a/app/ExceptionHandler.php b/app/ExceptionHandler.php index aaf6f74..17702c3 100644 --- a/app/ExceptionHandler.php +++ b/app/ExceptionHandler.php @@ -2,6 +2,7 @@ namespace App; +use app\common\service\JsonService; use Next\VarDumper\Dumper; use Next\VarDumper\DumperHandler; use support\exception\Handler; @@ -16,9 +17,10 @@ class ExceptionHandler extends Handler public function render(Request $request, Throwable $exception): Response { - if ($exception instanceof Dumper) { - return \response(self::convertToHtml($exception)); - } - return parent::render($request, $exception); +// if ($exception instanceof Dumper) { +// return \response(self::convertToHtml($exception)); +// } +// return parent::render($request, $exception); + return json(json_decode($exception->getMessage(),true)); } } \ No newline at end of file diff --git a/app/admin/logic/merchant/MerchantLogic.php b/app/admin/logic/merchant/MerchantLogic.php index 5eae44a..38a12b6 100644 --- a/app/admin/logic/merchant/MerchantLogic.php +++ b/app/admin/logic/merchant/MerchantLogic.php @@ -54,7 +54,8 @@ class MerchantLogic extends BaseLogic 'mer_money' => $params['mer_money'], 'financial_bank' => $params['financial_bank'] ?? '', 'financial_wechat' => $params['financial_wechat'] ?? '', - 'financial_alipay' => $params['financial_alipay'] ?? '' + 'financial_alipay' => $params['financial_alipay'] ?? '', + 'financial_type' => $params['financial_type'] ?? '' ]); Db::commit(); @@ -104,7 +105,8 @@ class MerchantLogic extends BaseLogic 'mer_money' => $params['mer_money'], 'financial_bank' => $params['financial_bank'] ?? '', 'financial_wechat' => $params['financial_wechat'] ?? '', - 'financial_alipay' => $params['financial_alipay'] ?? '' + 'financial_alipay' => $params['financial_alipay'] ?? '', + 'financial_type' => $params['financial_type'] ?? '' ]); Db::commit(); diff --git a/app/admin/validate/merchant/MerchantValidate.php b/app/admin/validate/merchant/MerchantValidate.php index 98d3f91..0861466 100644 --- a/app/admin/validate/merchant/MerchantValidate.php +++ b/app/admin/validate/merchant/MerchantValidate.php @@ -68,7 +68,7 @@ class MerchantValidate extends BaseValidate */ public function sceneAdd() { - return $this->remove('id',true); + return $this->remove('mer_id',true); }