• 潘永坪's avatar
    Merge remote-tracking branch 'remotes/origin/zhoucong' into develop · 0e6bbf96
    潘永坪 authored
    # Conflicts:
    #	pages/index/index.vue
    #	unpackage/dist/build/mp-alipay/common/main.js
    #	unpackage/dist/build/mp-alipay/common/vendor.js
    #	unpackage/dist/build/mp-alipay/pages/combination/combiChoose/combiChoose.axml
    #	unpackage/dist/build/mp-alipay/pages/combination/combiChoose/combiChoose.js
    #	unpackage/dist/build/mp-alipay/pages/combination/distributionCombiChoose/distributionCombiChoose.axml
    #	unpackage/dist/build/mp-alipay/pages/combination/distributionCombiChoose/distributionCombiChoose.js
    #	unpackage/dist/build/mp-alipay/pages/index/index.axml
    #	unpackage/dist/build/mp-alipay/pages/index/index.js
    #	unpackage/dist/build/mp-alipay/pages/login/login.js
    #	unpackage/dist/build/mp-alipay/pages/login/login.json
    #	unpackage/dist/build/mp-alipay/pages/my/order/electronicTicket/electronicTicket.axml
    #	unpackage/dist/build/mp-alipay/pages/my/order/electronicTicket/electronicTicket.js
    #	unpackage/dist/build/mp-alipay/pages/orderPayment/orderPayment.js
    #	unpackage/dist/build/mp-alipay/pages/ourPayment/ourPayment.js
    #	unpackage/dist/build/mp-alipay/pages/paySuccess/paySuccess.js
    #	unpackage/dist/build/mp-weixin/app.json
    #	unpackage/dist/build/mp-weixin/common/main.js
    #	unpackage/dist/build/mp-weixin/common/vendor.js
    #	unpackage/dist/build/mp-weixin/pages/combination/combiChoose/combiChoose.js
    #	unpackage/dist/build/mp-weixin/pages/combination/distributionCombiChoose/distributionCombiChoose.js
    #	unpackage/dist/build/mp-weixin/pages/index/index.js
    #	unpackage/dist/build/mp-weixin/pages/index/index.wxml
    #	unpackage/dist/build/mp-weixin/pages/login/login.js
    #	unpackage/dist/build/mp-weixin/pages/login/login.json
    #	unpackage/dist/build/mp-weixin/pages/my/order/electronicTicket/electronicTicket.js
    #	unpackage/dist/build/mp-weixin/pages/orderPayment/orderPayment.js
    #	unpackage/dist/build/mp-weixin/pages/paySuccess/paySuccess.js
    #	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/VLOG/scenicList/scenicList.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/pages/VLOG/vlogIndex/vlogIndex.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/pages/VLOG/vlogList/vlogList.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/pages/VLOG/vlogface/vlogface.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/pages/combination/combiChoose/combiChoose.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/pages/combination/distributionCombiChoose/distributionCombiChoose.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/my/order/electronicTicket/electronicTicket.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/paySuccess/paySuccess.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/restaurant.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-button/u-button.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/.sourcemap/mp-weixin/uview-ui/components/u-search/u-search.js.map
    #	unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper/u-swiper.js.map
    #	unpackage/dist/dev/mp-alipay/common/main.js
    #	unpackage/dist/dev/mp-alipay/common/vendor.js
    #	unpackage/dist/dev/mp-alipay/components/orderCoupon.js
    #	unpackage/dist/dev/mp-alipay/pages/combination/combiChoose/combiChoose.axml
    #	unpackage/dist/dev/mp-alipay/pages/combination/combiChoose/combiChoose.js
    #	unpackage/dist/dev/mp-alipay/pages/combination/distributionCombiChoose/distributionCombiChoose.axml
    #	unpackage/dist/dev/mp-alipay/pages/combination/distributionCombiChoose/distributionCombiChoose.js
    #	unpackage/dist/dev/mp-alipay/pages/dingzhi/dingzhi.js
    #	unpackage/dist/dev/mp-alipay/pages/hotel/hotel.js
    #	unpackage/dist/dev/mp-alipay/pages/index/index.axml
    #	unpackage/dist/dev/mp-alipay/pages/index/index.js
    #	unpackage/dist/dev/mp-alipay/pages/login/login.js
    #	unpackage/dist/dev/mp-alipay/pages/login/login.json
    #	unpackage/dist/dev/mp-alipay/pages/my/order/electronicTicket/electronicTicket.axml
    #	unpackage/dist/dev/mp-alipay/pages/my/order/electronicTicket/electronicTicket.js
    #	unpackage/dist/dev/mp-alipay/pages/nearby/nearby.js
    #	unpackage/dist/dev/mp-alipay/pages/orderPayment/orderPayment.js
    #	unpackage/dist/dev/mp-alipay/pages/ourPayment/ourPayment.js
    #	unpackage/dist/dev/mp-alipay/pages/paySuccess/paySuccess.js
    #	unpackage/dist/dev/mp-alipay/pages/restaurant/restaurant.js
    #	unpackage/dist/dev/mp-alipay/pages/scenic/scenic.js
    #	unpackage/dist/dev/mp-alipay/pages/special/special.js
    #	unpackage/dist/dev/mp-alipay/pages/travelOne/travelOne.js
    #	unpackage/dist/dev/mp-alipay/pages/travelTwo/travelTwo.js
    #	unpackage/dist/dev/mp-alipay/pages/vlog/scenicList/scenicList.js
    #	unpackage/dist/dev/mp-alipay/pages/vlog/vlogIndex/vlogIndex.js
    #	unpackage/dist/dev/mp-alipay/pages/vlog/vlogList/vlogList.js
    #	unpackage/dist/dev/mp-alipay/pages/vlog/vlogface/vlogface.js
    #	unpackage/dist/dev/mp-alipay/uview-ui/components/u-button/u-button.js
    #	unpackage/dist/dev/mp-alipay/uview-ui/components/u-icon/u-icon.js
    #	unpackage/dist/dev/mp-alipay/uview-ui/components/u-mask/u-mask.js
    #	unpackage/dist/dev/mp-alipay/uview-ui/components/u-popup/u-popup.js
    #	unpackage/dist/dev/mp-alipay/uview-ui/components/u-search/u-search.js
    #	unpackage/dist/dev/mp-alipay/uview-ui/components/u-swiper/u-swiper.js
    #	unpackage/dist/dev/mp-weixin/common/main.js
    #	unpackage/dist/dev/mp-weixin/common/vendor.js
    #	unpackage/dist/dev/mp-weixin/components/orderCoupon.js
    #	unpackage/dist/dev/mp-weixin/pages/combination/combiChoose/combiChoose.js
    #	unpackage/dist/dev/mp-weixin/pages/combination/distributionCombiChoose/distributionCombiChoose.js
    #	unpackage/dist/dev/mp-weixin/pages/dingzhi/dingzhi.js
    #	unpackage/dist/dev/mp-weixin/pages/hotel/hotel.js
    #	unpackage/dist/dev/mp-weixin/pages/index/index.js
    #	unpackage/dist/dev/mp-weixin/pages/index/index.wxml
    #	unpackage/dist/dev/mp-weixin/pages/login/login.js
    #	unpackage/dist/dev/mp-weixin/pages/login/login.json
    #	unpackage/dist/dev/mp-weixin/pages/my/order/electronicTicket/electronicTicket.js
    #	unpackage/dist/dev/mp-weixin/pages/nearby/nearby.js
    #	unpackage/dist/dev/mp-weixin/pages/orderPayment/orderPayment.js
    #	unpackage/dist/dev/mp-weixin/pages/ourPayment/ourPayment.js
    #	unpackage/dist/dev/mp-weixin/pages/paySuccess/paySuccess.js
    #	unpackage/dist/dev/mp-weixin/pages/restaurant/restaurant.js
    #	unpackage/dist/dev/mp-weixin/pages/scenic/scenic.js
    #	unpackage/dist/dev/mp-weixin/pages/special/special.js
    #	unpackage/dist/dev/mp-weixin/pages/travelOne/travelOne.js
    #	unpackage/dist/dev/mp-weixin/pages/travelTwo/travelTwo.js
    #	unpackage/dist/dev/mp-weixin/pages/vlog/scenicList/scenicList.js
    #	unpackage/dist/dev/mp-weixin/pages/vlog/vlogIndex/vlogIndex.js
    #	unpackage/dist/dev/mp-weixin/pages/vlog/vlogList/vlogList.js
    #	unpackage/dist/dev/mp-weixin/pages/vlog/vlogface/vlogface.js
    #	unpackage/dist/dev/mp-weixin/project.config.json
    #	unpackage/dist/dev/mp-weixin/project.private.config.json
    #	unpackage/dist/dev/mp-weixin/uview-ui/components/u-button/u-button.js
    #	unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.js
    #	unpackage/dist/dev/mp-weixin/uview-ui/components/u-mask/u-mask.js
    #	unpackage/dist/dev/mp-weixin/uview-ui/components/u-popup/u-popup.js
    #	unpackage/dist/dev/mp-weixin/uview-ui/components/u-search/u-search.js
    #	unpackage/dist/dev/mp-weixin/uview-ui/components/u-swiper/u-swiper.js
    0e6bbf96
photoAlbum.js 28.6 KB