# Conflicts: # pages/main/advancepayment/adPayHome.js # project.config.json
# Conflicts: # app.js # app.json # pages/main/advancepayment/adPayHome.js # pages/main/guide/guide.js # pages/main/guide/guide.wxml
# Conflicts: # pages/main/advancepayment/adPayHome.js