解决demo页面js重复加载的问题。
Merge remote-tracking branch 'origin/dev' into dev