Commits · 01c8b27e022717f7b831ab2b665eb64bc205cac1 · marketing-web / marketing · GitLab

01 Sep, 2022 4 commits
- fix: 编辑员工取消手机校验 · 01c8b27e
  huaying authored Sep 01, 2022
  
  01c8b27e Browse Files
- update: 奥莱抵金券 · b15a7c32
  caoyanzhi authored Sep 01, 2022
  
  b15a7c32 Browse Files
- Merge branch 'feature/8月-奥莱定制' of http://git.gicdev.com/marketing-web/marketing… · dd929b75
```
Merge branch 'feature/8月-奥莱定制' of http://git.gicdev.com/marketing-web/marketing into feature/8月-奥莱定制
```
  caoyanzhi authored Sep 01, 2022
  dd929b75 Browse Files
- update: 奥莱抵金券 · 16a149f0
  caoyanzhi authored Sep 01, 2022
  
  16a149f0 Browse Files
31 Aug, 2022 9 commits
- fix: 新增门店提示信息 · 9b5dfa4d
  huaying authored Aug 31, 2022
  
  9b5dfa4d Browse Files
- fix: 门店核销导出类型修改 · 1b7354d8
  huaying authored Aug 31, 2022
  
  1b7354d8 Browse Files
- update: 奥莱抵金券 · 4c7a1f5f
  caoyanzhi authored Aug 31, 2022
  
  4c7a1f5f Browse Files
- fix: dd · a35cdd77
  huaying authored Aug 31, 2022
  
  a35cdd77 Browse Files
- fix: 核销弹框ui · 7a68cfd6
  huaying authored Aug 31, 2022
  
  7a68cfd6 Browse Files
- fix: 核销记录 · 7355f662
  huaying authored Aug 31, 2022
  
  7355f662 Browse Files
- Merge branch 'feature/8月-奥莱定制' of http://git.gicdev.com/marketing-web/marketing… · 53e326b6
```
Merge branch 'feature/8月-奥莱定制' of http://git.gicdev.com/marketing-web/marketing into feature/8月-奥莱定制
```
  caoyanzhi authored Aug 31, 2022
  53e326b6 Browse Files
- update: 成本金额调整 · 7f023b82
  caoyanzhi authored Aug 31, 2022
  
  7f023b82 Browse Files
- fix: 核销二维码链接修改 · 997da883
  huaying authored Aug 31, 2022
  
  997da883 Browse Files
30 Aug, 2022 9 commits
- fix: 选择门店禁用选择 · 0aa32766
  huaying authored Aug 30, 2022
  
  0aa32766 Browse Files
- Merge branch 'feature/8月-奥莱定制' of http://git.gicdev.com/marketing-web/marketing… · feeb1e19
```
Merge branch 'feature/8月-奥莱定制' of http://git.gicdev.com/marketing-web/marketing into feature/8月-奥莱定制
```
  caoyanzhi authored Aug 30, 2022
  feeb1e19 Browse Files
- update: 修复bug · e6e661cc
  caoyanzhi authored Aug 30, 2022
  
  e6e661cc Browse Files
- fix: 核销记录明细路径 · 5ad1f888
  huaying authored Aug 30, 2022
  
  5ad1f888 Browse Files
- update: 奥莱抵金券 · 019e5b00
  caoyanzhi authored Aug 30, 2022
  
  019e5b00 Browse Files
- fix: 导出数据 · d69efeab
  huaying authored Aug 30, 2022
  
  d69efeab Browse Files
- fix: 核销记录 · c496fa69
  huaying authored Aug 30, 2022
  
  c496fa69 Browse Files
- update: 奥莱抵金券 · 500bc022
  caoyanzhi authored Aug 30, 2022
  
  500bc022 Browse Files
- update: 奥莱抵金券 · d6304bfc
  caoyanzhi authored Aug 30, 2022
  
  d6304bfc Browse Files
29 Aug, 2022 2 commits
- update: 奥莱抵金券 · 67b6e453
  caoyanzhi authored Aug 29, 2022
  
  67b6e453 Browse Files
- update: 奥莱抵金券 · 1f798fcb
  caoyanzhi authored Aug 29, 2022
  
  1f798fcb Browse Files
26 Aug, 2022 3 commits
- update: 奥莱抵金券 · eb90b805
  caoyanzhi authored Aug 26, 2022
  
  eb90b805 Browse Files
- fix: 新增员工手机号重复判断 · 2f4f0384
  huaying authored Aug 26, 2022
  
  2f4f0384 Browse Files
- fix: 核销门店新增员工手机号这是你还是修改，列表删除气泡框样式局部修改 · 265ea240
  huaying authored Aug 26, 2022
  
  265ea240 Browse Files
25 Aug, 2022 2 commits
- fix: 核销记录 · 74bf2582
  huaying authored Aug 25, 2022
  
  74bf2582 Browse Files
- fix: 核销门店，核销记录 · 2aefd7f1
  huaying authored Aug 25, 2022
  
  2aefd7f1 Browse Files
23 Aug, 2022 10 commits
- fix: 核销门店 · 9dd4ce79
  huaying authored Aug 23, 2022
  
  9dd4ce79 Browse Files
- fix: dd · 7c5c6ca2
  huaying authored Aug 23, 2022
  
  7c5c6ca2 Browse Files
- update: 卡券选择类型 · a79fb4ef
  caoyanzhi authored Aug 23, 2022
  
  a79fb4ef Browse Files
- update: 卡券报表调整 · 44430f0a
  caoyanzhi authored Aug 23, 2022
  
  44430f0a Browse Files
- update: 卡券列表调整 · 4b93f91d
  caoyanzhi authored Aug 23, 2022
  
  4b93f91d Browse Files
- Merge branch 'feature/8月-奥莱抵金券' into feature/8月-奥莱定制 · f753474f
```
# Conflicts:
#	src/service/api/cardApi.js
```
  caoyanzhi authored Aug 23, 2022
  f753474f Browse Files
- update: 接口修改 · 3fbe0da8
  caoyanzhi authored Aug 23, 2022
  
  3fbe0da8 Browse Files
- update: 奥莱抵金券 · 580d0404
  caoyanzhi authored Aug 23, 2022
  
  580d0404 Browse Files
- fix: 核销门店 · 775cffe3
  huaying authored Aug 23, 2022
  
  775cffe3 Browse Files
- update: 奥莱抵金券 · 407b9a93
  caoyanzhi authored Aug 23, 2022
  
  407b9a93 Browse Files
20 Aug, 2022 1 commit
- update: 奥莱抵金券 · 5425978f
  caoyanzhi authored Aug 20, 2022
  
  5425978f Browse Files