Merge branch 'release-2.14.0' into John/poc-mp-alipay

# Conflicts:
#	src/pages/parkingFee/mixins/parkingFee.js