Commits · d1273beece0860607a9ab0e2c2e83a7c8c41d4b0 · panyongping / uni-pdtravel

14 Sep, 2023 14 commits
- Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop · d1273bee
  qipeng authored Sep 14, 2023
  
  d1273bee
- 代码修改 · e174186e
  qipeng authored Sep 14, 2023
  
  e174186e
- 变量修改 · 57fd3cd6
  潘永坪 authored Sep 14, 2023
  
  57fd3cd6
- 文件还原 · 4fcda200
  qipeng authored Sep 14, 2023
```
解决CSS显示问题
```
  4fcda200
- Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop · c2cc19ff
  qipeng authored Sep 14, 2023
  
  c2cc19ff
- 还原版本 · 44d77aff
  qipeng authored Sep 14, 2023
  
  44d77aff
- 取号bug处理 · d8153cd2
  潘永坪 authored Sep 14, 2023
  
  d8153cd2
- BUG修复 · 415542f1
  qipeng authored Sep 14, 2023
  
  415542f1
- 删除verifyCode · 65b8e342
  qipeng authored Sep 14, 2023
  
  65b8e342
- 排号查询新增 thirdId 取值为thirdOrderId · 2b2a8638
  qipeng authored Sep 14, 2023
  
  2b2a8638
- 参数增加 · 60e35311
  潘永坪 authored Sep 14, 2023
  
  60e35311
- bug处理 · 4bedcc85
  潘永坪 authored Sep 14, 2023
  
  4bedcc85
- 时间增加 · bfc2ce72
  潘永坪 authored Sep 14, 2023
  
  bfc2ce72
- 1.相片选购页面增加判断若未勾选相片点击下单时提示请勾选相片 · 37e6f10b
  qipeng authored Sep 14, 2023
```
2.订单详情 当为OTA进入时显示 OTA的名称
```
  37e6f10b
13 Sep, 2023 6 commits
- OTA在线取号 · d4d89a13
  潘永坪 authored Sep 13, 2023
  
  d4d89a13
- Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop · c4046d0b
  潘永坪 authored Sep 13, 2023
```
# Conflicts:
#	pages/my/order/electronicTicket/electronicTicket-副本.vue
```
  c4046d0b
- 副本 · 5f20aa15
  qipeng authored Sep 13, 2023
  
  5f20aa15
- Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop · 373ca213
  潘永坪 authored Sep 13, 2023
  
  373ca213
- OTA取号开发 · 4fb4cde4
  潘永坪 authored Sep 13, 2023
  
  4fb4cde4
- 页面统一为QRCODE4 · ee98a1ce
  qipeng authored Sep 13, 2023
  
  ee98a1ce
11 Sep, 2023 5 commits
- 代码交换 · 0e4fcbdd
  qipeng authored Sep 11, 2023
  
  0e4fcbdd
- Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop · 0e072b0e
  qipeng authored Sep 11, 2023
  
  0e072b0e
- 优惠券显示修改 · a9aa5d94
  qipeng authored Sep 11, 2023
  
  a9aa5d94
- 组合票跳转修改 · 9de7d4dd
  潘永坪 authored Sep 11, 2023
  
  9de7d4dd
- 修改按钮和跳转 · e07e2db3
  qipeng authored Sep 11, 2023
  
  e07e2db3
08 Sep, 2023 1 commit
- 支付页面跳转优化 · 15bec41e
  潘永坪 authored Sep 08, 2023
  
  15bec41e
07 Sep, 2023 2 commits
- deductPrice 修改为 savedMoney · 47b5abb5
  qipeng authored Sep 07, 2023
  
  47b5abb5
- 参数增加 myCouponId · 0428354a
  qipeng authored Sep 07, 2023
  
  0428354a
06 Sep, 2023 6 commits
- 增加['isMerchant']=1 · f157ef97
  qipeng authored Sep 06, 2023
  
  f157ef97
- 修改相册首页进入逻辑 · 122173dc
  renjie authored Sep 06, 2023
  
  122173dc
- 修改相册首页扫码进入逻辑 · f318a2cf
  renjie authored Sep 06, 2023
  
  f318a2cf
- 个人中心分包处理 · 5b54046a
  潘永坪 authored Sep 06, 2023
  
  5b54046a
- 图片地址修改 · 1526a6f9
  qipeng authored Sep 06, 2023
  
  1526a6f9
- 个人中心分包 · ac4d03ff
  潘永坪 authored Sep 06, 2023
  
  ac4d03ff
05 Sep, 2023 6 commits
- Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop · 650acd9c
  qipeng authored Sep 05, 2023
  
  650acd9c
- wechatUser/pdFace/list 增加isOrder 0未购买 1已购买 · 32b73439
  qipeng authored Sep 05, 2023
  
  32b73439
- 组合票样式修改 · 5d8573fa
  潘永坪 authored Sep 05, 2023
  
  5d8573fa
- Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop · c4e53868
  潘永坪 authored Sep 05, 2023
  
  c4e53868
- 相册下单页当无法获取companyId则为‘’ · c81134a2
  qipeng authored Sep 05, 2023
  
  c81134a2
- 图片增加遮罩当总价格<0时显示为0 · 75e865c5
  qipeng authored Sep 05, 2023
  
  75e865c5