Commit Graph

1380 Commits

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
芋道源码
e4d6b4301b
!181 所有菜单的 name 都加上模块的前缀,避免冲突,并且和菜单数据能对上
Merge pull request !181 from clockdotnet/master-vxe
2023-07-26 04:53:33 +00: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
芋道源码
ec4a5ec961
!173 合并master上1.7.2和1.7.3的修改到master-vxe
Merge pull request !173 from clockdotnet/master-vxe
2023-06-17 10:37:49 +00: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
YunaiV
6965f789b0 v1.7.3 版本发布!
(cherry picked from commit 3e549a6862)
2023-06-13 14:19:26 +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