diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index beb0890a..2eaa803a 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -367,8 +367,8 @@ class Auth extends BaseController
     {
         $data = $this->request->params(['phone', 'sms_code', 'spread', 'auth_token',['user_type','h5']]);
         $validate->sceneSmslogin()->check($data);
-//        $sms_code = app()->make(SmsService::class)->checkSmsCode($data['phone'], $data['sms_code'], 'login');
-//        if (!$sms_code) return app('json')->fail('验证码不正确');
+       $sms_code = app()->make(SmsService::class)->checkSmsCode($data['phone'], $data['sms_code'], 'login');
+       if (!$sms_code) return app('json')->fail('验证码不正确');
         $user = $repository->accountByUser($data['phone']);
         $auth = $this->parseAuthToken($data['auth_token']);
         Db::startTrans();
diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php
index 99aa81fc..465e1f4e 100644
--- a/app/controller/api/store/merchant/Merchant.php
+++ b/app/controller/api/store/merchant/Merchant.php
@@ -159,6 +159,10 @@ class Merchant extends BaseController
                 'lat',
                 ['delivery_way',[2]],
             ]);
+
+            // 如果手机号不存在，则使用入驻时的手机号
+            $data['service_phone'] = empty($data['service_phone'])?$merchant['mer_phone']:$data['service_phone'];
+
             $validate->check($data);
             $sys_bases_status = systemConfig('sys_bases_status') === '0' ? 0 : 1;
             if ($sys_bases_status && empty($data['mer_certificate']))