Commits · eeca550a8872cb93bbd895140e1194f38c05b97a · panyongping / uni-pdtravel

30 Aug, 2021 1 commit
- 券接口修改 · eeca550a
  潘永坪 authored Aug 30, 2021
  
  eeca550a
25 Aug, 2021 1 commit
- bug处理 · 3055ff3e
  潘永坪 authored Aug 25, 2021
  
  3055ff3e
20 Aug, 2021 6 commits

Merge remote-tracking branch 'remotes/origin/zhoucong' into develop · da8fc854

潘永坪 authored Aug 20, 2021

# 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

代码合并 · a1a26891
潘永坪 authored Aug 20, 2021

a1a26891
合并代码 · 9d4fd8f1
潘永坪 authored Aug 20, 2021

9d4fd8f1
vlog相册静态页面 · ce564048
cc_inu authored Aug 20, 2021

ce564048

Merge remote-tracking branch 'remotes/origin/zhoucong' into develop · 0e6bbf96

潘永坪 authored Aug 20, 2021

# 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

项目合并 · 62809b41
潘永坪 authored Aug 20, 2021

62809b41

18 Aug, 2021 2 commits
- 支付宝登录传参 · 94cd8fc7
  潘永坪 authored Aug 18, 2021
  
  94cd8fc7
- 支付宝小程序开发 · 265edc7b
  潘永坪 authored Aug 18, 2021
  
  265edc7b
12 Aug, 2021 1 commit
- 三峡博物馆开发 · 2766f0ba
  潘永坪 authored Aug 12, 2021
  
  2766f0ba
09 Aug, 2021 7 commits

Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into zhoucong · fa7ebe9d

zhoucong authored Aug 09, 2021

# 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

vlog · 43756a07
zhoucong authored Aug 09, 2021

43756a07
vlog调接口 · 20480cd5
zhoucong authored Aug 09, 2021

20480cd5
三峡博物馆bug处理 · 5fa51d88
潘永坪 authored Aug 09, 2021

5fa51d88
123 · 5ff7840d
zhoucong authored Aug 09, 2021

5ff7840d
vlog · ca45e67b
zhoucong authored Aug 09, 2021

ca45e67b
登录公共Js · a22ecb8d
潘永坪 authored Aug 09, 2021

a22ecb8d

06 Aug, 2021 1 commit
- vlog 静态页面修改 · b8d2604b
  zhoucong authored Aug 06, 2021
  
  b8d2604b
05 Aug, 2021 1 commit
- 扫码支付页面登录修改 · 8f224082
  潘永坪 authored Aug 05, 2021
  
  8f224082
04 Aug, 2021 1 commit
- 支付宝小程序关联二维码，和支付处理 · 50584994
  潘永坪 authored Aug 04, 2021
  
  50584994
03 Aug, 2021 1 commit
- 支付宝关联二维码开发 · f2658352
  潘永坪 authored Aug 03, 2021
  
  f2658352
02 Aug, 2021 1 commit
- 分享和播放 · b033a0ef
  zhoucong authored Aug 02, 2021
  
  b033a0ef
30 Jul, 2021 5 commits

添加分享功能 · a0143ecc
zhoucong authored Jul 30, 2021

a0143ecc
新建分支 · 68fb5dbf
zhoucong authored Jul 30, 2021

68fb5dbf
冲突解决 · 6833ae2a
潘永坪 authored Jul 30, 2021

6833ae2a

Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop · 7d249d47

潘永坪 authored Jul 30, 2021

# 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

支付宝小程序开发 · a2870eca
潘永坪 authored Jul 30, 2021

a2870eca

29 Jul, 2021 1 commit
- 支付宝小程序开发 · 651379ce
  潘永坪 authored Jul 29, 2021
  
  651379ce
28 Jul, 2021 1 commit
- vlog页面修改样式 · 3a7f85fb
  zhoucong authored Jul 28, 2021
  
  3a7f85fb
27 Jul, 2021 2 commits
- VLOG静态页面修改 · 441cc666
  zhoucong authored Jul 27, 2021
  
  441cc666
- 扫码支付页面修改 · 157f8015
  潘永坪 authored Jul 27, 2021
  
  157f8015
26 Jul, 2021 1 commit
- vlog 静态页面 · bb76acf7
  zhoucong authored Jul 26, 2021
  
  bb76acf7
23 Jul, 2021 2 commits
- Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop · 806c7a6f
  潘永坪 authored Jul 23, 2021
  
  806c7a6f
- 支付bug处理 · 359b76ec
  潘永坪 authored Jul 23, 2021
  
  359b76ec
22 Jul, 2021 2 commits
- 创建分支 · 89b11e3b
  zhoucong authored Jul 22, 2021
  
  89b11e3b
- 页面开发 · 8055bf48
  潘永坪 authored Jul 22, 2021
  
  8055bf48
03 Jul, 2021 1 commit
- 扫码支付页面开发 · 9da28b0e
  潘永坪 authored Jul 03, 2021
  
  9da28b0e
29 Jun, 2021 1 commit
- 扫码支付券开发 · 62ed1468
  潘永坪 authored Jun 29, 2021
  
  62ed1468
25 Jun, 2021 1 commit
- 支付页面开发 · f9191db2
  潘永坪 authored Jun 25, 2021
  
  f9191db2