Merge branch 'wanfang' into webUI

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 = '其他失败情形';
         }

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] = '';

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(){
             //
         });