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

hdw

2018-11-21 5f155618a479d7a5456404a4893cc928e97a702c

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

            }