Commits · da45ee034cd76d027e225e3a86a86099e9eb9577 · phsl / admin · GitLab

23 Sep, 2024 2 commits
- 【代码评审】商城：积分商品的管理 · da45ee03
  YunaiV committed Sep 23, 2024
  
  da45ee03 Browse Files
- !555 【新增】商城: 积分商城 · 4872f18d
```
Merge pull request !555 from puhui999/dev-crm
```
  芋道源码 committed Sep 23, 2024
  4872f18d Browse Files
22 Sep, 2024 2 commits
- Merge remote-tracking branch 'yudao/dev' into dev-crm · a45c8e6d
  puhui999 committed Sep 22, 2024
  
  a45c8e6d Browse Files
- 【新增】商城: 积分商城 · 360cce10
  puhui999 committed Sep 22, 2024
  
  360cce10 Browse Files
15 Sep, 2024 12 commits
- 【优化】全局：rvest.vs-code-prettier-eslint 转成 esbenp.prettier-vscode · fe33517e
  YunaiV committed Sep 15, 2024
  
  fe33517e Browse Files
- 【功能修复】商城：修复满减送批量合并的错误部分 · f7217a5c
  YunaiV committed Sep 15, 2024
  
  f7217a5c Browse Files
- !553 批量优化或修改BUG · 1a8c04d7
```
Merge pull request !553 from 痴货/develop-mall
```
  芋道源码 committed Sep 15, 2024
  1a8c04d7 Browse Files
- !552 【代码优化】商城: 限时折扣 · 8dafe26b
```
Merge pull request !552 from puhui999/dev-crm
```
  芋道源码 committed Sep 15, 2024
  8dafe26b Browse Files
- Merge remote-tracking branch 'refs/remotes/update/dev' into develop-mall · f069f809
  痴货 committed Sep 15, 2024
  
  f069f809 Browse Files
- 【功能修复】商城：满减送的条件类型的满足价格不对的问题 · 8a225e66
  YunaiV committed Sep 15, 2024
  
  8a225e66 Browse Files
- 修复指定发放优惠券显示 · f086b9c3
  痴货 committed Sep 15, 2024
  
  f086b9c3 Browse Files
- 装修页面获取优惠券只获取直接领取的 · fc0de84d
  痴货 committed Sep 15, 2024
  
  fc0de84d Browse Files
- 修改添加商品商品简介、修改装修主页商品价格显示 · c697824b
  痴货 committed Sep 15, 2024
  
  c697824b Browse Files
- 【功能优化】优化限时满减的金额数据库保存为分 · 456f3d21
  痴货 committed Sep 15, 2024
  
  456f3d21 Browse Files
- 【优化】满减送列表页面添加活动范围字段、修改状态为COMMON_STATUS · 4d25dda7
  痴货 committed Sep 15, 2024
  
  4d25dda7 Browse Files
- 【代码优化】商城: 限时折扣 · 370851ac
  puhui999 committed Sep 15, 2024
  
  370851ac Browse Files
14 Sep, 2024 2 commits
- 【BUG】满减满足多少元需要元转分 · fbed2910
  痴货 committed Sep 14, 2024
  
  fbed2910 Browse Files
- 【添加】列表添加优惠类型字段 · 870a1c44
  痴货 committed Sep 14, 2024
  
  870a1c44 Browse Files
12 Sep, 2024 2 commits
- 【功能优化】框架：UploadImgs 的 zIndex 9999999，避免遮挡问题 · 48e78c38
  YunaiV committed Sep 12, 2024
  
  48e78c38 Browse Files
- 【功能优化】公众号：未配置公众号账号的情况下，自动跳转账号管理的菜单 · 0974ece1
  YunaiV committed Sep 12, 2024
  
  0974ece1 Browse Files
11 Sep, 2024 3 commits
- 【功能修复】商城：指定发卷、新人卷，支持无限发放的兜底 · 9d0e77b6
  YunaiV committed Sep 11, 2024
  
  9d0e77b6 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 8d116599
  YunaiV committed Sep 11, 2024
  
  8d116599 Browse Files
- 【缺陷修复】商城：去掉 Number(params.propertyId) 的 Number，解决对雪花算法的兼容性 · e1502d15
  YunaiV committed Sep 11, 2024
  
  e1502d15 Browse Files
10 Sep, 2024 7 commits
- !547 【代码优化】商城: 满减活动范围支持分类多选 · 823530bb
```
Merge pull request !547 from puhui999/dev-crm
```
  芋道源码 committed Sep 10, 2024
  823530bb Browse Files
- 【代码优化】注册的逻辑实现 · cb6e716c
  YunaiV committed Sep 10, 2024
  
  cb6e716c Browse Files
- Merge branch 'dev' of https://gitee.com/scholarli/yudao-ui-admin-vue3 into dev · b1e3337c
```
# Conflicts:
#	src/views/Login/components/RegisterForm.vue
```
  YunaiV committed Sep 10, 2024
  b1e3337c Browse Files
- 【代码优化】商城: 满减活动范围支持分类多选 · 1a0ff021
  puhui999 committed Sep 10, 2024
  
  1a0ff021 Browse Files
- !546 【代码优化】商城: 满减送活动 · 0e200055
```
Merge pull request !546 from puhui999/dev-crm
```
  芋道源码 committed Sep 10, 2024
  0e200055 Browse Files
- 【代码优化】商城: 满减活动增加关闭操作 · 4fcc33ec
  puhui999 committed Sep 10, 2024
  
  4fcc33ec Browse Files
- 实现注册功能 · b2dd1708
  scholar committed Sep 10, 2024
  
  b2dd1708 Browse Files
09 Sep, 2024 3 commits
- 【代码优化】商城: 限时折扣活动新增 spu 保存 fix · 5a3ae2ab
  YunaiV committed Sep 09, 2024
  
  5a3ae2ab Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · f07c74d8
  YunaiV committed Sep 09, 2024
  
  f07c74d8 Browse Files
- !545 【代码优化】商城: 限时折扣活动 · 1bd853bb
```
Merge pull request !545 from puhui999/dev-crm
```
  芋道源码 committed Sep 09, 2024
  1bd853bb Browse Files
08 Sep, 2024 4 commits
- Merge remote-tracking branch 'yudao/dev' into dev-crm · cb347333
  puhui999 committed Sep 08, 2024
  
  cb347333 Browse Files
- 【代码优化】商城: 限时折扣活动新增 spu 保存 fix · ed54cfe5
  puhui999 committed Sep 08, 2024
  
  ed54cfe5 Browse Files
- 【代码优化】商城: 限时折扣活动 sku 自动计算对应的满减/折扣 · 7bb482a8
  puhui999 committed Sep 08, 2024
  
  7bb482a8 Browse Files
- 【代码优化】商城: spu 详情价格回显错误 fix · 2e207dde
  puhui999 committed Sep 08, 2024
  
  2e207dde Browse Files
07 Sep, 2024 3 commits
- Merge remote-tracking branch 'origin/master' · e5ec8201
  YunaiV committed Sep 07, 2024
  
  e5ec8201 Browse Files
- Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 · 3e55015d
```
# Conflicts:
#	src/components/DiyEditor/components/mobile/PromotionCombination/index.vue
#	src/views/ai/mindmap/manager/index.vue
```
  YunaiV committed Sep 07, 2024
  3e55015d Browse Files
- !540 【功能修复】修复新创建用户未上传头像时，头像不显示的bug。修复布局配置中标签页图标key错误的bug · beaf533a
```
Merge pull request !540 from kuxiao/pass20240907
```
  芋道源码 committed Sep 07, 2024
  beaf533a Browse Files