Skip to content

U
uni-pdtravel
Switch branch/tag
  1. 26 Sep, 2021 1 commit
    • zhoucong's avatar
      123 · 4f05800f
      zhoucong authored
      4f05800f
  3. 15 Sep, 2021 4 commits
    • zhoucong's avatar
      123 · 4fa464e9
      zhoucong authored
      4fa464e9
    • zhoucong's avatar
      123 · 15e6f9ca
      zhoucong authored
      15e6f9ca
    • zhoucong's avatar
      123 · e24d9475
      zhoucong authored
      e24d9475
    • zhoucong's avatar
      123 · ec1c638d
      zhoucong authored
      ec1c638d
  5. 14 Sep, 2021 1 commit
    • zhoucong's avatar
      123 · 857a80e0
      zhoucong authored
      857a80e0
  7. 13 Sep, 2021 4 commits
    • zhoucong's avatar
      123 · ece4f8ec
      zhoucong authored
      ece4f8ec
    • zhoucong's avatar
      Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into zhoucong · c687c692
      zhoucong authored 
      # Conflicts:
#	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
      c687c692
    • zhoucong's avatar
      123 · 30cfdad1
      zhoucong authored
      30cfdad1
    • zhoucong's avatar
      123 · 73a109af
      zhoucong authored
      73a109af
  9. 11 Sep, 2021 5 commits
    • zhoucong's avatar
      123 · 580b16f0
      zhoucong authored
      580b16f0
    • 潘永坪's avatar
      Merge remote-tracking branch 'remotes/origin/zhoucong' into develop · c54574d0
      潘永坪 authored 
      # Conflicts:
#	pages/vlog/vlogface/vlogface.vue
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/vlog/myVlog/myVlog.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/vlog/scenicList/scenicList.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
      c54574d0
    • 潘永坪's avatar
      Merge remote-tracking branch 'remotes/origin/zhoucong' into develop · abc04410
      潘永坪 authored 
      # Conflicts:
#	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
      abc04410
    • zhoucong's avatar
      123 · 813a84d3
      zhoucong authored
      813a84d3
    • zhoucong's avatar
      优化vlog 流程 · 98f77daf
      zhoucong authored
      98f77daf
  11. 10 Sep, 2021 4 commits
  13. 09 Sep, 2021 4 commits
    • 潘永坪's avatar
      Merge remote-tracking branch 'remotes/origin/zhoucong' into develop · f6ddb163
      潘永坪 authored 
      # Conflicts:
#	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
      f6ddb163
    • zhoucong's avatar
      处理我的vlog bug · 237539b8
      zhoucong authored
      237539b8
    • 潘永坪's avatar
      券优化 · 30e54922
      潘永坪 authored
      30e54922
    • zhoucong's avatar
      vlog视频完成 · 9a899114
      zhoucong authored
      9a899114
  15. 07 Sep, 2021 1 commit
  17. 31 Aug, 2021 3 commits
    • 潘永坪's avatar
      Merge remote-tracking branch 'remotes/origin/zhoucong' into develop · daf3417b
      潘永坪 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
      daf3417b
    • 潘永坪's avatar
      bug处理 · aafab021
      潘永坪 authored
      aafab021
    • cc_inu's avatar
      vlog 界面优化 · fd416b15
      cc_inu authored
      fd416b15
  19. 30 Aug, 2021 1 commit
  21. 25 Aug, 2021 1 commit
  23. 23 Aug, 2021 1 commit
  25. 20 Aug, 2021 7 commits
    • cc_inu's avatar
      相册拖拽排序BUG处理 · 8e35f636
      cc_inu authored
      8e35f636
    • 潘永坪'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
  27. 18 Aug, 2021 2 commits
  29. 12 Aug, 2021 1 commit