Merge remote-tracking branch 'origin/test' into test

application/api_broker/controller/Broker.php

@@ -193,13 +193,14 @@ class Broker extends Basic
         /*处理多个手机登录聊天*/
         $m_chat_ext = new ChatUserExt();
         $bind_where['is_forbidden'] = 0;
-        $bind_where['user_id'] = ['<>', $agents_data['id']];
+        $bind_where['user_id'] = $agents_data['id'];
         $bind_where['type'] = 1;
-        $bind_where['push_id'] = $params["push_id"];
-        $del_bind_id = $m_chat_ext->getChatUserExtByUserId($bind_where, 'a.id', 100);
+        $del_bind_id = $m_chat_ext->getChatUserExtByUserId($bind_where, 'a.id,a.push_id', 100);
         if (count($del_bind_id) > 0) {
             foreach ($del_bind_id as $v) {
-                $m_chat_ext->updateDate(['is_forbidden'=>1], ['id'=>$v['id']]);
+                if ($v['push_id'] != $params["push_id"]) {
+                    $m_chat_ext->updateDate(['is_forbidden'=>1], ['id'=>$v['id']]);
+                }
             }
         }
         /*处理多个手机登录聊天*/

application/index/controller/CellPhone.php

@@ -147,7 +147,8 @@ class CellPhone extends Basic
                 }
             }
             $data['list']  = $list;
-            $data['total'] = $report->getCallListTotal($where);
+//            $data['total'] = $report->getCallListTotal($where);
+            $data['total'] = 40000;
             return $this->response($result['code'], $result['msg'], $data);
         } else {
             return view('cell_phone/index');

application/index/controller/ShareShop.php

@@ -72,17 +72,6 @@ class ShareShop extends Basic
 
             }
         }
-        dump('=======');
-        dump('=======');
-        dump('=======');
-        dump('=======');
-        dump('=======');
-        dump('=======');
-        dump('=======');
-        dump('=======');
-        dump('=======');
-        dump('是否手机号注册用户');
-        dump($is_user);
 
         $this->assign('data',json_encode($params));
         return view("share_detail");

application/index/service/UserService.php

@@ -447,13 +447,10 @@ class UserService
         if(!$open_id){
             return false;
         }
-        dump($open_id);
 
         $param['wx_open_id'] = $open_id;
         $fields='a.user_phone';
         $result = $this->user->getUserInfoByOpenId($param, $fields);
-        dump($result);
-        Log::write($result, 'isUserByweiXin'); //记录日志
 
         if ($result) {
             return true;

application/task/controller/PrivacyNumber.php

@@ -439,7 +439,7 @@ class PrivacyNumber
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public function totalAgentCall($month)
+    public function totalAgentCall($month = '')
     {
         set_time_limit(0); // 取消脚本运行时间的超时上限
         $call = new TAgentTotalCallModel();

public/resource/js/performance_ranking.js

@@ -256,7 +256,7 @@ define (['doT', 'ckfinder','ckfinderStart', 'css!style/home.css',"datetimepicker
 //				if (grade < 27){
 //					index = data.data.grade
 //				} else {
-//					index = data.data.grade%26; 
+//					index = data.data.grade%26;
 //					indexTimes = parseInt(data.data.grade/26)
 //				}
 //				var str = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
@@ -278,14 +278,13 @@ define (['doT', 'ckfinder','ckfinderStart', 'css!style/home.css',"datetimepicker
 //				}
 //				$('#table-title').text(text);
 //			},'json')
-//			
-			
+//
+
 			$.ajax({
 				url: '/index/getRandKingListByAgentId',
 				type: 'GET',
 				async: true,
-				data: {
-				},
+				data: params,
 				dataType: 'json',
 				success: function(data) {
 					$('#tbody').empty();
@@ -296,7 +295,7 @@ define (['doT', 'ckfinder','ckfinderStart', 'css!style/home.css',"datetimepicker
 					if (grade < 27){
 						index = data.data.grade
 					} else {
-						index = data.data.grade%26; 
+						index = data.data.grade%26;
 						indexTimes = parseInt(data.data.grade/26)
 					}
 					var str = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
@@ -315,7 +314,7 @@ define (['doT', 'ckfinder','ckfinderStart', 'css!style/home.css',"datetimepicker
 						text = "顾问职称" + value + "档"
 					} else if (name == 5 ){
 						text = "无职称职称" + value + "档"
-					} 
+					}
 					$('#table-title').text(text);
 				},
 				error : function(data){
@@ -326,9 +325,9 @@ define (['doT', 'ckfinder','ckfinderStart', 'css!style/home.css',"datetimepicker
 					$('#overlay').fadeOut('')
 				}
 			});
-			
-			
-			
+
+
+
 		},
 //		
 		loadTable : function(data,gradge){