From 9e79bcab01ea0863f0301d8e5636cca0e54c28eb Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Tue, 12 Mar 2024 09:12:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/Auth.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index 7e96018a..b5ba2205 100755
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -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);