• 潘永坪's avatar
    Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop · 7d249d47
    潘永坪 authored
    # Conflicts:
    #	common/request.js
    #	pages.json
    #	pages/index/index.vue
    #	unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/components/orderCoupon.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/pages/dingzhi/dingzhi.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/pages/hotel/hotel.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/pages/nearby/nearby.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/pages/orderPayment/orderPayment.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/pages/ourPayment/ourPayment.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/restaurant.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/pages/scenic/scenic.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/pages/special/special.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/pages/travelOne/travelOne.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/pages/travelTwo/travelTwo.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-mask/u-mask.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-popup/u-popup.js.map
    #	unpackage/dist/dev/mp-weixin/app.json
    #	unpackage/dist/dev/mp-weixin/common/vendor.js
    #	unpackage/dist/dev/mp-weixin/pages/index/index.wxml
    #	unpackage/dist/dev/mp-weixin/pages/ourPayment/ourPayment.js
    7d249d47