Merge pull request '更新异常' (#12) from dev into master
Reviewed-on: https://gitea.lihaink.cn/mkm/shop-php/pulls/12
This commit is contained in:
commit
7763e3d460
@ -211,6 +211,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;
|
||||||
}
|
}
|
||||||
|
$data['mer_info'] = $mer_arr;
|
||||||
$typCode = Db::name('merchant_type')->where('mer_type_id', $mer_arr['type_id'] ?? 0)->value('type_code');
|
$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']['type_code'] = $typCode;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user