no message

zhaojs

2023-06-29 1349b33043bc716b0cd0a3532b522924c1fd133f

 application/api/controller/User.php

@@ -248,7 +248,6 @@
    {
        $openid = request()->param('openid');
        $access_token = request()->param('access_token');
        $push_cid=request()->param('push_cid','');
        $LogicUser = new LogicUser();
        $userId = $LogicUser->getUserByOpenId($openid);
        if ($userId) {
@@ -256,10 +255,6 @@
            if(empty($user)) $this->error("用户信息获取失败");
            if ($user['status'] != 'normal') {
                $this->error(__('Account is locked'));
            }
            if(!empty($push_cid)&&empty($user['push_cid']))
            {//表里push_cid为空，补全push_cid
                
            }
            //如果已经有账号则直接登录
            $ret = $this->auth->direct($user['id']);
@@ -290,16 +285,21 @@
        if(empty($wxUser)) $this->error('微信授权信息获取失败');
        $mobile = $this->request->post('mobile');
        $captcha = $this->request->post('captcha');
        if (!$mobile || !$captcha) {
        $isyj=$this->request->post('isyj',false);
        if (!$mobile || (!$isyj&&!$captcha)) {
            $this->error(__('Invalid parameters'));
        }
        if (!Validate::regex($mobile, "^1\d{10}$")) {
            $this->error('请输入正确手机号');
        }
        $result = Sms::check($mobile, $captcha, 'changemobile');
        if (!$result) {
            $this->error(__('Captcha is incorrect'));
        if(!$isyj)
        {
            $result = Sms::check($mobile, $captcha, 'changemobile');
            if (!$result) {
                $this->error(__('Captcha is incorrect'));
            }
        }
        
        $ModelThird = new ModelThird();
        $LogicUser = new LogicUser();
        //判断当前手机号是否已经绑定微信