diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index 718440f3..8bf66ae7 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -170,6 +170,17 @@ 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();
+        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;
+        }
         return app('json')->success($data);
     }