Commits · c4f7aa760b07850fefa69ff8da750ed017960dcb · phsl / admin · GitLab

26 Aug, 2024 7 commits
- 【代码评审】商城：限时折扣活动 · c4f7aa76
  YunaiV committed Aug 26, 2024
  
  c4f7aa76 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · af1bec2a
  YunaiV committed Aug 26, 2024
  
  af1bec2a Browse Files
- Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev · c3b210d2
  YunaiV committed Aug 26, 2024
  
  c3b210d2 Browse Files
- !529 【修改】修改限时折扣的一些问题 · 24349110
```
Merge pull request !529 from 痴货/dev
```
  芋道源码 committed Aug 26, 2024
  24349110 Browse Files
- !528 【代码优化】商城: 完善代码评审提到的问题 · 35c1551f
```
Merge pull request !528 from puhui999/dev-crm
```
  芋道源码 committed Aug 26, 2024
  35c1551f Browse Files
- 【修改】修改限时折扣:①【优化】商品允许选择多个；②【优化】选择后的 SKU，需要后面加个【删除】按钮；③【bug】展示的金额，貌似不对，大了 100… · a06a5096
```
【修改】修改限时折扣:①【优化】商品允许选择多个；②【优化】选择后的 SKU，需要后面加个【删除】按钮；③【bug】展示的金额，貌似不对，大了 100 倍；④【优化】“优惠类型”，是每个 SKU 可以自定义已设置的
```
  痴货 committed Aug 26, 2024
  a06a5096 Browse Files
- 【代码优化】】商城: 完善代码评审提到的问题 · e1ccf523
  puhui999 committed Aug 26, 2024
  
  e1ccf523 Browse Files
25 Aug, 2024 5 commits
- !527 【功能优化】商城客服聊天相关优化 · 1911ed99
```
Merge pull request !527 from 卢越/master
```
  芋道源码 committed Aug 25, 2024
  1911ed99 Browse Files
- 【功能优化】商城客服适配黑暗模式，点击卡片进入订单或者商品详情页 · 075cf0c1
  卢越 committed Aug 25, 2024
  
  075cf0c1 Browse Files
- 【功能修复】商城客服聊天列表无法删除的问题 · dd4dbb0a
  卢越 committed Aug 25, 2024
  
  dd4dbb0a Browse Files
- 【功能修复】report 缺少 ContentWrap 报错 · b9970045
  YunaiV committed Aug 25, 2024
  
  b9970045 Browse Files
- 【功能修复】report 缺少 ContentWrap 报错 · 216d8c00
  YunaiV committed Aug 25, 2024
  
  216d8c00 Browse Files
24 Aug, 2024 3 commits
- !526 【页面优化】商城装修小组件适配黑暗模式 · c832af77
```
Merge pull request !526 from 卢越/master
```
  芋道源码 committed Aug 24, 2024
  c832af77 Browse Files
- 【页面优化】商城装修右侧操作区适配黑暗模式 · 29597640
  卢越 committed Aug 24, 2024
  
  29597640 Browse Files
- 【页面优化】商城装修小组件适配黑暗模式 · 69dc5c1a
  卢越 committed Aug 24, 2024
  
  69dc5c1a Browse Files
23 Aug, 2024 25 commits
- 【代码评审】工作流：审批详情的优化 · c32e03b0
  YunaiV committed Aug 23, 2024
  
  c32e03b0 Browse Files
- Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3 · f1ffd6e6
  YunaiV committed Aug 23, 2024
  
  f1ffd6e6 Browse Files
- Merge pull request #80 from GoldenZqqq/Refactor_Bpm · 535921b0
```
重构工作流审批页面
```
  芋道源码 committed Aug 23, 2024
  535921b0 Browse Files
- !517 【修复】修复标签栏高度（被box-sizing和scrollbar__view的height: 99%干扰） · fd9d6e58
```
Merge pull request !517 from 半栈幼儿员/hotfix/tags-view
```
  芋道源码 committed Aug 23, 2024
  fd9d6e58 Browse Files
- !509 【优化】优化权限选择框 · 6cd826d5
```
Merge pull request !509 from 半栈幼儿员/hotfix/permission-form
```
  芋道源码 committed Aug 23, 2024
  6cd826d5 Browse Files
- !510 【修复】修复时间格式错误 · c820b5a5
```
Merge pull request !510 from 半栈幼儿员/hotfix/date-format
```
  芋道源码 committed Aug 23, 2024
  c820b5a5 Browse Files
- !519 【优化】优化垂直菜单可用宽度 · 24e1e2f2
```
Merge pull request !519 from 半栈幼儿员/hotfix/menu
```
  芋道源码 committed Aug 23, 2024
  24e1e2f2 Browse Files
- !513 【修复】修复top布局模式下主容器高度计算方式、工具栏多出1px、页脚多出1px · be2ca75e
```
Merge pull request !513 from 半栈幼儿员/hotfix/layout
```
  芋道源码 committed Aug 23, 2024
  be2ca75e Browse Files
- !508 【优化】优化iframe布局 · 21621fd2
```
Merge pull request !508 from 半栈幼儿员/hotfix/iframe
```
  芋道源码 committed Aug 23, 2024
  21621fd2 Browse Files
- !522 fix: Fixed the clearable invalid issue of IconSelect component for MenuForm page · 5bf1de54
```
Merge pull request !522 from AhJindeg/hotfix/IconSelect
```
  芋道源码 committed Aug 23, 2024
  5bf1de54 Browse Files
- !524 【页面优化】适配订单详情和售后详情的黑暗模式 · 7ff082a9
```
Merge pull request !524 from 卢越/master
```
  芋道源码 committed Aug 23, 2024
  7ff082a9 Browse Files
- 【代码评审】商城：满减送活动的实现 · 3eeb5574
  YunaiV committed Aug 23, 2024
  
  3eeb5574 Browse Files
- !525 【新增】MALL: 满减送活动赠送优惠券（100%） · f2f39c3a
```
Merge pull request !525 from puhui999/dev-crm
```
  芋道源码 committed Aug 23, 2024
  f2f39c3a Browse Files
- 【代码评审】商城：满减送活动的实现 · a02712ca
  YunaiV committed Aug 23, 2024
  
  a02712ca Browse Files
- 【代码优化】】MALL: 修复满减送活动规则优惠券回显逻辑 · d81ca6e8
  puhui999 committed Aug 23, 2024
  
  d81ca6e8 Browse Files
- Merge remote-tracking branch 'yudao/dev' into dev-crm · e9510f50
  puhui999 committed Aug 23, 2024
  
  e9510f50 Browse Files
- 【代码优化】上传组件 TODO fix · 299fec7b
  puhui999 committed Aug 23, 2024
  
  299fec7b Browse Files
- 【新增】MALL: 满减送活动赠送优惠券（100%） · f996d00e
  puhui999 committed Aug 23, 2024
  
  f996d00e Browse Files
- 【页面优化】订单售后详情适配黑暗模式 · dd841c2c
  卢越 committed Aug 23, 2024
  
  dd841c2c Browse Files
- 【新增】MALL: 满减送活动赠送优惠券（80%） · a0868408
  puhui999 committed Aug 23, 2024
  
  a0868408 Browse Files
- fix: 🐞 Fixed the clearable invalid issue of IconSelect component for MenuForm page · d407bc3c
```
- 修复 MenuForm 页面 IconSelect 组件可清除无效问题
```
  AhJindeg committed Aug 23, 2024
  d407bc3c Browse Files
- 🐞 fix:修复时间格式错误 · 8150b9b1
  preschooler committed Aug 23, 2024
  
  8150b9b1 Browse Files
- feat: 底部操作栏固定fixed在el-card底部 · f5c093b3
  GoldenZqqq committed Aug 23, 2024
  
  f5c093b3 Browse Files
- Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev · 814f9ba9
```
# Conflicts:
#	src/views/mall/promotion/rewardActivity/RewardForm.vue
```
  YunaiV committed Aug 23, 2024
  814f9ba9 Browse Files
- !521 商城满减送活动 TODO 完善 · f11df674
```
Merge pull request !521 from puhui999/dev-crm
```
  芋道源码 committed Aug 23, 2024
  f11df674 Browse Files