如果是客户端登录

application/api_broker/service/BrokerService.php

@@ -52,20 +52,41 @@ class BrokerService
         }
         $is_exits = false;
         foreach ($result as $item) {
-            //todo 1.判断ip是否相同$device_id字段，2.ip不同则判断push_id是否相同，相同更新ip，3.ip相同则判断push_id是否相同，
-            if ($model == $item["model"] && !empty($push_id) &&
-                (($device_id != $item["device_id"] && $push_id == $item["push_id"]) ||
-                    ($device_id == $item["device_id"] && $push_id != $item["push_id"]))
-            ) {
-                $this->aBD->updateDevice([ "id" => $item["id"], "push_id" => $push_id, "device_id" => $device_id ]);
-                return true;
-            }
-            if (($is_pc == 0 && $device_id == $item["device_id"])
-                || ($is_pc == 1 && $push_id == $item["push_id"] && $device_id == $item["device_id"])) {
-                if ($item["is_forbidden"] == 0) {
+            //如果是客户端登录
+            if($is_pc == 2){
+                if ($device_id == $item["device_id"])
+                {
+                    if ($item["is_forbidden"] == 0) {
+                        return true;
+                    } elseif ($item["is_forbidden"] == 1) { //已存在申请关系
+                        $is_exits = true;
+                    }
+                }
+            }else{
+                //todo 1.判断ip是否相同$device_id字段，2.ip不同则判断push_id是否相同，相同更新ip，3.ip相同则判断push_id是否相同，
+                if (
+                    $model == $item["model"]
+                    && !empty($push_id)
+                    && (
+                        ($device_id != $item["device_id"] && $push_id == $item["push_id"])
+                        ||
+                        ($device_id == $item["device_id"] && $push_id != $item["push_id"]
+                        )
+                    )
+                ) {
+                    $this->aBD->updateDevice([ "id" => $item["id"], "push_id" => $push_id, "device_id" => $device_id ]);
                     return true;
-                } elseif ($item["is_forbidden"] == 1) { //已存在申请关系
-                    $is_exits = true;
+                }
+                if (
+                    ($is_pc == 0 && $device_id == $item["device_id"])
+                    ||
+                    ($is_pc == 1 && $push_id == $item["push_id"] && $device_id == $item["device_id"]))
+                {
+                    if ($item["is_forbidden"] == 0) {
+                        return true;
+                    } elseif ($item["is_forbidden"] == 1) { //已存在申请关系
+                        $is_exits = true;
+                    }
                 }
             }
         }

application/index/controller/Login.php

@@ -56,6 +56,7 @@ class Login extends Basic
         $password = $this->params["password"];
         $model    = $this->params["model"];
         $only_id  = $this->params["only_id"];
+        $mac_address  = $this->params["mac_address"];
 
         if (empty($name) || empty($password)) {
             return $this->response(101, '用户名或密码不能为空');
@@ -94,7 +95,12 @@ class Login extends Basic
 
             if ($user_data['id'] != 1) {
                 //判断设备id是否存在
-                $is_login = $this->brokerService->judgeBand($last_login_ip, $user_data['id'], $model, 0,$only_id , 1);
+                if($mac_address){
+                    $is_pc = 2;//客户端
+                }else{
+                    $is_pc = 1;//浏览器
+                }
+                $is_login = $this->brokerService->judgeBand($last_login_ip, $user_data['id'], $model, 0,$only_id , $is_pc);
                 if (!$is_login) {
                     return $this->response("102", "该账号没有绑定该设备的浏览器，请先向店长申请，由店长致电财务董飞。");
                 }