From d5c224d8feb4d7eeb1cdbd2cd90b612f1e9ba4c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=AD=E6=A1=83?= <1098598843@qq.com>
Date: Tue, 14 Mar 2023 09:52:36 +0800
Subject: [PATCH] 1

---
 app/controller/api/Auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index 8bf66ae7..a36364bd 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -171,7 +171,7 @@ class Auth extends BaseController
 //        新增返回商户后台登录地址
         $data['merchant_login'] = $this->request->domain().'/merchant';
 //        判断是否是商户，并且有没有完善信息
-        $mer_arr = Db::name('merchant_intention')->alias('a')->join('merchant b','a.mer_id=b.mer_id')->where('a.uid',$data['uid'])->field('b.mer_avatar,b.mer_banner,b.mer_info,b.service_phone,b.mer_address')->find();
+        $mer_arr = Db::name('merchant_intention')->alias('a')->join('merchant b','a.mer_id=b.mer_id')->where('a.uid',$data['uid'])->where('a.is_del',0)->where('a.status',1)->field('b.mer_avatar,b.mer_banner,b.mer_info,b.service_phone,b.mer_address')->find();
         if($mer_arr){
             if (!$mer_arr['mer_avatar'] || !$mer_arr['mer_banner'] || !$mer_arr['mer_info'] || !$mer_arr['service_phone'] || !$mer_arr['mer_address']) {
                 $data['is_wsxx'] = 0;