Skip to content

U
uni-pdtravel
Switch branch/tag
  1. 20 Aug, 2021 6 commits
    • 潘永坪's avatar
      Merge remote-tracking branch 'remotes/origin/zhoucong' into develop · da8fc854
      潘永坪 authored 
      # Conflicts:
#	pages/index/index.vue
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/vlog/myVlog/myVlog.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/vlog/photoAlbum/photoAlbum.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/vlog/scenicList/scenicList.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/vlog/share/share.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
      da8fc854
    • 潘永坪's avatar
      代码合并 · a1a26891
      潘永坪 authored
      a1a26891
    • 潘永坪's avatar
      合并代码 · 9d4fd8f1
      潘永坪 authored
      9d4fd8f1
    • cc_inu's avatar
      vlog相册静态页面 · ce564048
      cc_inu authored
      ce564048
    • 潘永坪'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
    • 潘永坪's avatar
      项目合并 · 62809b41
      潘永坪 authored
      62809b41
  3. 18 Aug, 2021 2 commits
  5. 12 Aug, 2021 1 commit
  7. 09 Aug, 2021 7 commits
    • zhoucong's avatar
      Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into zhoucong · fa7ebe9d
      zhoucong authored 
      # Conflicts:
#	common/common.js
#	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/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/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-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-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.wxml
#	unpackage/dist/dev/mp-weixin/pages/login/login.js
#	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/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/share/share.json
#	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/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
      fa7ebe9d
    • zhoucong's avatar
      vlog · 43756a07
      zhoucong authored
      43756a07
    • zhoucong's avatar
      vlog调接口 · 20480cd5
      zhoucong authored
      20480cd5
    • 潘永坪's avatar
      三峡博物馆bug处理 · 5fa51d88
      潘永坪 authored
      5fa51d88
    • zhoucong's avatar
      123 · 5ff7840d
      zhoucong authored
      5ff7840d
    • zhoucong's avatar
      vlog · ca45e67b
      zhoucong authored
      ca45e67b
    • 潘永坪's avatar
      登录公共Js · a22ecb8d
      潘永坪 authored
      a22ecb8d
  9. 06 Aug, 2021 1 commit
  11. 05 Aug, 2021 1 commit
  13. 04 Aug, 2021 1 commit
  15. 03 Aug, 2021 1 commit
  17. 02 Aug, 2021 1 commit
  19. 30 Jul, 2021 5 commits
    • zhoucong's avatar
      添加分享功能 · a0143ecc
      zhoucong authored
      a0143ecc
    • zhoucong's avatar
      新建分支 · 68fb5dbf
      zhoucong authored
      68fb5dbf
    • 潘永坪's avatar
      冲突解决 · 6833ae2a
      潘永坪 authored
      6833ae2a
    • 潘永坪'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
    • 潘永坪's avatar
      支付宝小程序开发 · a2870eca
      潘永坪 authored
      a2870eca
  21. 29 Jul, 2021 1 commit
  23. 28 Jul, 2021 1 commit
  25. 27 Jul, 2021 2 commits
  27. 26 Jul, 2021 1 commit
  29. 23 Jul, 2021 2 commits
  31. 22 Jul, 2021 2 commits
  33. 03 Jul, 2021 1 commit
  35. 29 Jun, 2021 1 commit
  37. 25 Jun, 2021 1 commit
  39. 22 Jun, 2021 1 commit
  41. 21 Jun, 2021 1 commit