Commits · 80670c9fed7165657ba21bb39f4a76761ab73153 · member / member

23 Aug, 2022 29 commits
- Merge branch 'feature/7月迭代-会员' into dev · 80670c9f
  caoyanzhi authored Aug 23, 2022
  
  80670c9f Browse Files
- update: 隐藏关联渠道 · 80777494
  caoyanzhi authored Aug 23, 2022
  
  80777494 Browse Files
- dist · e97f2749
  曾经 authored Aug 23, 2022
  
  e97f2749 Browse Files
- Merge branch 'feature/7月基础一异常冻结会员' into dev · 2b829c69
```
* feature/7月基础一异常冻结会员:
  图片更换
  距离调整
```
  曾经 authored Aug 23, 2022
  2b829c69 Browse Files
- 图片更换 · 02803e40
  曾经 authored Aug 23, 2022
  
  02803e40 Browse Files
- 距离调整 · 41c2efee
  曾经 authored Aug 23, 2022
  
  41c2efee Browse Files
- dist · 1f78ecb4
  曾经 authored Aug 23, 2022
  
  1f78ecb4 Browse Files
- Merge branch 'feature/7月基础一异常冻结会员' into dev · 146b3f65
```
* feature/7月基础一异常冻结会员:
  会员卡券核销
  table-sticky
  表单滚动到 报错的位置

# Conflicts:
#	src/components/wechatmembers/cardvoucher.vue
```
  曾经 authored Aug 23, 2022
  146b3f65 Browse Files
- 会员卡券核销 · 5ca11154
  曾经 authored Aug 23, 2022
  
  5ca11154 Browse Files
- table-sticky · 26e96050
  曾经 authored Aug 23, 2022
  
  26e96050 Browse Files
- 表单滚动到报错的位置 · 2c02a409
```
任务发起成功提示框icon替换

冻结弹窗按钮操作loading
```
  曾经 authored Aug 23, 2022
  2c02a409 Browse Files
- update: dist · c55b65a0
  caoyanzhi authored Aug 23, 2022
  
  c55b65a0 Browse Files
- Merge branch 'feature/7月迭代-会员' into dev · 85191353
  caoyanzhi authored Aug 23, 2022
  
  85191353 Browse Files
- update: 调整confirm样式 · 04e877dc
  caoyanzhi authored Aug 23, 2022
  
  04e877dc Browse Files
- Merge branch 'feature/7月迭代-会员' into dev · 0d0d7c23
  caoyanzhi authored Aug 23, 2022
  
  0d0d7c23 Browse Files
- update: 调整confirm样式 · 54e72849
  caoyanzhi authored Aug 23, 2022
  
  54e72849 Browse Files
- update: dist · b2748b8c
  shaojiawen authored Aug 23, 2022
  
  b2748b8c Browse Files
- Merge branch 'feature/7月迭代-会员' into dev · 54726454
  shaojiawen authored Aug 23, 2022
  
  54726454 Browse Files
- update: 去掉积分主体 · c9447035
  shaojiawen authored Aug 23, 2022
  
  c9447035 Browse Files
- update: dist · 1869aa7a
  huaying authored Aug 23, 2022
  
  1869aa7a Browse Files
- Merge branch 'feature/7月迭代-会员' into dev · 6eeb374e
  huaying authored Aug 23, 2022
  
  6eeb374e Browse Files
- fix: dd · 389b0f2a
  huaying authored Aug 23, 2022
  
  389b0f2a Browse Files
- dist · 42a9566f
  曾经 authored Aug 23, 2022
  
  42a9566f Browse Files
- Merge branch 'feature/7月基础一异常冻结会员' into dev · 581e85f7
```
* feature/7月基础一异常冻结会员:
  UI 变更  交互优化
  分页器距离列表距离修改
```
  曾经 authored Aug 23, 2022
  581e85f7 Browse Files
- UI 变更交互优化 · 1efb6fa5
  曾经 authored Aug 23, 2022
  
  1efb6fa5 Browse Files
- 分页器距离列表距离修改 · 32fd7127
  曾经 authored Aug 23, 2022
  
  32fd7127 Browse Files
- dist · 7adca8e5
  曾经 authored Aug 23, 2022
  
  7adca8e5 Browse Files
- Merge branch 'feature/7月基础一异常冻结会员' into dev · 3bd95b32
```
* feature/7月基础一异常冻结会员:
  异常规则配置 保存交互
```
  曾经 authored Aug 23, 2022
  3bd95b32 Browse Files
- 异常规则配置保存交互 · bfcd13c8
```
冻结会员 操作交互
```
  曾经 authored Aug 23, 2022
  bfcd13c8 Browse Files
22 Aug, 2022 11 commits
- update: dsit · d18ccdd3
  huaying authored Aug 22, 2022
  
  d18ccdd3 Browse Files
- Merge branch 'feature/7月迭代-会员' into dev · 6a0ec4c0
  huaying authored Aug 22, 2022
  
  6a0ec4c0 Browse Files
- fix: 卡券时间展示 · 931ef72e
  huaying authored Aug 22, 2022
  
  931ef72e Browse Files
- update: dist · fabf2c86
  huaying authored Aug 22, 2022
  
  fabf2c86 Browse Files
- Merge branch 'feature/7月迭代-会员' into dev · 3949998a
  huaying authored Aug 22, 2022
  
  3949998a Browse Files
- fix: 客户日志 · e325f90c
  huaying authored Aug 22, 2022
  
  e325f90c Browse Files
- dist · 8021147d
  曾经 authored Aug 22, 2022
  
  8021147d Browse Files
- Merge branch 'feature/7月基础一异常冻结会员' into dev · 9023caff
```
* feature/7月基础一异常冻结会员:
  会员信息 增加鼠标移上去的小手
```
  曾经 authored Aug 22, 2022
  9023caff Browse Files
- 会员信息 · fe1d59e7
```
增加鼠标移上去的小手

鼠标移上去的 超出tip提示去掉
```
  曾经 authored Aug 22, 2022
  fe1d59e7 Browse Files
- dist · 166b9a36
  曾经 authored Aug 22, 2022
  
  166b9a36 Browse Files
- Merge branch 'feature/7月基础一异常冻结会员' into dev · 1d2a4ebd
```
* feature/7月基础一异常冻结会员:
  异常规则配置  提示优化
  其他页面 影响到了 组件里subtitle标签 问题
```
  曾经 authored Aug 22, 2022
  1d2a4ebd Browse Files