Commits · d746a31fd5c51dbad090792e68211674ce46b157 · 石盼盼 / wandouchengzhang_coach

19 Nov, 2020 9 commits
- Merge branch 'master' of... · d746a31f
  吴颖 authored Nov 19, 2020
```
Merge branch 'master' of http://gitlab.xueyoubangedu.com/shipanpan/wandouchengzhang_coach into wuying
```
  d746a31f
- '修改图表' · 1d15f88a
  吴颖 authored Nov 19, 2020
  
  1d15f88a
- Merge branch 'wuying' into 'master' · 9a056033
  吴颖 authored Nov 19, 2020
```
Wuying

See merge request !25
```
  9a056033
- 'test' · 4c5206b3
  吴颖 authored Nov 19, 2020
  
  4c5206b3
- Merge branch 'master' of... · b747158a
  吴颖 authored Nov 19, 2020
```
Merge branch 'master' of http://gitlab.xueyoubangedu.com/shipanpan/wandouchengzhang_coach into wuying
```
  b747158a
- '修改图表样式' · a56998c5
  吴颖 authored Nov 19, 2020
  
  a56998c5
- Merge branch 'wuying' into 'master' · efecb7d9
  吴颖 authored Nov 19, 2020
```
Wuying

See merge request !24
```
  efecb7d9
- '修改页面样式' · 89e69734
  吴颖 authored Nov 19, 2020
  
  89e69734
- '登录逻辑修改' · 06302ddb
  吴颖 authored Nov 19, 2020
  
  06302ddb
18 Nov, 2020 9 commits
- Merge branch 'shipanpan' into 'master' · 0638fde5
  石盼盼 authored Nov 18, 2020
```
保存教练评语及各项分数接口对接，家长回复，城市列表，科目列表接口对接

See merge request !23
```
  0638fde5
- Merge branch 'master' into 'shipanpan' · cb491479
  石盼盼 authored Nov 18, 2020
```
# Conflicts:
#   pages/index/classDetail/classDetail.wxml
```
  cb491479
- 保存教练评语及各项分数接口对接，家长回复，城市列表，科目列表接口对接 · 5849d048
  石盼盼 authored Nov 18, 2020
  
  5849d048
- Merge branch 'wuying' into 'master' · bea76c16
  吴颖 authored Nov 18, 2020
```
Wuying

See merge request !22
```
  bea76c16
- Merge branch 'master' of... · 1856b420
  吴颖 authored Nov 18, 2020
```
Merge branch 'master' of http://gitlab.xueyoubangedu.com/shipanpan/wandouchengzhang_coach into wuying
```
  1856b420
- '教练端登录逻辑' · c1e60d11
  吴颖 authored Nov 18, 2020
  
  c1e60d11
- Merge branch 'wuying' into 'master' · e6e94808
  吴颖 authored Nov 18, 2020
```
Wuying

See merge request !21
```
  e6e94808
- Merge branch 'master' of... · 885f0058
  吴颖 authored Nov 18, 2020
```
Merge branch 'master' of http://gitlab.xueyoubangedu.com/shipanpan/wandouchengzhang_coach into wuying
```
  885f0058
- 'test' · babbfb44
  吴颖 authored Nov 18, 2020
  
  babbfb44
17 Nov, 2020 2 commits
- Merge branch 'shipanpan' into 'master' · c7015f20
  石盼盼 authored Nov 17, 2020
```
运动评价页面，获取课程评价维度接口对接

See merge request !20
```
  c7015f20
- 运动评价页面，获取课程评价维度接口对接 · f6534210
  石盼盼 authored Nov 17, 2020
  
  f6534210
16 Nov, 2020 4 commits
- Merge branch 'shipanpan' into 'master' · 82569283
  石盼盼 authored Nov 16, 2020
```
抢班逻辑修改

See merge request !19
```
  82569283
- 抢班逻辑修改 · 4def512e
  石盼盼 authored Nov 16, 2020
  
  4def512e
- Merge branch 'shipanpan' into 'master' · bbc56e0b
  石盼盼 authored Nov 16, 2020
```
颁发徽章跟删除徽章

See merge request !18
```
  bbc56e0b
- 颁发徽章跟删除徽章 · 57b40dee
  石盼盼 authored Nov 16, 2020
  
  57b40dee
15 Nov, 2020 2 commits
- Merge branch 'shipanpan' into 'master' · 0836c0c1
  石盼盼 authored Nov 15, 2020
```
所有徽章接口对接，所有徽章页面

See merge request !17
```
  0836c0c1
- 所有徽章接口对接，所有徽章页面 · fb858ca5
  石盼盼 authored Nov 15, 2020
  
  fb858ca5
14 Nov, 2020 10 commits
- Merge branch 'wuying' into 'master' · 0bd41f81
  吴颖 authored Nov 14, 2020
```
Wuying

See merge request !16
```
  0bd41f81
- Merge branch 'master' of... · a9610b92
  吴颖 authored Nov 14, 2020
```
Merge branch 'master' of http://gitlab.xueyoubangedu.com/shipanpan/wandouchengzhang_coach into wuying
```
  a9610b92
- '签到限制，课程瞬间限制' · b7288cfd
  吴颖 authored Nov 14, 2020
  
  b7288cfd
- Merge branch 'shipanpan' into 'master' · 148f8a64
  石盼盼 authored Nov 14, 2020
```
列表页逻辑修改

See merge request !15
```
  148f8a64
- 列表页逻辑修改 · 2fc9f9bf
  石盼盼 authored Nov 14, 2020
  
  2fc9f9bf
- Merge branch 'wuying' into 'master' · c705a8fc
  吴颖 authored Nov 14, 2020
```
Wuying

See merge request !14
```
  c705a8fc
- Merge branch 'master' of... · 000a0252
  吴颖 authored Nov 14, 2020
```
Merge branch 'master' of http://gitlab.xueyoubangedu.com/shipanpan/wandouchengzhang_coach into wuying
```
  000a0252
- '修改页面' · 1d42ef92
  吴颖 authored Nov 14, 2020
  
  1d42ef92
- Merge branch 'shipanpan' into 'master' · fa5b3e45
  石盼盼 authored Nov 14, 2020
```
修改

See merge request !13
```
  fa5b3e45
- 修改 · 7ddf9a7f
  石盼盼 authored Nov 14, 2020
  
  7ddf9a7f
13 Nov, 2020 4 commits
- Merge branch 'shipanpan' into 'master' · a2930aee
  石盼盼 authored Nov 13, 2020
```
徽章接口对接，样式修改

See merge request !12
```
  a2930aee
- 徽章接口对接，样式修改 · 679acf37
  石盼盼 authored Nov 13, 2020
  
  679acf37
- Merge branch 'wuying' into 'master' · c841221f
  吴颖 authored Nov 13, 2020
```
Wuying

See merge request !11
```
  c841221f
- Merge branch 'master' of... · e7db421b
  吴颖 authored Nov 13, 2020
```
Merge branch 'master' of http://gitlab.xueyoubangedu.com/shipanpan/wandouchengzhang_coach into wuying
```
  e7db421b