Commits · 3ff4b65b471e9e8fe83fce43b0333e6ee0a96ce1 · zhengke / jz_Travel

21 Feb, 2025 11 commits
- 修改优惠 · 3ff4b65b
  罗超 authored Feb 21, 2025
  
  3ff4b65b
- Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel · 97a362a1
  罗超 authored Feb 21, 2025
  
  97a362a1
- 修改机票样式 · f5e781bb
  罗超 authored Feb 21, 2025
  
  f5e781bb
- 修复优惠券bug · 9c9a8453
  youjie authored Feb 21, 2025
  
  9c9a8453
- 优化叠加券 · 21929922
  youjie authored Feb 21, 2025
  
  21929922
- 修复bug · 086ce084
  youjie authored Feb 21, 2025
  
  086ce084
- 叠加券优化 · 77a9e36b
  youjie authored Feb 21, 2025
  
  77a9e36b
- 优惠券 · b0a96eb9
  youjie authored Feb 21, 2025
  
  b0a96eb9
- Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel · b9eb6016
  youjie authored Feb 21, 2025
```
# Conflicts:
#	components/coupon/index.vue
```
  b9eb6016
- 修复叠加优惠券 · 68f22e39
  youjie authored Feb 21, 2025
  
  68f22e39
- 修改样式 · 6251094e
  罗超 authored Feb 21, 2025
  
  6251094e
20 Feb, 2025 12 commits
- 修改样式 · 9d41d1be
  罗超 authored Feb 20, 2025
  
  9d41d1be
- Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel · 08659106
  罗超 authored Feb 20, 2025
```
# Conflicts:
#	components/coupon/index.vue
#	pages/jiuzhai/jz_Reserve.vue
```
  08659106
- 完成机票 · 81450a70
  罗超 authored Feb 20, 2025
  
  81450a70
- 优化 · 96a4d94f
  youjie authored Feb 20, 2025
  
  96a4d94f
- 优化样式 · 836b0263
  youjie authored Feb 20, 2025
  
  836b0263
- 优化样式 · 75cd4dd0
  youjie authored Feb 20, 2025
  
  75cd4dd0
- 优化签证首单 · ef251795
  youjie authored Feb 20, 2025
  
  ef251795
- 叠加使用优惠券 · 5af38f54
  youjie authored Feb 20, 2025
  
  5af38f54
- 修复选项 bug · b814f151
  youjie authored Feb 20, 2025
  
  b814f151
- 修复bug · 2efc8099
  youjie authored Feb 20, 2025
  
  2efc8099
- no message · 100b4ffe
  youjie authored Feb 20, 2025
  
  100b4ffe
- 下载签证文件 · edb6452a
  youjie authored Feb 20, 2025
  
  edb6452a
19 Feb, 2025 4 commits
- 签证 · d6f3ca9e
  youjie authored Feb 19, 2025
  
  d6f3ca9e
- 修复bug · 01cecd5d
  youjie authored Feb 19, 2025
  
  01cecd5d
- Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel · 8a468cf3
  罗超 authored Feb 19, 2025
  
  8a468cf3
- 机票 · f0f72ffb
  罗超 authored Feb 19, 2025
  
  f0f72ffb
18 Feb, 2025 13 commits
- 签证订单 · 56b7e3c6
  youjie authored Feb 18, 2025
  
  56b7e3c6
- Merge branch 'visaOrder' · 70c9f152
  youjie authored Feb 18, 2025
  
  70c9f152
- no message · a3516f28
  youjie authored Feb 18, 2025
  
  a3516f28
- no message · f3c519bd
  youjie authored Feb 18, 2025
  
  f3c519bd
- no message · d14a1a7b
  youjie authored Feb 18, 2025
  
  d14a1a7b
- no message · 73586a28
  youjie authored Feb 18, 2025
  
  73586a28
- no message · 609a0a58
  youjie authored Feb 18, 2025
  
  609a0a58
- no message · 74fbf31d
  youjie authored Feb 18, 2025
  
  74fbf31d
- no message · 6b8e0267
  youjie authored Feb 18, 2025
  
  6b8e0267
- no message · 9798c1a0
  youjie authored Feb 18, 2025
  
  9798c1a0
- no message · 8fdfc077
  youjie authored Feb 18, 2025
  
  8fdfc077
- no message · 2d91ee06
  youjie authored Feb 18, 2025
  
  2d91ee06
- 签证订单 · c1fa2ee8
  youjie authored Feb 18, 2025
  
  c1fa2ee8