Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

hdw

2019-01-10 977715c1467694dd81a4015fdaab5f0e2aec45a4

 gx_tieta/WebRoot/test-voice.html

@@ -31,7 +31,7 @@
      Voice.prototype.play = function(txt) {

         if(!this.zh_CN) {

            if(layer) {

               layer.msg('');

               layer.msg('你的电脑不支持中文播报！');

            }else {

               alert('你的电脑不支持中文播报！');

            }