# Conflicts: # api/public.js # config/app.js # config/cache.js # main.js # pages/goods_details/index.vue # pages/index/index.vue # pages/users/wechat_login/index.vue