diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index dac0f04a..beb0890a 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -174,14 +174,9 @@ 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'])->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;
-            }else{
-                $data['is_wsxx'] = 1;
-            }
-        }else{
-            $data['is_wsxx'] = 0;
+        $data['is_wsxx'] = 0;
+        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;
         }
         return app('json')->success($data);
     }