修复js无法显示中英文
Merge remote-tracking branch 're/master'