Commit Graph

3148 Commits (019bd9533eec3a8be0541a31a9501eb8938eebfc)

Author SHA1 Message Date
YunaiV 0974ece199 【功能优化】公众号:未配置公众号账号的情况下,自动跳转账号管理的菜单 2024-09-12 09:42:47 +08:00
YunaiV 9d0e77b624 【功能修复】商城:指定发卷、新人卷,支持无限发放的兜底 2024-09-11 20:55:38 +08:00
YunaiV 8d116599b1 Merge remote-tracking branch 'origin/dev' into dev 2024-09-11 12:30:45 +08:00
YunaiV e1502d15a2 【缺陷修复】商城:去掉 Number(params.propertyId) 的 Number,解决对雪花算法的兼容性 2024-09-11 12:30:36 +08:00
芋道源码 823530bbc9
!547 【代码优化】商城: 满减活动范围支持分类多选
Merge pull request !547 from puhui999/dev-crm
2024-09-10 13:09:06 +00:00
芋道源码 7577fc45c4
!548 fix: 修复字典选择器数据类型不生效问题
Merge pull request !548 from OlyLis/master
2024-09-10 13:07:38 +00:00
YunaiV cb6e716ce2 【代码优化】注册的逻辑实现 2024-09-10 21:04:46 +08:00
YunaiV b1e3337cb4 Merge branch 'dev' of https://gitee.com/scholarli/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/Login/components/RegisterForm.vue
2024-09-10 20:58:40 +08:00
duxz 65e1c7385f fix: 修复字典选择器数据类型不生效问题 2024-09-10 15:32:44 +08:00
puhui999 1a0ff0215d 【代码优化】商城: 满减活动范围支持分类多选 2024-09-10 15:11:57 +08:00
芋道源码 0e2000550a
!546 【代码优化】商城: 满减送活动
Merge pull request !546 from puhui999/dev-crm
2024-09-10 04:52:07 +00:00
puhui999 4fcc33ec60 【代码优化】商城: 满减活动增加关闭操作 2024-09-10 12:25:14 +08:00
scholar b2dd170884 实现注册功能 2024-09-10 11:35:49 +08:00
YunaiV 5a3ae2ab7a 【代码优化】商城: 限时折扣活动新增 spu 保存 fix 2024-09-09 09:37:39 +08:00
YunaiV f07c74d83c Merge remote-tracking branch 'origin/dev' into dev 2024-09-09 09:30:56 +08:00
芋道源码 1bd853bb32
!545 【代码优化】商城: 限时折扣活动
Merge pull request !545 from puhui999/dev-crm
2024-09-09 01:30:21 +00:00
YunaiV 6f47069df8 【功能优化】商城:秒杀装修重构 2024-09-09 09:20:42 +08:00
芋道源码 5ccca7ffa7
!543 【功能优化】商城:秒杀装修重构
Merge pull request !543 from 卢越/master
2024-09-09 00:15:30 +00:00
puhui999 cb34733318 Merge remote-tracking branch 'yudao/dev' into dev-crm 2024-09-08 22:43:57 +08:00
puhui999 ed54cfe519 【代码优化】商城: 限时折扣活动新增 spu 保存 fix 2024-09-08 22:40:47 +08:00
puhui999 7bb482a829 【代码优化】商城: 限时折扣活动 sku 自动计算对应的满减/折扣 2024-09-08 22:29:35 +08:00
puhui999 2e207ddef9 【代码优化】商城: spu 详情价格回显错误 fix 2024-09-08 21:19:48 +08:00
YunaiV 90656ddb51 【功能修复】商城:店铺装修时,“悬浮按钮”默认不选中 2024-09-08 19:13:32 +08:00
芋道源码 9c6b5eb600
!544 【修复】修复路由二级路径VITE_BASE_PATH支持
Merge pull request !544 from 半栈幼儿员/hotfix/router
2024-09-08 10:43:41 +00:00
preschooler 25dff95fed 🐞 fix:修复路由二级路径 2024-09-08 14:26:22 +08:00
卢越 d5f1e50495 【功能优化】商城:秒杀装修重构 2024-09-08 11:15:53 +08:00
YunaiV 85c0da5aec Merge remote-tracking branch 'origin/feature/iot' into feature/iot
# Conflicts:
#	src/components/DictTag/src/DictTag.vue
2024-09-07 20:43:47 +08:00
YunaiV daddf79683 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into feature/iot
# Conflicts:
#	src/router/modules/remaining.ts
2024-09-07 20:43:14 +08:00
安浩浩 e6d83c1bd0 修改:IOT 产品管理 发布产品和产品详情 2024-09-07 19:40:53 +08:00
YunaiV 3c34602483 【功能修复】商城:店铺装修时,“悬浮按钮”默认不选中 2024-09-07 19:14:34 +08:00
YunaiV ef56489d46 【功能修复】商城:发送商品显示不全问题和打包后客服聊天表情缺失问题 2024-09-07 19:04:07 +08:00
芋道源码 d12c4dc258
!541 【功能修复】商城:发送商品显示不全问题和打包后客服聊天表情缺失问题
Merge pull request !541 from Lcp/pr
2024-09-07 11:02:19 +00:00
Lcp 9faad6424e 【功能修复】商城:发送商品显示不全问题和打包后客服聊天表情缺失问题 2024-09-07 17:26:15 +08:00
YunaiV fb19dd2476 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into feature/bpm
# Conflicts:
#	src/views/bpm/model/ModelForm.vue
#	src/views/bpm/model/index.vue
2024-09-07 16:56:02 +08:00
YunaiV e5ec820127 Merge remote-tracking branch 'origin/master' 2024-09-07 16:54:20 +08:00
YunaiV 3e55015d77 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
# Conflicts:
#	src/components/DiyEditor/components/mobile/PromotionCombination/index.vue
#	src/views/ai/mindmap/manager/index.vue
2024-09-07 16:53:40 +08:00
安浩浩 e5de6a5cbd 修改:IOT 产品管理 修改禁用字段 2024-09-07 16:38:36 +08:00
芋道源码 beaf533a14
!540 【功能修复】修复新创建用户未上传头像时,头像不显示的bug。 修复布局配置中标签页图标key错误的bug
Merge pull request !540 from kuxiao/pass20240907
2024-09-07 08:15:14 +00:00
zqx 307743b7d0 【功能修复】修复新创建用户未上传头像时,头像不显示的bug。
【功能修复】修复布局配置中标签页图标key错误的bug
2024-09-07 15:38:39 +08:00
安浩浩 4aea2eaed5 新增:IOT 产品管理 2024-09-07 09:46:52 +08:00
芋道源码 b5c4da073a
!539 【功能修复】修复拼团装修的价格显示
Merge pull request !539 from 卢越/master
2024-09-06 14:32:34 +00:00
卢越 3dc02f7282 【功能修复】修复拼团的价格显示 2024-09-06 22:23:15 +08:00
YunaiV 7d60b5a619 【代码优化】商城:拼团装修重构 2024-09-06 20:55:08 +08:00
芋道源码 a2091df2df
!537 【功能优化】拼团装修重构
Merge pull request !537 from 卢越/master
2024-09-06 12:39:44 +00:00
scholar 2205526a79 优化代码实现。 2024-09-06 16:14:59 +08:00
YunaiV fd6fd9e520 【代码优化】SYSTEM:快速开关菜单的按钮 2024-09-06 09:20:32 +08:00
芋道源码 15ed1cf5c2
Merge pull request #54 from DevDengChao/feat/menu-status-switch
feat: 新增快速开关菜单的按钮
2024-09-06 09:15:27 +08:00
芋道源码 d7e0b771ef
Merge pull request #84 from GoldenZqqq/bpm-optimization
工作流审批页面样式优化
2024-09-06 09:13:13 +08:00
芋道源码 52f804e204
Merge pull request #81 from ion1ze/master
bugfix: 移动端浅色模式下标题语言颜色异常
2024-09-06 09:12:07 +08:00
芋道源码 7ba29c97aa
!535 feat: add closeOnPressEscape to ElMessageBox
Merge pull request !535 from AhJindeg/hotfix/handleAuthorized
2024-09-05 12:10:23 +00:00