Merge branch 'docker' of www.gitinn.com:proginn/proginn-frontend into docker

# Conflicts:
#	pages/kaifain/detail/_tid/index.vue
#	pages/user/_id/_type.vue
#	pages/user/add_article_collect/_cid.vue
#	pages/user/collect_article/_id/_type.vue
#	plugins/seoRouter.js