Merge remote-tracking branch 'origin/webUi' 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 = '其他失败情形';
         }

common/models/PermissionsT.php

@@ -49,7 +49,7 @@ class PermissionsT extends \common\models\Base
 
     public function getMenus()
     {
-        return $this->hasMany(MenuT::class,['id'=>'menu_id'])
+        return $this->hasMany(MenuT::className(),['id'=>'menu_id'])
             ->viaTable('menu_permissions_t',['permissions_id'=>'id']);
     }
 }