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

928 Commits

Author SHA1 Message Date
YunaiV
171bf0154a promotion：优化砍价活动的管理 
(cherry picked from commit 42f0bf07f0)
 2024-03-05 15:57:52 +08:00
owen
cbba91dac5 交易：核销 
(cherry picked from commit 58b6b1ba57)
 2024-03-05 15:57:14 +08:00
YunaiV
e92709da70 promotion：优化秒杀活动的界面 
(cherry picked from commit 7c491ff62a)
 2024-03-05 15:57:09 +08:00
YunaiV
517d4ac28e promotion：优化优惠劵的界面 
(cherry picked from commit 40f44fc78e)
 2024-03-05 15:55:09 +08:00
YunaiV
72681f209b trade：优化分销界面的 width 列宽度，和一些非空判断 
(cherry picked from commit 59ab6218ca)
 2024-03-05 15:55:05 +08:00
YunaiV
f98f79235e trade：优化门店的 list 列表，新增是否自提的配置项 
(cherry picked from commit ab95d87c68)
 2024-03-05 15:54:54 +08:00
YunaiV
7d44b98116 trade：优化运费模版的实现 
(cherry picked from commit a9bbbc7b0a)
 2024-03-05 15:54:35 +08:00
YunaiV
de47866f49 trade：完善退款详情 
(cherry picked from commit bb08f6f54f)
 2024-03-05 15:54:27 +08:00
owen
d4a9f844dc 对齐面包屑的图标和文字 
(cherry picked from commit 4c077711a1)
 2024-03-05 15:54:04 +08:00
YunaiV
6a8aa02960 trade：完善订单详情 
(cherry picked from commit 4fddbccea1)
 2024-03-05 15:53:59 +08:00
YunaiV
a83db39abf trade：微调 order 列表界面 
(cherry picked from commit 588ce1c9ae)
 2024-03-05 15:53:54 +08:00
YunaiV
23c4bde627 product：优化商品评论 
(cherry picked from commit 17c31978f7)
 2024-03-05 15:53:47 +08:00
YunaiV
41b30ed659 product：优化属性列表 
(cherry picked from commit 8b7543acd5)
 2024-03-05 15:53:43 +08:00
YunaiV
74a43565f6 product：优化分类列表 
(cherry picked from commit 5f80d1611c)
 2024-03-05 15:53:39 +08:00
YunaiV
1ddd72cc46 product：优化商品发布页 
(cherry picked from commit 88677ee121)
 2024-03-05 15:53:35 +08:00
YunaiV
f1900d7717 product：优化商品列表的样式、实现代码 
(cherry picked from commit 3a9668d632)
 2024-03-05 15:53:27 +08:00
owen
e05b749e4d 会员：会员配置的积分相关字段加上point前缀 
(cherry picked from commit 3a96812d47)
 2024-03-05 15:53:20 +08:00
owen
24a650d89b 会员：积分配置改为会员配置 
(cherry picked from commit 3ab1ed707f)
 2024-03-05 15:53:16 +08:00
owen
6b6c9f5f02 签到：签到后增加用户积分、经验 
(cherry picked from commit 0066d79876)
 2024-03-05 15:52:41 +08:00
owen
18bdea83be 会员详情，修改会员积分 
(cherry picked from commit 4b7e57e67d)
 2024-03-05 15:52:21 +08:00
owen
f9ff762977 会员：会员详情-推广用户列表 
(cherry picked from commit 940a102546)
 2024-03-05 15:52:12 +08:00
owen
5a2d22d285 会员：会员详情-优惠券列表 
(cherry picked from commit b48f19c646)
 2024-03-05 15:52:06 +08:00
owen
05e6668322 会员详情，查询钱包信息 
(cherry picked from commit 675f3df5cb)
 2024-03-05 15:50:46 +08:00
owen
9b4bb4025b 统计：交易统计 
(cherry picked from commit c322fb3d0d)
 2024-03-05 15:50:37 +08:00
owen
7412d02e67 fix eslint problems 
(cherry picked from commit 150c77cff0)
 2024-03-05 15:50:20 +08:00
YunaiV
106e6ceada trade：退款理由的维护 
(cherry picked from commit fb94ae9674)
 2024-03-05 15:50:03 +08:00
YunaiV
8d57126589 trade：分佣界面的微调 
(cherry picked from commit 04e02ffbd2)
 2024-03-05 13:19:36 +08:00
YunaiV
bf4ab7e58b trade：优化交易配置的参数校验 
(cherry picked from commit 74de8e9687)
 2024-03-05 13:17:57 +08:00
YunaiV
d299ad9395 增加 user detail 的 todo 
(cherry picked from commit c6031ba2b2)
 2024-03-05 13:17:30 +08:00
owen
75e0a701f3 分销：修正分享海报 
(cherry picked from commit a5dd7f4a81)
 2024-03-05 13:14:55 +08:00
owen
28d312c857 分销：重命名提现类型字段 
(cherry picked from commit 2c22ef8ef1)
 2024-03-05 13:14:11 +08:00
shizhong
6be1aac0af BUG 2024-02-19 22:33:40 +08:00
shizhong
e89c48933f feat: 【工作流】--委派 2023-10-02 12:54:22 +08:00
shizhong
1b9bdf851c feat: 【工作流】--委派 2023-09-27 16:22:37 +08:00
shizhong
842ca8f672 feat: 【工作流】--委派 2023-09-27 16:13:42 +08:00
shizhong
76f8f9d942 feat: 【工作流】--委派 2023-09-27 16:00:40 +08:00
shizhong
3e08217c0d feat: 【工作流】--委派 2023-09-27 11:22:19 +08:00
youkehai
1b30ca07ed feat: 对齐后端-工作流委派的参数 
(cherry picked from commit 0fba0d9a6a)
 2023-09-26 19:57:05 +08:00
shizhong
2c74888712 feat: 【工作流】--委派 2023-09-26 19:56:57 +08:00
shizhong
b80702cd9d refactor: vue3.3 defineOptions 2023-09-26 19:43:55 +08:00
shizhong
37a5531132 解决import问题 2023-09-25 17:39:25 +08:00
shizhong
0670facae4 解决处理顶级非目录路由的组件名称逻辑缺失的问题 2023-09-25 15:08:24 +08:00
YunaiV
d46b9deb18 code review：驳回逻辑 
(cherry picked from commit 245147223f)
 2023-09-25 13:32:48 +08:00
shizhong
715cf6c85f fix: 【工作流】--回退的高亮和api地址更换 2023-09-25 13:32:35 +08:00
kehaiyou
0bef9924fe fix: 【工作流】--回退的高亮和api地址更换 
(cherry picked from commit f40d1de62a)
 2023-09-25 13:30:17 +08:00
shizhong
05e3f9ad02 修复 member 详情无法展示的问题 2023-09-25 13:29:16 +08:00
YunaiV
fa3acb21b0 修复 member 详情无法展示的问题 
(cherry picked from commit 539f8a5bb5)
 2023-09-25 13:24:41 +08:00
shizhong
3542b50f7d feat: 支持回退按钮 2023-09-25 13:23:11 +08:00
kehaiyou
6888fd90d1 feat: 支持回退按钮 
(cherry picked from commit de79e79d91)
 2023-09-25 13:15:55 +08:00
owen
417be9f6ae Trade: 完善配置 
(cherry picked from commit 21c67b1b75)
 2023-09-25 13:14:23 +08:00
shizhong
969155c6cf style: unocss eslint 2023-09-25 13:14:05 +08:00
owen
36f6745ecb trade: 分销业务 - 佣金提现后台管理 
(cherry picked from commit 854acf6e70)
 2023-09-25 12:48:07 +08:00
owen
3f127d4d44 trade: 分销业务review代码修改 
(cherry picked from commit 18b6c70d1a)
 2023-09-25 12:48:04 +08:00
绮梦
8d06ee2b39 订单详情页面 请求详情接口改为真实携带的id 
(cherry picked from commit 245301452c)
 2023-09-25 12:47:58 +08:00
YunaiV
96a96b1a5d 增加 404 的说明 
(cherry picked from commit 1be57ea8d3)
 2023-09-25 12:47:49 +08:00
YunaiV
da5ea7c43b code review：订单相关的逻辑 
(cherry picked from commit 8b65a2866e)
 2023-09-25 12:46:49 +08:00
owen
52def241f8 trade: 分销业务review代码修改 
(cherry picked from commit 2e830d14d5)
 2023-09-25 12:43:29 +08:00
owen
4d1ecf7161 trade: 分销业务后台功能：推广订单列表 
(cherry picked from commit 0582d41972)
 2023-09-25 12:43:25 +08:00
owen
9117f56533 trade: 分销业务后台功能：推广用户列表 
(cherry picked from commit 2aa372d8f4)
 2023-09-25 12:43:19 +08:00
puhui999
9607127897 spu：分佣属性和分佣保持一致 
(cherry picked from commit 5dc0c6e3da)
 2023-09-25 12:43:15 +08:00
puhui999
4dda8d2ab7 order：完善订单聚合搜索 
(cherry picked from commit 615763d415)
 2023-09-25 12:43:09 +08:00
puhui999
2e4cad38bb mall-order：修复 todo 提到的问题 
(cherry picked from commit 7e511d1e4f)
 2023-09-25 12:42:27 +08:00
owen
fc77eb3b89 trade: 分销业务后台功能：佣金格式化 
(cherry picked from commit 87ca916e69)
 2023-09-25 12:42:13 +08:00
owen
ad35b40a76 trade: 分销业务后台功能：修改上级推广人 
(cherry picked from commit 5ed909263a)
 2023-09-25 12:42:08 +08:00
owen
9dbf4feeae trade: 分销业务后台功能：清除推广员、修改推广资格 
(cherry picked from commit 7ea3571356)
 2023-09-25 12:42:04 +08:00
puhui999
3f0ec5cf16 登录界面：姐姐点击登录后界面疯狂闪动的问题 
(cherry picked from commit a79f1452b3)
 2023-09-25 12:41:45 +08:00
YunaiV
ca0ec86913 code review：会员详情 
(cherry picked from commit 0e2ea39591)
 2023-09-25 12:41:27 +08:00
shizhong
fa0c84da02 Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev 2023-09-25 12:40:29 +08:00
YunaiV
58f01a8bc5 code review：完善订单详情和售后退款 TODO 提到的问题 
(cherry picked from commit 3c315cf287)
 2023-09-25 12:38:53 +08:00
owen
ba8840de4f trade: 分销员表格佣金字段格式化 
(cherry picked from commit dbb87e3850)
 2023-09-25 12:38:37 +08:00
owen
f0d95e4a93 trade: 优化分销用户佣金字段名称 
(cherry picked from commit e9d5027e72)
 2023-09-25 12:38:25 +08:00
owen
91ab91fdbb trade: 优化分销用户绑定用户编号、绑定时间字段名称 
(cherry picked from commit 7263315412)
 2023-09-25 12:38:22 +08:00
owen
eab116cfce trade: 分销用户管理 
(cherry picked from commit 34ce7f7ec5)
 2023-09-25 12:38:18 +08:00
puhui999
241f4ec092 完善订单详情 
(cherry picked from commit b3639977a7)
 2023-09-25 12:38:06 +08:00
puhui999
69eb2c0f3a 完善订单详情和售后退款 TODO 提到的问题 
(cherry picked from commit 73628d3930)
 2023-09-25 12:30:24 +08:00
owen
b398062102 trade: 分销业务从 member 模块 转移到 trade模块 
(cherry picked from commit 1e2120806d)
 2023-09-25 12:30:17 +08:00
owen
d33f42a525 trade: 分销业务从 member 模块 转移到 trade模块 
(cherry picked from commit 2ed5d12be8)
 2023-09-25 12:30:13 +08:00
owen
f5804431a3 trade: 增加交易中心配置表 
(cherry picked from commit 35664d1f32)
 2023-09-25 12:30:09 +08:00
绮梦
9295030153 新增用户详情下订单页面 
(cherry picked from commit 2318f176a6)
 2023-09-25 12:29:17 +08:00
绮梦
b58b8bb6ea 新增用户详情下成长值页面。 
(cherry picked from commit fe6cf7ce98)
 2023-09-25 12:26:40 +08:00
owen
4d0f941f7c member: 佣金记录 
(cherry picked from commit 73f8cef3b4)
 2023-09-25 12:25:28 +08:00
owen
c2f411607e member: 分销配置 
(cherry picked from commit 5a9764c08c)
 2023-09-25 12:25:23 +08:00
puhui999
c960ba1e20 完善订单详情和售后退款日志展示样式重构 
(cherry picked from commit 46fd154e3a)
 2023-09-25 12:24:59 +08:00
shizhong
b6e6b2c49d chore: stylelint(use pnpm lint:style) 2023-09-22 14:43:10 +08:00
shizhong
5cfe65b87a refactor: 统一 setup 格式 2023-09-22 14:25:05 +08:00
shizhong
7e5ad60d1d refactor: vue3.3 defineOptions 2023-09-22 14:00:50 +08:00
shizhong
20f483f561 refactor: vue3.3 defineOptions 2023-09-22 12:49:25 +08:00
shizhong
ee44bef034 样式 2023-09-20 17:36:08 +08:00
shizhong
ec76b555a3 解决合并出现的问题 2023-09-20 16:53:38 +08:00
xingyu
e2040244cf fix: eslint 
(cherry picked from commit 5494756a66)
 2023-09-20 12:42:48 +08:00
xingyu
ba6544a8c3 fix: #I7WY9N 
(cherry picked from commit 56a71f64e7)
 2023-09-20 12:42:42 +08:00
xingyu
0b7593fbd4 fix: avatar 
(cherry picked from commit 9a6d29b295)
 2023-09-20 12:42:31 +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
c3ccd02f9e fix: router 
(cherry picked from commit 54c41b4445)
 2023-09-20 12:28:23 +08:00
xingyu
21ac6e0c3e fix: router 
(cherry picked from commit 547b1741fc)
 2023-09-20 12:27:24 +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
绮梦
3ee076d0d9 重命名组件名称 
(cherry picked from commit f17bb9a7eb)
 2023-09-20 12:17:22 +08:00
绮梦
2804d199c0 会员详情页的跳转携带参数方式改为params 
(cherry picked from commit d1bb736973)
 2023-09-20 12:17:11 +08:00
xingyu
d327d28755 fix: 路径错误 
(cherry picked from commit e30d5559e6)
 2023-09-20 12:16:52 +08:00
绮梦
6b2064d979 会员列表页面增加详情页的跳转。 
(cherry picked from commit 451458eb1e)
 2023-09-20 12:16:36 +08:00
owen
4de2049956 会员: 会员等级取消分页功能 
(cherry picked from commit e9120f06cf)
 2023-09-20 12:14:25 +08:00
YunaiV
92423dc00b code review：用户详情 
(cherry picked from commit 55772cbba0)
 2023-09-20 12:14:21 +08:00
YunaiV
46ab58ddf0 code review：订单列表、订单详情 
(cherry picked from commit cfbc2ed74c)
 2023-09-20 12:14:05 +08:00
YunaiV
6556feed21 code review：会员等级 
(cherry picked from commit bb0c1cb536)
 2023-09-20 12:13:05 +08:00
puhui999
edb88f8548 订单列表：列表重构 添加门店、物流检索条件 
(cherry picked from commit 5dceda614a)
 2023-09-20 12:12:58 +08:00
puhui999
300cfe694b 订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注 
(cherry picked from commit 83e780da06)
 2023-09-20 12:12:55 +08:00
puhui999
99ef6f83ba 订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注 
(cherry picked from commit be143ea21b)
 2023-09-20 12:12:52 +08:00
AKING
70b1161ec1 update src/components/Dialog/src/Dialog.vue. 
解决了单独使用elementplus diaolog组件时，样式被篡改的问题


Signed-off-by: AKING <2734339436@qq.com>
(cherry picked from commit cba35d698f)
 2023-09-20 12:12:35 +08:00
绮梦
943516c502 用户详情-积分tab 去除无用的组件。 
(cherry picked from commit c1a40e7c98)
 2023-09-20 12:12:20 +08:00