# Conflicts: # app.js # app.json # pages/navigation/index/add/add.js # pages/navigation/index/add/add.wxml # pages/navigation/index/add/camera/camera.js # pages/navigation/index/add/camera/camera.json # pages/navigation/index/add/camera/camera.wxml # pages/navigation/index/delete/delete.js # pages/navigation/index/delete/delete.wxml # pages/navigation/index/index.js # pages/navigation/index/index.wxml # pages/navigation/index/recommand/recommand.wxml # project.config.json