修复客户端js报错的问题
Merge branches 'master' and 'master' of https://github.com/bigzhu/shuqian