root/ludu-admin-vue3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
849 Commits 8 Branches 11 Tags
Commit Graph

849 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xingyu
ba6544a8c3 fix: #I7WY9N 
(cherry picked from commit 56a71f64e7e7c27df6c68c459736d5cc0122e645)
 2023-09-20 12:42:42 +08:00
xingyu
0b7593fbd4 fix: avatar 
(cherry picked from commit 9a6d29b2959acb8e8b7c3849fbbf032dab9539a9)
 2023-09-20 12:42:31 +08:00
xingyu
3630ff4e9b chore: 1.8.1-snapshot 
(cherry picked from commit 1fe950aea58664413a50688067223bcee942550b)
 2023-09-20 12:42:23 +08:00
xingyu
d3571369c8 docs: update version 
(cherry picked from commit 8f0c6625de43d5ba72ed1510323c9399a2bb8f20)
 2023-09-20 12:41:40 +08:00
xingyu
60fa9b9331 chore: update deps 
(cherry picked from commit 4664014fc4e065031f31e585b4a85b85bc2d5230)
 2023-09-20 12:41:36 +08:00
xingyu
77ecb0ea3e chore: vscode setting 
(cherry picked from commit 4c5d0392d71f34aa3fb1c6e6ee694fad0094a1fe)
 2023-09-20 12:41:32 +08:00
AKING
62aa0e794f update src/components/Dialog/src/Dialog.vue. 
解决了弹窗默认top为0的问题

Signed-off-by: AKING <2734339436@qq.com>
(cherry picked from commit d74f96fe17fa6a64532bd055df2a8ecc8a603636)
 2023-09-20 12:39:34 +08:00
owen
117577d9d1 mall：修复优惠券模板，固定日期范围保存失败 
(cherry picked from commit 7887be6e92ac8c09bdc78f54dae8f9bb6a4f0f9c)
 2023-09-20 12:39:18 +08:00
owen
6f8dc79283 promotion: 优惠券模板 productSpuIds 改成 productScopeValues 
(cherry picked from commit 5f557c7be5e06f9734bbc90ef4b4fe31b6bd9e25)
 2023-09-20 12:39:13 +08:00
owen
2707c5fadc mall：修复优惠券发券弹窗样式 
(cherry picked from commit a68acb096fd130b87ff10d264da21af7865cb437)
 2023-09-20 12:39:07 +08:00
YunaiV
fd501a1f5b code review：优惠劵逻辑 
(cherry picked from commit d10530c9f5d731d3419e9adee60c4a7b3cb4213c)
 2023-09-20 12:39:02 +08:00
YunaiV
2a280e8267 code review：优惠劵逻辑 
(cherry picked from commit 4f7d6793fd09296d15c0c20e057619c477450ac2)
 2023-09-20 12:38:39 +08:00
owen
842c922855 mall：优惠券发送优化 
(cherry picked from commit 76c4644b4b9d292643672666fa06363e0c6c8908)
 2023-09-20 12:38:35 +08:00
YunaiV
04a16dbb7d code review：订单列表 
(cherry picked from commit 0743e4941c3a1cc232a2f11545aefb6e563d1942)
 2023-09-20 12:38:27 +08:00
puhui999
d740a4d894 订单管理：完善订单详情 
(cherry picked from commit f0249e94a5829fb3fa2eff0b1b9955c96e0ebe6d)
 2023-09-20 12:34:53 +08:00
puhui999
d44c616ecd 售后退款：完善售后管理（列表、详情） 
(cherry picked from commit 07a0530fc92021c4a7080a37402c9bb5242f4446)
 2023-09-20 12:34:48 +08:00
puhui999
ad2c6654c1 fix: 修正合并差异 
(cherry picked from commit 3e7945e437791695dd8a04ec58cad5fab6cccfb4)
 2023-09-20 12:34:38 +08:00
YunaiV
27bdeb9b50 code review 
(cherry picked from commit 3918fab1ec69793f7e3a6e1b3cc86fa5f30d987e)
 2023-09-20 12:34:16 +08:00
puhui999
a2a343ac2e fix: 1、修复营销活动相关页面打不开的问题 2、修复 spu 添加失败的问题 2、重构 spu 的 sku 校验方式为通用配置的方式 
(cherry picked from commit f9780b636c3f7320e71707f2d0bc9311632d68db)
 2023-09-20 12:33:46 +08:00
puhui999
45e0f5fb6d 更新订单和售后退款详情页面路由 
(cherry picked from commit 264a29e4515c67d011663a70c7ab3f191e20bd4b)
 2023-09-20 12:33:33 +08:00
puhui999
e777f77ba9 订单列表：添加配送方式筛选 
(cherry picked from commit 688dad319edb7bdc7a07f4d2b8992317df620ff4)
 2023-09-20 12:33:30 +08:00
puhui999
ca94a1f274 商品列表：修复添加属性时会返回已存在属性值的问题 
(cherry picked from commit 5c7796ca6f2dff771357c25161497a8e4b1cf587)
 2023-09-20 12:33:25 +08:00
puhui999
95f0a06667 订单售后列表：完善部分 TODO 
(cherry picked from commit f5a177246480702ecc3745aabdc3a9806fc8125d)
 2023-09-20 12:33:19 +08:00
AKING
7ea15cc0d7 update src/hooks/web/useCrudSchemas.ts. 
解决了当使用默认的dict选项时，form中事件不能触发的问题

Signed-off-by: AKING <2734339436@qq.com>
(cherry picked from commit 3e67f3bc4c15d56399bd6162399acfd770eed6d5)
 2023-09-20 12:33:10 +08:00
YunaiV
8364e52477 code review：售后详情 
(cherry picked from commit 29b8d06ff272f2bde5275a74d4d2b99362e19648)
 2023-09-20 12:32:48 +08:00
owen
c999b72692 mall：优惠券 商品适用范围，增加商品分类 
(cherry picked from commit 27219e1833f49fa60acc2d7809f2f7497230a2e4)
 2023-09-20 12:30:42 +08:00
owen
404bb00dbf mall：优惠券 商品选择组件 
(cherry picked from commit 60d2e3114b4e6d41e0790c06ad02f93ce5f9eec9)
 2023-09-20 12:30:37 +08:00
puhui999
c738fd417a 订单售后列表：完善售后详情及相关操作 
(cherry picked from commit ed739aec551cb6fad7a462cbd24e8bdea4b99b28)
 2023-09-20 12:30:14 +08:00
YunaiV
ed41a9bed6 重构：商品详情界面的路由、文件路径 
(cherry picked from commit 8d026f0837db722fb7516564fd4d46d40c6c145d)
 2023-09-20 12:30:02 +08:00
xingyu
a793bf55a8 perf: add ep include 
(cherry picked from commit e8dce93d661d700b2bbf99f8540e212fcb56263f)
 2023-09-20 12:28:31 +08:00
xingyu
c3ccd02f9e fix: router 
(cherry picked from commit 54c41b44452c1af8f2e00f526f0bf8ec71c1020b)
 2023-09-20 12:28:23 +08:00
xingyu
edcd50b6a6 docs: update deps 
(cherry picked from commit 5724539caf254d8cb37ab6b45c4a25e8f2865440)
 2023-09-20 12:28:19 +08:00
xingyu
21ac6e0c3e fix: router 
(cherry picked from commit 547b1741fc5943e17604139fafaef43c77a56fba)
 2023-09-20 12:27:24 +08:00
xingyu
41b04cfac1 chore: update deps 
(cherry picked from commit bd2d6adafaa6132e13c259e11536b72d0be15656)
 2023-09-20 12:26:00 +08:00
puhui999
52776c97da 订单售后列表：初始化售后详情 
(cherry picked from commit 8a51c9c771472ebe7ccf21ad986d03c4e4b354e4)
 2023-09-20 12:25:56 +08:00
puhui999
875211e24f 订单售后列表：重构列表 
(cherry picked from commit 4f81468695f19586aef9a3bbf4ed93dd13d697a3)
 2023-09-20 12:25:50 +08:00
puhui999
109e18dba6 订单列表： 修复差异 
(cherry picked from commit 8239ca474fa0aa0622df02c0c82067aadddf7263)
 2023-09-20 12:25:45 +08:00
owen
529ac7d347 mall: 完善后台发送优惠券 
(cherry picked from commit beef6a0a9478dd43c2c91d537097c169e3c156c7)
 2023-09-20 12:25:36 +08:00
YunaiV
b9c0d4ffa5 code review：商品评论 
(cherry picked from commit 5cd01903e418648f51507df05ca63794e253fa93)
 2023-09-20 12:24:24 +08:00
YunaiV
4ffc150701 code review：会员中心 
(cherry picked from commit 2d8d32376703162daacb7c47841ebffd1263cb99)
 2023-09-20 12:23:45 +08:00
绮梦
48a230aac4 账户信息组件 增加等级、成长值和积分的显示。 
增加一些配套的svg 图标。
增加tab 的懒加载。

(cherry picked from commit 45a6b3bcc7461418c1d7822280948083f6f9b168)
 2023-09-20 12:23:26 +08:00
绮梦
a5046fd527 调整icon的大小 
(cherry picked from commit afaf7749c2d343c7aefef053672c9d4fcdaf524a)
 2023-09-20 12:23:17 +08:00
owen
ae0982ee44 商品评论：回复表单提取到单独的组件中 
(cherry picked from commit 3a1539009026fc71de16db0ef72f24d392479d75)
 2023-09-20 12:23:12 +08:00
绮梦
8c1772c64c 调整icon的对齐方式为中间居中 
(cherry picked from commit 4d9ae7321138221a50c9974d2f58bba6be7da09c)
 2023-09-20 12:23:08 +08:00
owen
9f4751b1d7 商品评论： 
1.移除scores，由后端自动计算
2.SPU、SKU选择组件，放到SPU组件目录下

(cherry picked from commit 15971b6feb67dabbfffe7773a3c65ca3d7eeb92f)
 2023-09-20 12:23:04 +08:00
YunaiV
b55b9966d6 code review：订单列表 
(cherry picked from commit b8ca5800c6adb7225857b7b8756484d04f5ca8eb)
 2023-09-20 12:22:48 +08:00
YunaiV
0e36aea9ff code review：商品评论 
(cherry picked from commit 84c5eb9942f7823980096aca80e556c4696e853c)
 2023-09-20 12:22:22 +08:00
YunaiV
e97a62fe06 code review：用户详情 
(cherry picked from commit 1b6c9b2e2939a853e59843d5b9f321652bb38da8)
 2023-09-20 12:22:09 +08:00
shizhong
19e96f1d0d Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev 2023-09-20 12:21:52 +08:00
owen
1a49567613 商品：完善后台商品评论功能 
(cherry picked from commit 814b4631c944a4657128210378bda40294628b3f)
 2023-09-20 12:19:40 +08:00