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

945 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xingyu
60fa9b9331 chore: update deps 
(cherry picked from commit 4664014fc4)
 2023-09-20 12:41:36 +08:00
xingyu
77ecb0ea3e chore: vscode setting 
(cherry picked from commit 4c5d0392d7)
 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 d74f96fe17)
 2023-09-20 12:39:34 +08:00
owen
117577d9d1 mall：修复优惠券模板，固定日期范围保存失败 
(cherry picked from commit 7887be6e92)
 2023-09-20 12:39:18 +08:00
owen
6f8dc79283 promotion: 优惠券模板 productSpuIds 改成 productScopeValues 
(cherry picked from commit 5f557c7be5)
 2023-09-20 12:39:13 +08:00
owen
2707c5fadc mall：修复优惠券发券弹窗样式 
(cherry picked from commit a68acb096f)
 2023-09-20 12:39:07 +08:00
YunaiV
fd501a1f5b code review：优惠劵逻辑 
(cherry picked from commit d10530c9f5)
 2023-09-20 12:39:02 +08:00
YunaiV
2a280e8267 code review：优惠劵逻辑 
(cherry picked from commit 4f7d6793fd)
 2023-09-20 12:38:39 +08:00
owen
842c922855 mall：优惠券发送优化 
(cherry picked from commit 76c4644b4b)
 2023-09-20 12:38:35 +08:00
YunaiV
04a16dbb7d code review：订单列表 
(cherry picked from commit 0743e4941c)
 2023-09-20 12:38:27 +08:00
puhui999
d740a4d894 订单管理：完善订单详情 
(cherry picked from commit f0249e94a5)
 2023-09-20 12:34:53 +08:00
puhui999
d44c616ecd 售后退款：完善售后管理（列表、详情） 
(cherry picked from commit 07a0530fc9)
 2023-09-20 12:34:48 +08:00
puhui999
ad2c6654c1 fix: 修正合并差异 
(cherry picked from commit 3e7945e437)
 2023-09-20 12:34:38 +08:00
YunaiV
27bdeb9b50 code review 
(cherry picked from commit 3918fab1ec)
 2023-09-20 12:34:16 +08:00
puhui999
a2a343ac2e fix: 1、修复营销活动相关页面打不开的问题 2、修复 spu 添加失败的问题 2、重构 spu 的 sku 校验方式为通用配置的方式 
(cherry picked from commit f9780b636c)
 2023-09-20 12:33:46 +08:00
puhui999
45e0f5fb6d 更新订单和售后退款详情页面路由 
(cherry picked from commit 264a29e451)
 2023-09-20 12:33:33 +08:00
puhui999
e777f77ba9 订单列表：添加配送方式筛选 
(cherry picked from commit 688dad319e)
 2023-09-20 12:33:30 +08:00
puhui999
ca94a1f274 商品列表：修复添加属性时会返回已存在属性值的问题 
(cherry picked from commit 5c7796ca6f)
 2023-09-20 12:33:25 +08:00
puhui999
95f0a06667 订单售后列表：完善部分 TODO 
(cherry picked from commit f5a1772464)
 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 3e67f3bc4c)
 2023-09-20 12:33:10 +08:00
YunaiV
8364e52477 code review：售后详情 
(cherry picked from commit 29b8d06ff2)
 2023-09-20 12:32:48 +08:00
owen
c999b72692 mall：优惠券 商品适用范围，增加商品分类 
(cherry picked from commit 27219e1833)
 2023-09-20 12:30:42 +08:00
owen
404bb00dbf mall：优惠券 商品选择组件 
(cherry picked from commit 60d2e3114b)
 2023-09-20 12:30:37 +08:00
puhui999
c738fd417a 订单售后列表：完善售后详情及相关操作 
(cherry picked from commit ed739aec55)
 2023-09-20 12:30:14 +08:00
YunaiV
ed41a9bed6 重构：商品详情界面的路由、文件路径 
(cherry picked from commit 8d026f0837)
 2023-09-20 12:30:02 +08:00
xingyu
a793bf55a8 perf: add ep include 
(cherry picked from commit e8dce93d66)
 2023-09-20 12:28:31 +08:00
xingyu
c3ccd02f9e fix: router 
(cherry picked from commit 54c41b4445)
 2023-09-20 12:28:23 +08:00
xingyu
edcd50b6a6 docs: update deps 
(cherry picked from commit 5724539caf)
 2023-09-20 12:28:19 +08:00
xingyu
21ac6e0c3e fix: router 
(cherry picked from commit 547b1741fc)
 2023-09-20 12:27:24 +08:00
xingyu
41b04cfac1 chore: update deps 
(cherry picked from commit bd2d6adafa)
 2023-09-20 12:26:00 +08:00
puhui999
52776c97da 订单售后列表：初始化售后详情 
(cherry picked from commit 8a51c9c771)
 2023-09-20 12:25:56 +08:00
puhui999
875211e24f 订单售后列表：重构列表 
(cherry picked from commit 4f81468695)
 2023-09-20 12:25:50 +08:00
puhui999
109e18dba6 订单列表： 修复差异 
(cherry picked from commit 8239ca474f)
 2023-09-20 12:25:45 +08:00
owen
529ac7d347 mall: 完善后台发送优惠券 
(cherry picked from commit beef6a0a94)
 2023-09-20 12:25:36 +08:00
YunaiV
b9c0d4ffa5 code review：商品评论 
(cherry picked from commit 5cd01903e4)
 2023-09-20 12:24:24 +08:00
YunaiV
4ffc150701 code review：会员中心 
(cherry picked from commit 2d8d323767)
 2023-09-20 12:23:45 +08:00
绮梦
48a230aac4 账户信息组件 增加等级、成长值和积分的显示。 
增加一些配套的svg 图标。
增加tab 的懒加载。

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

(cherry picked from commit 15971b6feb)
 2023-09-20 12:23:04 +08:00
YunaiV
b55b9966d6 code review：订单列表 
(cherry picked from commit b8ca5800c6)
 2023-09-20 12:22:48 +08:00
YunaiV
0e36aea9ff code review：商品评论 
(cherry picked from commit 84c5eb9942)
 2023-09-20 12:22:22 +08:00
YunaiV
e97a62fe06 code review：用户详情 
(cherry picked from commit 1b6c9b2e29)
 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 814b4631c9)
 2023-09-20 12:19:40 +08:00
绮梦
72e494c532 重命名组件名称,增加用户地址查看api和页面、统一组件的props userId 变量名。 
(cherry picked from commit 28951fb31d)
 2023-09-20 12:19:00 +08:00
puhui999
41be920135 订单列表：优化订单列表页面结构 
(cherry picked from commit 58502b1241)
 2023-09-20 12:18:24 +08:00
puhui999
9d9ccaa1b8 完善 code review 提到的问题 
(cherry picked from commit 7db6c121bb)
 2023-09-20 12:18:16 +08:00
AKING
295d04e1f3 update src/components/Pagination/index.vue. 
解决了当全局size为small的时候分页组件样式太大的问题，当组件为small时，则会显示小的分页组件，具体请参照ep官网：https://element-plus.org/zh-CN/component/pagination.html#%E9%99%84%E5%8A%A0%E5%8A%9F%E8%83%BD

Signed-off-by: AKING <2734339436@qq.com>

(cherry picked from commit ff8a8e7243)
 2023-09-20 12:18:03 +08:00