# Conflicts: # common/common.js # pages/index/index.vue
# Conflicts: # common/uni.css # pages.json
add index 首页 图片文件夹