Commits · 43d68142bc13a66c6c76da7d8171bb0a6f0a22d7 · youjj / cloud-platform-ui

05 Aug, 2019 1 commit
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify · 43d68142
  hanfeng authored Aug 05, 2019
  
  43d68142
03 Aug, 2019 4 commits
- 加一个判断 · 967a4fba
  denghr authored Aug 03, 2019
  
  967a4fba
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify · f75caf61
  hanfeng authored Aug 03, 2019
  
  f75caf61
- 修改会员录入,已核销的数据不能删除 · e2e6a728
  hanfeng authored Aug 03, 2019
  
  e2e6a728
- 预约信息 · 5d459770
  denghr authored Aug 03, 2019
  
  5d459770
02 Aug, 2019 5 commits
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify · 5a3cf766
  hanfeng authored Aug 02, 2019
  
  5a3cf766
- 修改新建会员 · 14b16c3e
  hanfeng authored Aug 02, 2019
  
  14b16c3e
- 删除的el-popover改成$confirm · ada48f20
  denghr authored Aug 02, 2019
  
  ada48f20
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify · 3864ff2e
  denghr authored Aug 02, 2019
  
  3864ff2e
- 首页 · ea9aa96b
  denghr authored Aug 02, 2019
  
  ea9aa96b
01 Aug, 2019 8 commits
- 操作列固定 · 48a63786
  lixy authored Aug 01, 2019
  
  48a63786
- 操作项固定 · a503d5e1
  lixy authored Aug 01, 2019
  
  a503d5e1
- 首页 · fc1a4b96
  denghr authored Aug 01, 2019
  
  fc1a4b96
- 123 · cb430117
  hezhen authored Aug 01, 2019
  
  cb430117
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify · 580ce5f9
  hezhen authored Aug 01, 2019
  
  580ce5f9
- 123 · f201ba17
  hezhen authored Aug 01, 2019
  
  f201ba17
- 排班列表 · ad5dd677
  lixy authored Aug 01, 2019
  
  ad5dd677
- 车辆排班作为首页 · 32d524ab
  denghr authored Aug 01, 2019
  
  32d524ab
31 Jul, 2019 10 commits
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify · 6b228177
  hanfeng authored Jul 31, 2019
```
# Conflicts:
#	src/router/index.js
#	src/views/admin/user/index.vue
```
  6b228177
- 修改后台用户管理 · 2cae7524
  hanfeng authored Jul 31, 2019
  
  2cae7524
- 路由 · 876f3491
  lixy authored Jul 31, 2019
  
  876f3491
- 预约信息 · 7f0ec141
  denghr authored Jul 31, 2019
  
  7f0ec141
- 车辆预约默认查询全部数据 · 26b5e150
  denghr authored Jul 31, 2019
  
  26b5e150
- 修改正式环境 · 5afefb0b
  denghr authored Jul 31, 2019
  
  5afefb0b
- 车辆预约信息 · 96b4f098
  denghr authored Jul 31, 2019
  
  96b4f098
- 修改用户列表下拉框 · 8d909f23
  hanfeng authored Jul 31, 2019
  
  8d909f23
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify · 8bc28350
  hanfeng authored Jul 31, 2019
  
  8bc28350
- 修改用户,取消设置会员中部分设置 · 8776841f
  hanfeng authored Jul 31, 2019
  
  8776841f
30 Jul, 2019 5 commits
- 修改接口 · f35b67f8
  denghr authored Jul 30, 2019
  
  f35b67f8
- 预定申请管理 · b8845593
  denghr authored Jul 30, 2019
  
  b8845593
- 权限管理 · 3ffcbeb3
  denghr authored Jul 30, 2019
  
  3ffcbeb3
- 添加会员管理的权限 · 2c3e19de
  denghr authored Jul 30, 2019
  
  2c3e19de
- 营地权限添加 · dd82d652
  lixy authored Jul 30, 2019
  
  dd82d652
29 Jul, 2019 7 commits
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify · 551bc583
  hanfeng authored Jul 29, 2019
  
  551bc583
- 修改用户列表 · c5fd20ac
  hanfeng authored Jul 29, 2019
  
  c5fd20ac
- 车辆排期管理-排班记录 · a79767d3
  lixy authored Jul 29, 2019
  
  a79767d3
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify · 94ae4dad
  hanfeng authored Jul 29, 2019
  
  94ae4dad
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify · 27534288
  hanfeng authored Jul 29, 2019
```
# Conflicts:
#	src/router/index.js
```
  27534288
- 修改用户列表 · 2bfb2f8b
  hanfeng authored Jul 29, 2019
  
  2bfb2f8b
- 头像 · 98697576
  lixy authored Jul 29, 2019
  
  98697576