|
@@ -1890,18 +1890,21 @@
|
|
|
showTip("匹配成功,匹配词 " + r.matchKey, 6000);
|
|
|
} else {
|
|
|
var str = "";
|
|
|
- if (r.info != ""){
|
|
|
+ if (r.info != "" && r.info != null && r.info != undefined){
|
|
|
str = r.info
|
|
|
showTip(str, 6000);
|
|
|
return
|
|
|
}
|
|
|
if (r.allexcluedKey != "") {
|
|
|
str = "匹配失败,被全局排除词 "+ r.allexcluedKey + " 排除";
|
|
|
+ showTip(str, 6000);
|
|
|
+ return
|
|
|
}
|
|
|
if (r.excluedKey != "") {
|
|
|
str = "匹配失败,被排除词 "+ r.excluedKey + " 排除";
|
|
|
+ showTip(str, 6000);
|
|
|
+ return
|
|
|
}
|
|
|
- showTip(str, 6000);
|
|
|
}
|
|
|
}
|
|
|
})
|