Эх сурвалжийг харах

Merge branch 'dev2.8.5' of http://192.168.3.207:10080/qmx/jy into dev2.8.5

xuzhiheng 5 жил өмнө
parent
commit
524800e6c0

+ 1 - 1
src/web/templates/weixin/historypush.html

@@ -348,7 +348,7 @@
 				if(obj.matchkeys!=undefined&&obj.matchkeys!=null&&obj.matchkeys!=""){
 					_words = obj.matchkeys;
 				}
-				if(_words.length>0){
+				if(_words!=null&&_words.length>0){
 					for(var n=0;n<_words.length;n++){
 						var keysTemp = _words[n].split("+");
 						for(var m=0;m<keysTemp.length;m++){