修复登录错误
This commit is contained in:
parent
014cd84106
commit
afeda3992e
@ -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'] != '') {
|
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['is_wsxx'] = 1;
|
||||||
}
|
}
|
||||||
if(count($bank_info)>0 && count($mer_arr)>0){
|
if($bank_info && count($bank_info)>0 && count($mer_arr)>0){
|
||||||
$data['mer_info'] = array_merge($mer_arr,$bank_info);
|
$data['mer_info'] = array_merge($mer_arr,$bank_info);
|
||||||
}else{
|
}else{
|
||||||
$data['mer_info'] =$mer_arr;
|
$data['mer_info'] =$mer_arr;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user