Commits · cbd3d6c9a2e9fbfc0140af8c6330ff3270002f9d · phsl / admin · GitLab

20 Aug, 2023 2 commits
- !204 会员积分和会员签到模块todo修改 · cbd3d6c9
```
Merge pull request !204 from QingX/dev
```
  芋道源码 committed Aug 20, 2023
  cbd3d6c9 Browse Files
- !207 会员管理：增加会员标签功能 · a99a125c
```
Merge pull request !207 from 疯狂的世界/member_dev
```
  芋道源码 committed Aug 20, 2023
  a99a125c Browse Files
19 Aug, 2023 7 commits
- 会员： · 2964d554
```
1.会员设置标签
```
  owen committed Aug 19, 2023
  2964d554 Browse Files
- 会员： · 334962fe
```
1.增加会员标签功能
```
  owen committed Aug 19, 2023
  334962fe Browse Files
- !205 同步 master 代码到 dev · 848b6689
```
Merge pull request !205 from 芋道源码/master
```
  芋道源码 committed Aug 19, 2023
  848b6689 Browse Files
- 会员中心：会员管理 60% · cb4c78b1
  YunaiV committed Aug 19, 2023
  
  cb4c78b1 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · f96882c8
  xiaqing committed Aug 19, 2023
  
  f96882c8 Browse Files
- 会员中心：会员管理 50% · 4fd9dfd1
  YunaiV committed Aug 19, 2023
  
  4fd9dfd1 Browse Files
- 会员积分和会员签到模块todo修改 · 19444021
  xiaqing committed Aug 19, 2023
  
  19444021 Browse Files
15 Aug, 2023 1 commit
- !198 fix: 修复支付的一些小问题 · a3f2a01e
```
Merge pull request !198 from dhb52/master
```
  芋道源码 committed Aug 15, 2023
  a3f2a01e Browse Files
13 Aug, 2023 6 commits
- fix: 支付/示例 queryParams 为 reactive · c7b8fdb8
  dhb52 committed Aug 13, 2023
  
  c7b8fdb8 Browse Files
- fix: 支付/回调修复ElDescriptions对齐问题 · 5d364e26
  dhb52 committed Aug 13, 2023
  
  5d364e26 Browse Files
- 支付：修复支付应用的 mock 展示不正确 · e954ae60
  YunaiV committed Aug 13, 2023
  
  e954ae60 Browse Files
- !197 同步商城实现 · 16369c00
```
Merge pull request !197 from 芋道源码/dev
```
  芋道源码 committed Aug 13, 2023
  16369c00 Browse Files
- 支付退款列表的 review · c3a8479e
  YunaiV committed Aug 13, 2023
  
  c3a8479e Browse Files
- !196 fix: 支付管理/退款订单对标 vue2 · 3f90ca3a
```
Merge pull request !196 from dhb52/master
```
  芋道源码 committed Aug 13, 2023
  3f90ca3a Browse Files
12 Aug, 2023 12 commits
- fix: 修复ElDescriptions对齐问题 · 10c121d6
  dhb52 committed Aug 13, 2023
  
  10c121d6 Browse Files
- fix: 支付管理/退款订单对标 vue2 · 620a2009
  dhb52 committed Aug 13, 2023
  
  620a2009 Browse Files
- 商城： · 7bf3e41c
```
1. 微调砍价活动的代码
```
  YunaiV committed Aug 13, 2023
  7bf3e41c Browse Files
- 商城： · 127e6b20
```
1. 修复拼团活动，修改商品的拼团价格，会存在 *100 的问题
```
  YunaiV committed Aug 13, 2023
  127e6b20 Browse Files
- 商城： · ff8bde20
```
1. 修复秒杀活动，修改商品的秒杀价格，会存在 *100 的问题
```
  YunaiV committed Aug 12, 2023
  ff8bde20 Browse Files
- chore: remove qrcode.vue use qrcode · 2ec50bab
  xingyu committed Aug 12, 2023
  
  2ec50bab Browse Files
- fix: 提交后刷新列表 · b9477463
  xingyu committed Aug 12, 2023
  
  b9477463 Browse Files
- Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 · e262ab95
  xingyu committed Aug 12, 2023
  
  e262ab95 Browse Files
- 商城： · 9984de0d
```
1. 调整优惠劵的目录
2. 简化秒杀时间配置
```
  YunaiV committed Aug 12, 2023
  9984de0d Browse Files
- 商城：优惠劵的前端完善 · 815897ca
  YunaiV committed Aug 12, 2023
  
  815897ca Browse Files
- 修复时间检索，value format 错误，导致无法搜索的问题 · 98477ef4
  YunaiV committed Aug 12, 2023
  
  98477ef4 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 90f22934
  YunaiV committed Aug 12, 2023
  
  90f22934 Browse Files
11 Aug, 2023 2 commits
- code review：补全支付文档 · 19cad3b8
  YunaiV committed Aug 11, 2023
  
  19cad3b8 Browse Files
- code review：优化支付订单的实现 · bf667270
  YunaiV committed Aug 11, 2023
  
  bf667270 Browse Files
10 Aug, 2023 8 commits
- code review：优化支付通知的实现 · 1ab7ea06
  YunaiV committed Aug 11, 2023
  
  1ab7ea06 Browse Files
- code review：优化示例订单的实现 · 26cf4ca6
  YunaiV committed Aug 11, 2023
  
  26cf4ca6 Browse Files
- code review：优化收银台的实现，解决 TODO · 7625e675
  YunaiV committed Aug 10, 2023
  
  7625e675 Browse Files
- Merge branch 'master' of https://gitee.com/dhb52/yudao-ui-admin-vue3 · 551ebbd4
```
 Conflicts:
	src/utils/constants.ts
```
  YunaiV committed Aug 10, 2023
  551ebbd4 Browse Files
- Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3 · b0e27b22
  YunaiV committed Aug 10, 2023
  
  b0e27b22 Browse Files
- !195 修复登录后通过登录页面无法再次登录的问题 · 6e5286f9
```
Merge pull request !195 from lehug/master
```
  芋道源码 committed Aug 10, 2023
  6e5286f9 Browse Files
- !193 update src/views/infra/fileConfig/FileConfigForm.vue. · bcca3ee0
```
Merge pull request !193 from 账号已删除/N/A
```
  芋道源码 committed Aug 10, 2023
  bcca3ee0 Browse Files
- 修复登录后通过登录页面无法再次登录的问题 · 280f734f
  lehug committed Aug 10, 2023
  
  280f734f Browse Files
09 Aug, 2023 2 commits
- 会员积分针对代码格式、功能优化 · f8a4df8b
```
1.修改积分抵扣单位，按照分显示
```
  xiaqing committed Aug 09, 2023
  f8a4df8b Browse Files
- 会员积分针对代码格式、功能优化 · f2e029dc
```
1.修改积分抵扣单位，按照分显示
```
  xiaqing committed Aug 09, 2023
  f2e029dc Browse Files