增加js提示
Merge branch 'master' into lichenxing