修改微信授权登录

This commit is contained in:
luofei 2024-03-12 09:12:59 +08:00
parent 8bc29a1dfa
commit 9e79bcab01

View File

@ -395,7 +395,7 @@ class Auth extends BaseController
$data['mer_info']['type_code'] = $merType['type_code'];
$data['mer_info']['type_name'] = $merType['type_name'];
$data['mer_info']['setting_status'] = 0;
if (!empty($mer_arr['mer_avatar']) && !empty($mer_arr['mer_banner']) && !empty($mer_arr['mer_address']) && !empty($mer_arr['mer_info'])) {
if (!empty($mer_arr['mer_avatar']) && !empty($mer_arr['mer_banner']) && !empty($mer_arr['mer_address'])) {
$data['mer_info']['setting_status'] = 1;
}
}
@ -940,7 +940,7 @@ class Auth extends BaseController
if ($code && ($info = app()->make(RoutineQrcodeRepository::class)->getRoutineQrcodeFindType($code))) {
$auth['auth']['spread'] = $info['third_id'];
}
if (!$user || empty($user['account']) || empty($user['phone'])) {
if (!$user || ((empty($user['account']) || empty($user['phone'])) && $auth['type'] == 'app_wechat')) {
$uni = uniqid(true, false) . random_int(1, 100000000);
$key = 'U' . md5(time() . $uni);
Cache::set('u_try' . $key, ['id' => $authInfo['wechat_user_id'], 'type' => $authInfo['user_type'], 'spread' => $auth['auth']['spread'] ?? 0], 3600);