Skip to content

U
uni-pdtravel
Switch branch/tag
  1. 18 Aug, 2021 2 commits
  3. 12 Aug, 2021 1 commit
  5. 09 Aug, 2021 2 commits
  7. 05 Aug, 2021 1 commit
  9. 04 Aug, 2021 1 commit
  11. 03 Aug, 2021 1 commit
  13. 30 Jul, 2021 3 commits
    • 潘永坪'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
  15. 29 Jul, 2021 1 commit
  17. 28 Jul, 2021 1 commit
  19. 27 Jul, 2021 2 commits
  21. 26 Jul, 2021 1 commit
  23. 23 Jul, 2021 2 commits
  25. 22 Jul, 2021 2 commits
  27. 03 Jul, 2021 1 commit
  29. 29 Jun, 2021 1 commit
  31. 25 Jun, 2021 1 commit
  33. 22 Jun, 2021 1 commit
  35. 21 Jun, 2021 1 commit
  37. 10 Jun, 2021 1 commit
  39. 09 Jun, 2021 1 commit
  41. 04 Jun, 2021 1 commit
  43. 03 Jun, 2021 1 commit
  45. 02 Jun, 2021 1 commit
  47. 26 May, 2021 1 commit
  49. 24 May, 2021 1 commit
  51. 19 May, 2021 1 commit
  53. 18 May, 2021 1 commit
  55. 10 May, 2021 1 commit