yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
696 Commits
8 Branches
14 Tags
26 MiB
Commit Graph

609 Commits (4cef3e3e5fce0ef4dc46374dd09d1c4f457d019a)

Author SHA1 Message Date
YunaiV d4902558e6 code review：会员积分配置 
(cherry picked from commit 5eaf054646)
 2023-07-27 19:09:38 +08:00
shizhong 7a35f7fe6e Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-07-27 19:08:57 +08:00
YunaiV 24a4ed134a code review：处理字典数据的冲突 
(cherry picked from commit 8666307d47)
 2023-07-27 19:07:23 +08:00
xiaqing 98c977a732 初始化积分模块 
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理

(cherry picked from commit 1dca8476b3)
 2023-07-27 19:06:34 +08:00
puhui999 6976c26c37 fix: 完善 SPU 相关路由 review 
(cherry picked from commit d31ade7a5f)
 2023-07-27 19:04:38 +08:00
puhui999 9d8e0d507b fix: 数组操作添加 ? 可选操作符，避免属性值为 null 时报错 
(cherry picked from commit 20f3f72670)
 2023-07-27 19:02:29 +08:00
puhui999 2d88367e61 fix: review 
(cherry picked from commit b89db1af55)
 2023-07-27 19:02:19 +08:00
shizhong 274d85010f add trade order 20230606 2023-07-27 19:01:41 +08:00
shizhong 45bf152dd2 sync dev-20230606 2023-07-27 19:00:31 +08:00
xiaobai b9ba1d36c2 20230606 add trade-order and details 
(cherry picked from commit 985d764f62)
 2023-07-27 18:54:36 +08:00
YunaiV f641785df9 code review：优惠劵管理 
(cherry picked from commit 51e76ffd53)
 2023-07-27 18:53:49 +08:00
shizhong 0d0b2265c6 !164 优惠券迁移vue3 Merge pull request !164 from dhb52/dev 2023-07-27 18:53:17 +08:00
puhui999 ce62362982 fix: 优化 spu 相关路由配置 
(cherry picked from commit a1b45f80bc)
 2023-07-27 18:50:14 +08:00
YunaiV 79a4aa5189 code review：商品管理 
(cherry picked from commit 158585670c)
 2023-07-27 18:50:01 +08:00
YunaiV 16c518e18a code review：门店自提、快递运费 
(cherry picked from commit 60c1604d49)
 2023-07-27 18:46:14 +08:00
xiaobai a29421dd41 临时提交 
(cherry picked from commit 505f5cfa0c)
 2023-07-27 18:44:50 +08:00
dhb52 e2faf6a2a4 style: 添加VO 
(cherry picked from commit c5a7d05821)
 2023-07-27 18:42:44 +08:00
puhui999 b28bfc4081 fix: 修复善品测试发现的问题 
(cherry picked from commit 7fb6258bed)
 2023-07-27 18:36:45 +08:00
shizhong c2168466f3 fix: 引入 v-dompurify-html 指令解决 v-html 的安全隐患 2023-07-27 18:36:06 +08:00
puhui999 144be6ef44 fix: 完善 SPU 选择快递模版的功能 
(cherry picked from commit 2ddb605076)
 2023-07-27 13:11:05 +08:00
puhui999 d35ac547ac fix: 完善 SPU 查看详情 
(cherry picked from commit 39c92cb944)
 2023-07-27 13:10:58 +08:00
jason 9e7fe34ae8 新增门店自提管理 
(cherry picked from commit 000aa95012)
 2023-07-27 13:10:46 +08:00
puhui999 cf7f4ff89e fix: 修改 review 提到的问题，完善分类选择层级校验、完整层级展示 
(cherry picked from commit e555977757)
 2023-07-27 13:09:36 +08:00
shizhong 9af3734b78 逻辑问题 2023-07-11 12:46:39 +08:00
shizhong c6a9c0c5fb 所有菜单的 name 都加上模块的前缀，避免冲突 2023-07-10 19:11:15 +08:00
周建 3b2d308ccc 补充 2023-06-25 14:06:14 +08:00
周建 7ca76a5304 修复一些命名和拼写错误问题，修复一些BUG 2023-06-25 13:34:27 +08:00
周建 9456a6f31c 命名问题 2023-06-21 13:36:59 +08:00
周建 b07cc98619 接口命名统一 2023-06-21 13:22:47 +08:00
周建 c545c3008f 工作流bug 2023-06-20 15:51:45 +08:00
周建 73cd6e303d 登录接口返回的过期时间是`access token` 的过期时间，但是被错误地设置在了`refresh token` 上，这导致过了几分钟登录状态便失效要求重新登录 2023-06-19 13:08:56 +08:00
周建 4cf5954eaa 应用管理页面新增编辑报错 
支付订单新增时时间选择问题
 2023-06-17 09:41:10 +08:00
shizhong 28507236a7 BUG和多余的文件 2023-06-16 19:31:12 +08:00
shizhong 2489cf00d7 将 highlight 代码高亮的全局引入，改成局部引入 2023-06-16 19:29:36 +08:00
周建 330a44fc98 下面列表 2023-06-16 18:25:58 +08:00
周建 0e15d393a6 代码格式化问题 2023-06-16 16:31:53 +08:00
周建 6ff7a3c9a9 支付订单问题 2023-06-14 14:24:29 +08:00
周建 38ea9cbcda 部分样式bug 2023-06-14 13:58:48 +08:00
shizhong e60c33e4b4 BUG 2023-06-13 21:53:35 +08:00
shizhong 99774fc622 将 highlight 代码高亮的全局引入，改成局部引入 2023-06-13 21:42:32 +08:00
shizhong 6f266fb967 给所有组件添加name属性预防未知bug!!! 2023-06-13 21:05:25 +08:00
shizhong 1e52823524 BUG 2023-06-13 15:35:13 +08:00
wangding ea81cbd520 add router search 
(cherry picked from commit 43f3c67434)
 2023-06-13 14:16:02 +08:00
wangding 1e096a47c0 新增路由搜索功能 
(cherry picked from commit 6768cdea05)
 2023-06-13 14:15:49 +08:00
jason 88439669c0 运费模板区域改成多选 
(cherry picked from commit 70c5082776)
 2023-06-13 14:15:44 +08:00
YunaiV 6e7ee28079 review + mall：快递公司管理 
(cherry picked from commit b12aefe46e)
 2023-06-13 14:15:31 +08:00
YunaiV dfc3da744f review + mall：商品管理 
(cherry picked from commit 349a39e72f)
 2023-06-13 14:15:28 +08:00
shizhong 61396246a5 Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev 2023-06-13 14:14:42 +08:00
YunaiV 4cd4327bc8 review + mall：商品管理 
(cherry picked from commit 0fba3fd503)
 2023-06-13 14:13:55 +08:00
puhui999 4eacb6dd8c fix: 完善善品导出 
(cherry picked from commit d877bfd26e)
 2023-06-13 14:12:49 +08:00
jason 4850c05614 运费模板表格样式调整 
(cherry picked from commit c296c9e53d)
 2023-06-13 14:12:45 +08:00
jason bbe9e667c4 运费模板性能优化。区域选择使用懒加载 
(cherry picked from commit af2fb4bf5f)
 2023-06-13 14:12:41 +08:00
jason 90ccc11006 mall: 订单中心->运费模板(第一版 性能有问题) 
(cherry picked from commit 4e69f15128)
 2023-06-13 14:10:52 +08:00
puhui999 c254222b5f fix: 优化相关逻辑，修复遗留bug 
(cherry picked from commit 38545e89c6)
 2023-06-13 14:07:33 +08:00
puhui999 4410bdd93c fix:解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记 
(cherry picked from commit 0c42b76a52)
 2023-06-13 14:07:22 +08:00
xingyu f26c72ced9 fix: echart color 
(cherry picked from commit 9f0065f89f)
 2023-06-13 14:07:09 +08:00
xingyu 484cd403fc fix: echart 
(cherry picked from commit 45ee4116b7)
 2023-06-13 14:06:53 +08:00
jason 4ec3d3fe72 新增快递公司菜单 
(cherry picked from commit b0984c9013)
 2023-06-13 14:06:19 +08:00
puhui999 ea4e2a0bcc fix: 解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记 
(cherry picked from commit 4ddba9d454)
 2023-06-13 14:06:16 +08:00
puhui999 d73a32106a fix: 修复 OtherSettingsForm TODO 优化相关算法,解决上一版本遗留的bug 
(cherry picked from commit 3c4a39df01)
 2023-06-13 14:06:02 +08:00
puhui999 085dbd6220 fix: 修复 SkuList TODO 优化相关算法 
(cherry picked from commit 9c06832d7e)
 2023-06-13 14:05:57 +08:00
puhui999 73b2809654 fix: 添加商品属性去掉备注 
(cherry picked from commit 6ac8c78d57)
 2023-06-13 14:05:53 +08:00
puhui999 74d926172c fix: 进一步完善商品列表，修复TODO 
(cherry picked from commit 52bfc4dac0)
 2023-06-13 14:05:48 +08:00
puhui999 478f02fa7c fix: 整合spu，移动相关类型到spu删除对应文件和文件夹 
(cherry picked from commit 50b181318b)
 2023-06-13 14:05:43 +08:00
puhui999 cafd74193f fix: 移动copyValueToTarget方法到utils/index中 
(cherry picked from commit 43e541f944)
 2023-06-13 14:05:38 +08:00
shizhong 82f02cd9f3 !148 【重构】Vue3 管理后台：[基础管理 -> Redis监控] 使用Echart组件实现 2023-06-13 14:05:17 +08:00
shizhong e81f8c51cb 修复后台”在线用户强退“功能 2023-06-13 14:03:52 +08:00
Chika 2989372c5c Redis监控用Echart组件整改 
(cherry picked from commit fbac522149)
 2023-06-13 14:00:09 +08:00
Chika 80f1c08951 Redis监控图标使用Echart组件整合 
(cherry picked from commit bf629a9554)
 2023-06-13 13:59:08 +08:00
YunaiV 7a5993c584 code review 商品管理的实现 
(cherry picked from commit e92361ed40)
 2023-06-13 13:56:48 +08:00
dhb52 fc4b46de2e refactor: mp/autoReply 拆分ReplyForm组件 
(cherry picked from commit be49c381f6)
 2023-06-13 13:56:27 +08:00
dhb52 3553b300d4 refactor: mp/wx-msg拆分Msg组件 
(cherry picked from commit 2b84489969)
 2023-06-13 13:56:12 +08:00
YunaiV cc62e8ec79 code review 微信的实现 
(cherry picked from commit 1c77ba8e04)
 2023-06-13 13:56:08 +08:00
puhui999 b9fd7b7753 商品管理: 打通所有接口（第一版） 
(cherry picked from commit 0c6e3a39c9)
 2023-06-13 13:56:04 +08:00
puhui999 263ca68ff1 商品管理: 调整相关组件优化逻辑,完成表单保存和数据回显 
(cherry picked from commit 9ee35fc165)
 2023-06-13 13:55:51 +08:00
puhui999 2152573c5e 商品管理: 调整相关组件优化逻辑 
(cherry picked from commit 1116fb278b)
 2023-06-13 13:55:48 +08:00
puhui999 72fd0b8ed5 商品管理: 调整相关组件优化逻辑 
(cherry picked from commit 6478d295df)
 2023-06-13 13:55:44 +08:00
puhui999 cb45ea0753 商品管理: 完成商品属性批量添加 
(cherry picked from commit 64f6f67ddd)
 2023-06-13 13:55:20 +08:00
puhui999 d37540de1d 商品管理: 完成商品属性排列组合算法生成对应表数据 
(cherry picked from commit ab1120b0ff)
 2023-06-13 13:55:17 +08:00
puhui999 84ed1f7df3 商品管理: 保存属性值到数据库 
(cherry picked from commit 35c3545e7c)
 2023-06-13 13:55:13 +08:00
puhui999 4bb39f2578 商品管理: fix:根据商品属性动态生成表格值 
(cherry picked from commit 538d1e0b6c)
 2023-06-13 13:54:58 +08:00
puhui999 7368bd8c2a 商品管理: 修正添加属性和添加属性值时输入框显隐控制、输入框焦点获取错乱等bug 
(cherry picked from commit 7a64eb5198)
 2023-06-13 13:54:51 +08:00
puhui999 1a2d7a2f0e 商品管理: 初步完成相关组件 
(cherry picked from commit 61218ae711)
 2023-06-13 13:54:08 +08:00
puhui999 7a1a4e82d0 商品管理: 完善选择商品分类 
(cherry picked from commit ab1685a741)
 2023-06-13 13:53:11 +08:00
puhui999 083a0c4760 商品管理: 完善表单校验，优化信息提示，完成新建、编辑、提交逻辑 
(cherry picked from commit c38abc365c)
 2023-06-13 13:52:42 +08:00
YunaiV 6e604f9e07 调整商品分类的实现 
(cherry picked from commit 9680a204ca)
 2023-06-13 13:50:37 +08:00
AhJindeg 464fe953ad 🐞 fix(styles/index): Update .el-scrollbar__bar style 
- 解决表格内容超过表格总宽度后，横向滚动条前端顶不到表格边缘的问题

(cherry picked from commit ace8f9e302)
 2023-06-13 13:49:19 +08:00
puhui999 3c220cdb63 商品管理初始界面结构设计 
(cherry picked from commit a0014bed65)
 2023-06-13 13:48:52 +08:00
AhJindeg ab531a8ec5 🌈 style(Form/src): Modifying word spelling errors 
- 修改ts类型 PlaceholderModel单词拼写
- 修改initModel方法 FormModel注释拼写

(cherry picked from commit 9dc361e708)
 2023-06-13 13:44:57 +08:00
dhb52 09c5f2e22f refactor: mp/wx-msg 采用ref来实现滚动 
(cherry picked from commit cb4527748e)
 2023-06-13 13:44:33 +08:00
dhb52 a737b267a8 refactor: mp模块统一accountId未初始化值为-1，删除QueryParams定义 
(cherry picked from commit 198752868c)
 2023-06-13 13:44:29 +08:00
YunaiV 64d4583805 登录界面，增加“萌新必读” 
(cherry picked from commit c14b5c5bff)
 2023-06-13 13:44:17 +08:00
dhb52 817ccc7511 fix: mp模块的一些小修复 
(cherry picked from commit 036c9b3366)
 2023-06-13 13:43:48 +08:00
dhb52 c85b99090d refactor: mp/wx-msg 拆分组件 
(cherry picked from commit f848f3ba91)
 2023-06-13 13:43:39 +08:00
dhb52 ac7202ec61 fix: mp/menu菜单拖动后激活菜单 
(cherry picked from commit 917b9d180a)
 2023-06-13 13:43:26 +08:00
shizhong 67f6db22c2 菜单管理：添加刷新菜单缓存按钮 2023-06-13 13:43:12 +08:00
dhb52 4601bd3428 perf: mp/menu使用vuedraggable替换拖动的原生实现 
(cherry picked from commit ebacbbb9cf)
 2023-06-13 13:42:04 +08:00
dhb52 88167a437e style: mp/WxReply objCache => tabCache 
(cherry picked from commit 08eb72e568)
 2023-06-13 13:41:58 +08:00
dhb52 0deb965db3 feat: mp/menu 拖动排序 
(cherry picked from commit d99f9e98fb)
 2023-06-13 13:41:53 +08:00
dhb52 94ab90d8ab style: mp模块stylelint 
(cherry picked from commit 4925a66cc5)
 2023-06-13 13:41:49 +08:00