From a1703a62e1b30a831b1f71ad66624c1c4f6ba7ba Mon Sep 17 00:00:00 2001
From: zengchaoxin <zengchaoxin@gmail.com>
Date: Mon, 2 Dec 2019 13:53:50 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=A3=E9=99=A4?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/views/phone-center/sub-index.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/frontend/views/phone-center/sub-index.php b/frontend/views/phone-center/sub-index.php
index dd495cf..7720b05 100644
--- a/frontend/views/phone-center/sub-index.php
+++ b/frontend/views/phone-center/sub-index.php
@@ -72,10 +72,16 @@ use \common\libs\MyLib;
             btn: ['删除','取消'], //按钮
             shade: false //不显示遮罩
         }, function(){
-            $.post('/phone-center/sub-delete',{id:id},function(data) {
-                parent.layer.msg(data.msg);
-                refreshList();
-            }, 'json');
+            $.get('/phone/ax-unbind',{id:id},function(obj){
+                if(obj.success){
+                    $.post('/phone-center/sub-delete',{id:id},function(data) {
+                        parent.layer.msg(data.msg);
+                        refreshList();
+                    }, 'json');
+                } else {
+                    parent.layer.msg(obj.msg);
+                }
+            });
         }, function(){
             //
         });

From da02828c2cdf7b858fa14afeffcfc81d0a08cc47 Mon Sep 17 00:00:00 2001
From: zengchaoxin <zengchaoxin@gmail.com>
Date: Fri, 6 Dec 2019 16:41:47 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1=EF=BC=8C=E6=97=A0=E6=B3=95=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E7=94=A8=E6=88=B7=E5=90=8DBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/controllers/StatisticsController.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frontend/controllers/StatisticsController.php b/frontend/controllers/StatisticsController.php
index d394593..d696dd5 100644
--- a/frontend/controllers/StatisticsController.php
+++ b/frontend/controllers/StatisticsController.php
@@ -56,13 +56,11 @@ class StatisticsController extends BaseController
 //      现在的搜索条件
         $userSql = '';
         if($username != '') {
-            $userSql = ' username like "'.$username.'" and ';
+            $userSql = ' username like "'.$username.'" ';
         }
         //$userSql .= 'is_locked=0 and is_login=1';
 
         $user_items = $this->my->getChildren($userSql);
-        if($this->my->username == '6002')
-            $user_items = $this->my->getChildren($userSql,1);
         $user_rows = array();
         $sum_total = array();
         $sum_total[0] = '';

From 84961c2902a3959c1757c86fad0c1288643457db Mon Sep 17 00:00:00 2001
From: zengchaoxin <zengchaoxin@gmail.com>
Date: Mon, 9 Dec 2019 15:27:55 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=91=BC=E5=8F=AB?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/libs/MyLib.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/common/libs/MyLib.php b/common/libs/MyLib.php
index eb1b026..24a3ade 100644
--- a/common/libs/MyLib.php
+++ b/common/libs/MyLib.php
@@ -304,13 +304,28 @@ class MyLib {
             $cn = '号码查询接口超时';
         }elseif($cx=='BLACK') {
             $cn = '黑名单号码';
+        }elseif($cx=='YKT_BLACK') {
+            $cn = '平台黑名单';
         }elseif($cx=='TP_ERROR') {
             $cn = '号码查询接口解析错误';
-
+        }elseif($cx=='NO_URL_QUERY') {
+            $cn = '企业未配置查询接口';
         }elseif($cx=='CALLED_BLACK') {
             $cn = '被叫不支持';
         }elseif($cx=='CALL_FORWARD') {
             $cn = '呼叫转移';
+        }elseif($cx=='B_DISABLED') {
+            $cn = '企业账户异常';
+        }elseif($cx=='N_DISABLED') {
+            $cn = '号码异常，本次通话虚号异常(被投诉或其他原因)，已冻结 ';
+        }elseif($cx=='HIGH_FREQUENCY') {
+            $cn = '高频呼叫标识';
+        }elseif($cx=='CS_ILLEGAL') {
+            $cn = '主显号码不支持，显示号码(被叫来电号码)不支持';
+        }elseif($cx=='INSUFFICIENT') {
+            $cn = '企业余额不足';
+        }elseif($cx=='CALLED_RISKY') {
+            $cn = '被叫存在风险';
         }elseif($cx=='OTHER') {
             $cn = '其他失败情形';
         }