diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index 2eaa803a..6413bba7 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -172,12 +172,18 @@ 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();
         $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;
+
+//        判断是否是商户，并且有没有完善信息
+        //这里有点小问题以后要修改
+        $store_service=Db::name('store_service')->where('uid',$data['uid'])->find();
+        if ($store_service){
+            $mer_arr = Db::name('merchant')->where('mer_id',$store_service['mer_id'])->where('is_del',0)->where('status',1)->field('mer_avatar,mer_banner,mer_info,service_phone,mer_address')->find();
+            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);
     }