主页面存在登录框无法弹出的问题
主页面存在登录框无法弹出的问题
Merge branch 'master' of https://github.com/QingFlye/production

Conflicts:
	entry/kingsoft/1.0--index.html
	entry/kingsoft/personal.html
	src/common/header.less
	src/common/layout.less
	src/kingsoft/css/img/avatar-1.JPG
	src/kingsoft/css/index.less
	src/kingsoft/css/personal.less
	src/kingsoft/js/index.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	entry/kingsoft/personal.html
	src/kingsoft/css/img/avatar-1.JPG
	src/kingsoft/css/index.less
	src/kingsoft/css/personal.less
	src/kingsoft/js/index.js
Merge branch 'master' of https://github.com/QingFlye/production

Conflicts:
	entry/kingsoft/1.0--index.html
	entry/kingsoft/personal.html
	src/common/header.less
	src/common/layout.less
	src/kingsoft/css/img/avatar-1.JPG
	src/kingsoft/css/index.less
	src/kingsoft/css/personal.less
	src/kingsoft/js/index.js