梁建民 / h5

# Conflicts:
#	view/14.js

# Conflicts:
#	view/14.js

# Conflicts:
#	src/api/index.js
#	src/router.js
#	src/store/store.js
#	view/index.html