diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php index 97c5500c..0048b4e2 100644 --- a/app/controller/api/Auth.php +++ b/app/controller/api/Auth.php @@ -373,7 +373,11 @@ 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; } - $data['mer_info'] = array_merge($mer_arr,$bank_info); + if($bank_info){ + $data['mer_info'] = array_merge($mer_arr,$bank_info); + }else{ + $data['mer_info'] =$mer_arr; + } $typCode = Db::name('merchant_type')->where('mer_type_id', $mer_arr['type_id'] ?? 0)->value('type_code'); $data['mer_info']['type_code'] = $typCode; $data['mer_info']['setting_status'] = 0;