梁建民 / h5

# Conflicts:
#	.gitignore
#	view/0.js
#	view/1.js
#	view/10.js阿斯顿
#	view/11.js
#	view/12.js
#	view/13.js
#	view/14.js
#	view/15.js
#	view/16.js
#	view/17.js
#	view/18.js
#	view/19.js
#	view/2.js
#	view/20.js
#	view/21.js
#	view/22.js
#	view/23.js
#	view/24.js
#	view/25.js
#	view/26.js
#	view/27.js
#	view/28.js
#	view/29.js
#	view/3.js
#	view/30.js
#	view/31.js
#	view/32.js
#	view/33.js
#	view/34.js
#	view/35.js
#	view/36.js
#	view/37.js
#	view/38.js
#	view/4.js
#	view/5.js
#	view/6.js
#	view/7.js
#	view/8.js
#	view/9.js
#	view/app.js

# Conflicts:
#	view/css/chunk-375a2fa8.2ba08771.css
#	view/css/chunk-40d9be3a.d7e46390.css
#	view/css/chunk-5935c7ce.43c91bcb.css
#	view/css/chunk-8a32eaae.b6a6f279.css
#	view/css/chunk-9c7774ae.22356d82.css
#	view/css/chunk-b392abb4.35e6bd82.css
#	view/index.html
#	view/js/chunk-375a2fa8.10afcf93.js
#	view/js/chunk-8a32eaae.1fbef303.js

# Conflicts:
#	src/api/index.js

# Conflicts:
#	src/store/store.js

# Conflicts:
#	src/views/xianhuo/xianhuo.vue

# Conflicts:
#	view/index.html

# Conflicts:
#	view/index.html

# Conflicts:
#	view/0.js
#	view/1.js
#	view/10.js
#	view/11.js
#	view/12.js
#	view/13.js
#	view/14.js
#	view/15.js
#	view/16.js
#	view/17.js
#	view/18.js
#	view/19.js
#	view/2.js
#	view/20.js
#	view/21.js
#	view/22.js
#	view/23.js
#	view/24.js
#	view/25.js
#	view/26.js
#	view/27.js
#	view/28.js
#	view/29.js
#	view/3.js
#	view/30.js
#	view/31.js
#	view/32.js
#	view/4.js
#	view/5.js
#	view/6.js
#	view/7.js
#	view/8.js
#	view/9.js
#	view/app.js
#	view/index.html