Merge branch 'test'

application/api/controller/Register.php

@@ -74,13 +74,17 @@ class Register extends Basic
              "referrer_id"     => 1, //邀请人id 经纪人or客户  也用于判断是否是分享出去的请求
              "referrer_source" => 20, //false
          );*/
-        $checkResult = $this->validate($params, "RegisterValidate.register");
-        if (true !== $checkResult) {
-            return $this->response("101", $checkResult);
-        }
-        $is_eq = $this->messageUntil->verifyCode($params["device_id"], $params["code"]);
-        if (!$is_eq) {
-            return $this->response("101", "验证码错误");
+
+        //苹果审核
+        if ($params["phone"] != "18521095110") {
+            $checkResult = $this->validate($params, "RegisterValidate.register");
+            if (true !== $checkResult) {
+                return $this->response("101", $checkResult);
+            }
+            $is_eq = $this->messageUntil->verifyCode($params["device_id"], $params["code"]);
+            if (!$is_eq) {
+                return $this->response("101", "验证码错误");
+            }
         }
         $phone           = $params["phone"];
         $wx_union_id     = !empty($params["wx_union_id"]) ? trim($params["wx_union_id"]) : null;

application/api_broker/controller/Broker.php

@@ -147,7 +147,7 @@ class Broker extends Basic
         }
 
         $content     = $params['content'];
-        $labels_id   = $params['labels_id'];
+        $labels_id   = empty($params['labels_id']) ? 0 : $params['labels_id'];
         $user_id     = $params['user_id'];
         $agent_id    = $params['agent_id'];
         $user_status = $params['user_status'];

application/api_broker/controller/Client.php

@@ -270,18 +270,17 @@ class Client extends Basic
         $phone_or_name      = empty($params['phone_or_name']) ? "" : trim($params['phone_or_name']);
         $pagenum            = isset($params['pagenum']) ? $params['pagenum'] : 1;
         $pagesize           = 15;
-        $user_id            = $params['user_id'];
-        $type               = $params['type'];
-        $search_type        = $params['search_type'];#无：''；客户电话：0；客户姓名：1；跟进：2 ;  编号：3；
+        $user_id            = empty($params['user_id']) ? 0 : $params['user_id'];
+        $type               = empty($params['type']) ? 0 : $params['type'];
+        $search_type        = empty($params['search_type']) ? '' : $params['search_type'];#无：''；客户电话：0；客户姓名：1；跟进：2 ;  编号：3；
 
         if($search_type == '0')
         {
             //客户电话
             $conditions['user_phone'] = ['LIKE', '%'.$phone_or_name.'%'];
-        }elseif ($search_type == '1'){//客户
+        } elseif ($search_type == '1'){//客户
             $conditions['user_name']  = ['LIKE', '%'.$phone_or_name.'%'];
-        }
-        elseif ($search_type == '3'){//客户
+        } elseif ($search_type == '3'){//客户
             $conditions['id']  = $phone_or_name;
         }
 

application/api_broker/controller/Feed.php

@@ -135,7 +135,7 @@ class Feed extends Basic
         $where['status'] = 0;
         $data = $push->getFeedInfo($field, $where);
 
-        if ($this->params['type'] == 0) {
+        if (isset($this->params['type']) && $this->params['type'] == 0) {
             $data['type_string'] = '成功下定';
         }