Commits · 87cf6186fe6140a81dd8f27d6367941aad60d7d3 · 罗超 / SuperMan

02 Jul, 2019 18 commits
- 酒店显示样式修改 · 87cf6186
  黄奎 authored Jul 02, 2019
  
  87cf6186
- 酒店显示优化样式修改 · ab2dbfd2
  黄奎 authored Jul 02, 2019
  
  ab2dbfd2
- 页面修改 · ed9fb2a2
  黄奎 authored Jul 02, 2019
  
  ed9fb2a2
- 页面修改 · c23005e4
  黄奎 authored Jul 02, 2019
  
  c23005e4
- 酒店弹窗修改 · fc222a5c
  黄奎 authored Jul 02, 2019
  
  fc222a5c
- 样式修改 · 970c774e
  黄奎 authored Jul 02, 2019
  
  970c774e
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 42115bf3
  zhengke authored Jul 02, 2019
  
  42115bf3
- 修改跳转参数 · 872351f0
  zhengke authored Jul 02, 2019
  
  872351f0
- 行程特色修改 · f3115e56
  黄奎 authored Jul 02, 2019
  
  f3115e56
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · f2e208e5
  黄奎 authored Jul 02, 2019
  
  f2e208e5
- 页面修改 · 994b54c1
  黄奎 authored Jul 02, 2019
  
  994b54c1
- 付款类型增加地接预支款 · 5492fc0e
  liudong1993 authored Jul 02, 2019
  
  5492fc0e
- 页面修改 · f81b2151
  黄奎 authored Jul 02, 2019
  
  f81b2151
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 679e0c1d
  罗超 authored Jul 02, 2019
  
  679e0c1d
- 修改导航样式冲突 · 7c69a783
  罗超 authored Jul 02, 2019
  
  7c69a783
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 30f1af94
  huangyuanyuan authored Jul 02, 2019
  
  30f1af94
- update · 26252de9
  huangyuanyuan authored Jul 02, 2019
  
  26252de9
- 一键审批增加判断 · 9beb9c02
  zhengke authored Jul 02, 2019
  
  9beb9c02
01 Jul, 2019 8 commits
- 修改权限 · cde63df3
  zhengke authored Jul 01, 2019
  
  cde63df3
- 营收报表增加票务部专户 · dfa9d506
  liudong1993 authored Jul 01, 2019
  
  dfa9d506
- 修改 · a14bfb5a
  zhengke authored Jul 01, 2019
  
  a14bfb5a
- 修改 · 7fdf7899
  zhengke authored Jul 01, 2019
  
  7fdf7899
- 增加修改 · 8b09cb89
  zhengke authored Jul 01, 2019
  
  8b09cb89
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 62de6f87
  华国豪 authored Jul 01, 2019
  
  62de6f87
- 去掉手机号格式验证 · 9b9bdc4d
  华国豪 authored Jul 01, 2019
  
  9b9bdc4d
- 返佣比例默认值修改 · 83bf6a7e
  黄奎 authored Jul 01, 2019
  
  83bf6a7e
30 Jun, 2019 1 commit
- 页面修改 · 9e1c2ad1
  黄奎 authored Jun 30, 2019
  
  9e1c2ad1
28 Jun, 2019 13 commits
- 修改供应商样式 · 2aab64a4
  zhengke authored Jun 28, 2019
  
  2aab64a4
- 修改单据 · 5f5ceaba
  zhengke authored Jun 28, 2019
  
  5f5ceaba
- 解决导航栏问题 · 073ff849
  罗超 authored Jun 28, 2019
  
  073ff849
- 样式冲突 · e3dbae44
  罗超 authored Jun 28, 2019
  
  e3dbae44
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 2cbaf838
  华国豪 authored Jun 28, 2019
  
  2cbaf838
- 变色 · 8ee9fbbd
  华国豪 authored Jun 28, 2019
  
  8ee9fbbd
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · ed51c9d1
  罗超 authored Jun 28, 2019
  
  ed51c9d1
- 1、修改导航栏，用户信息卡，左侧导航风格 · 617ee6f2
  罗超 authored Jun 28, 2019
```
2、解决打开多个页面造成的遮挡和无法左右滚动的问题
```
  617ee6f2
- Merge branch 'master' of http://gitlab.oytour.com/luochao/superman · 6adf28b2
  黄奎 authored Jun 28, 2019
```
# Conflicts:
#	src/components/commonPage/commonHotelInfo.vue
```
  6adf28b2
- 页面修改 · 526355b4
  黄奎 authored Jun 28, 2019
  
  526355b4
- 清除打印. · 318e718f
  zhengke authored Jun 28, 2019
  
  318e718f
- 页面修改 · 34aa36a1
  黄奎 authored Jun 28, 2019
  
  34aa36a1
- 页面修改 · d27b1549
  黄奎 authored Jun 28, 2019
  
  d27b1549