Merge branch 'test'

application/api_broker/service/CallPhoneService.php

@@ -93,7 +93,7 @@ class CallPhoneService
             $phone_b = $user_data['user_phone'];
         }
 
-        if (empty($phone_a)) {
+        if (empty($phone_a) || strlen($phone_a) != 11) {
             $result['msg'] = '参数错误(A)，请截图联系运营人员！';
             return $result;
         }
@@ -108,6 +108,11 @@ class CallPhoneService
             return $result;
         }
 
+        if ($phone_a == $phone_b) {
+            $result['msg'] = '拨号号码与客户手机号相同，不能拨打。';
+            return $result;
+        }
+
         $this->phone_a = $phone_a;//经纪人手机号
         $this->phone_b = $phone_b;//客户手机号
         $this->record = $record;  //是否录音

application/chat/controller/AppChat.php

@@ -593,7 +593,7 @@ class AppChat extends Basic
         $data["user_count"] = $msgModel->getListCountByWhere($param);
         $param["type"] = array("in", "1,3");
         $data["shop_count"] = $msgModel->getListCountByWhere($param);
-        $param["type"] = 7;
+        $param["type"] = 8;
         $data["report_count"] = $msgModel->getListCountByWhere($param);
         return $this->response("200", "success", $data);
     }
@@ -616,7 +616,7 @@ class AppChat extends Basic
         $param["is_read"] = 0;
         //TODO 获取未读个数
         $msgModel = new MPushMessage();
-        $param["type"] = array("in", "1,2,3,7");
+        $param["type"] = array("in", "1,2,3,8");
         $shop_count = $msgModel->getListCountByWhere($param);
         if ($shop_count > 0) {
             return $this->response("200", "success", ["is_show_red" => true]);