diff --git a/app/ExceptionHandle.php b/app/ExceptionHandle.php
index 9319475f..c18c84e5 100755
--- a/app/ExceptionHandle.php
+++ b/app/ExceptionHandle.php
@@ -24,6 +24,7 @@ use think\exception\ValidateException;
use think\Response;
use Throwable;
use Exception;
+use think\facade\Request;
/**
* 应用异常处理类
@@ -56,6 +57,7 @@ class ExceptionHandle extends Handle
'line' => $exception->getLine(),
'message' => $this->getMessage($exception),
'code' => $this->getCode($exception),
+ 'http' =>Request::url()
];
$log = "[{$data['code']}]{$data['message']}[{$data['file']}:{$data['line']}]";
if ($this->app->config->get('log.record_trace')) {
diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index 7b012d51..05fca2f1 100755
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -373,7 +373,7 @@ class Auth extends BaseController
if ($mer_arr && $mer_arr['mer_avatar'] != '' && $mer_arr['mer_banner'] != '' && $mer_arr['mer_info'] && $mer_arr['service_phone'] != '' && $mer_arr['mer_address'] != '') {
$data['is_wsxx'] = 1;
}
- if($bank_info){
+ if(count($bank_info)>0 && count($mer_arr)>0){
$data['mer_info'] = array_merge($mer_arr,$bank_info);
}else{
$data['mer_info'] =$mer_arr;
diff --git a/public/index.html b/public/index.html
index 0f87b94a..08ec4025 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2,4 +2,4 @@
document.write('')
if(window.location.protocol == 'https:'){
document.write('')
- }