Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git ...

hdw

2018-12-18 0e1721488e6d8f091d13403e20f0bbf5cf397b96

 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('你的电脑不支持中文播报！');

            }