Skip to content

U
uni-pdtravel
Switch branch/tag
  1. 13 Oct, 2021 1 commit
  3. 29 Sep, 2021 2 commits
  5. 27 Sep, 2021 2 commits
  7. 24 Sep, 2021 2 commits
    • 潘永坪's avatar
      Merge remote-tracking branch 'remotes/origin/zhoucong' into develop · 890cf235
      潘永坪 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
      890cf235
    • 潘永坪's avatar
      Merge remote-tracking branch 'remotes/origin/zhoucong' into develop · 18a83bff
      潘永坪 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
      18a83bff
  9. 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
  11. 14 Sep, 2021 1 commit
    • zhoucong's avatar
      123 · 857a80e0
      zhoucong authored
      857a80e0
  13. 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
  15. 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
  17. 10 Sep, 2021 4 commits
  19. 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
  21. 07 Sep, 2021 1 commit
  23. 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
  25. 30 Aug, 2021 1 commit
  27. 25 Aug, 2021 1 commit
  29. 23 Aug, 2021 1 commit
  31. 20 Aug, 2021 4 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