大返官php后台
上一版本: b060a4b5 | 补丁 | 提交 | 忽略空白
15295036569
2023-06-14 e1b3e17a206bd0bb59881f044ec09fa275ef46a5 
Merge branch 'feature/1.1.3api开发' of http://60.204.153.149:8081/r/dfgApi into feature/1.1.3api开发
已修改1个文件
6 ■■■■■ 文件已修改
application/api/controller/User.php 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 application/api/controller/User.php


@@ -86,6 +86,7 @@


        $mobile = $this->request->post('mobile');


        $captcha = $this->request->post('captcha');


        $ismobouth=$this->request->post('ismobouth',false);


        $push_cid=$this->request->post('push_cid',false);


        if (!$mobile || !$captcha) {


            $this->error(__('Invalid parameters'));


        }


@@ -247,6 +248,7 @@


    {


        $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) {


@@ -255,6 +257,10 @@


            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']);


        } else {