梁建民 / h5

# Conflicts:
#	view/21.js
js

# Conflicts:
#	view/16.js
#	view/19.js
#	view/21.js
#	view/app.js

# Conflicts:
#	view/css/chunk-0edcea18.5034e57d.css
#	view/css/chunk-79b5106e.5034e57d.css
#	view/css/chunk-970b7196.67dbed1a.css
#	view/css/chunk-a0b6442e.5034e57d.css
#	view/css/chunk-c8b9da7a.67dbed1a.css
#	view/css/chunk-db3bd67c.5034e57d.css
#	view/index.html
#	view/js/chunk-49ce0669.4c29b6fe.js
#	view/js/chunk-49ce0669.a379154b.js
#	view/js/chunk-80d07132.21661d39.js
#	view/js/chunk-970b7196.8dba1b30.js
#	view/js/chunk-a0b6442e.b1bf7d01.js
#	view/js/chunk-c8b9da7a.5a546318.js
#	view/js/chunk-db3bd67c.0ecb77ed.js