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

875 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YunaiV
58f01a8bc5 code review：完善订单详情和售后退款 TODO 提到的问题 
(cherry picked from commit 3c315cf28799362c1d8b34fdf862b1fadf7db3ad)
 2023-09-25 12:38:53 +08:00
owen
ba8840de4f trade: 分销员表格佣金字段格式化 
(cherry picked from commit dbb87e385038eacfa3b4a2ce7dd6f9c42dbb0c6f)
 2023-09-25 12:38:37 +08:00
owen
f0d95e4a93 trade: 优化分销用户佣金字段名称 
(cherry picked from commit e9d5027e72d86c308b766d08936e15d4217301c1)
 2023-09-25 12:38:25 +08:00
owen
91ab91fdbb trade: 优化分销用户绑定用户编号、绑定时间字段名称 
(cherry picked from commit 726331541222c7822695b88f709a7db8f1df9d10)
 2023-09-25 12:38:22 +08:00
owen
eab116cfce trade: 分销用户管理 
(cherry picked from commit 34ce7f7ec512eaa42bf86b04ddf2e67c082ecdde)
 2023-09-25 12:38:18 +08:00
puhui999
241f4ec092 完善订单详情 
(cherry picked from commit b3639977a719ff103f98e165b14f6190a32ace47)
 2023-09-25 12:38:06 +08:00
puhui999
69eb2c0f3a 完善订单详情和售后退款 TODO 提到的问题 
(cherry picked from commit 73628d39309854e7c086a660efe7dc866a7faceb)
 2023-09-25 12:30:24 +08:00
owen
b398062102 trade: 分销业务从 member 模块 转移到 trade模块 
(cherry picked from commit 1e2120806d26f0749b89329b0dd94f0fa5d15edc)
 2023-09-25 12:30:17 +08:00
owen
d33f42a525 trade: 分销业务从 member 模块 转移到 trade模块 
(cherry picked from commit 2ed5d12be8c01bf8ed280086ef5b870f82553966)
 2023-09-25 12:30:13 +08:00
owen
f5804431a3 trade: 增加交易中心配置表 
(cherry picked from commit 35664d1f3296712e741b4f7e93830c4fdd76e799)
 2023-09-25 12:30:09 +08:00
绮梦
9295030153 新增用户详情下订单页面 
(cherry picked from commit 2318f176a60a88994e5d2139753a134e5af4e220)
 2023-09-25 12:29:17 +08:00
绮梦
b58b8bb6ea 新增用户详情下成长值页面。 
(cherry picked from commit fe6cf7ce98d475039aedf296c426e164d53e6220)
 2023-09-25 12:26:40 +08:00
owen
4d0f941f7c member: 佣金记录 
(cherry picked from commit 73f8cef3b44569f48eef2c2fb2bef3b87864a36f)
 2023-09-25 12:25:28 +08:00
owen
c2f411607e member: 分销配置 
(cherry picked from commit 5a9764c08c0a2c12cabd0416638313f9f4942db7)
 2023-09-25 12:25:23 +08:00
puhui999
c960ba1e20 完善订单详情和售后退款日志展示样式重构 
(cherry picked from commit 46fd154e3a77189b9ad748e57e13ab7f2b6aae93)
 2023-09-25 12:24:59 +08:00
芋道源码
563c3eeddf
!246 解决keep alive不生效问题，改为vue3.3 defineOptions 
Merge pull request !246 from clockdotnet/master-vxe
 2023-09-22 13:49:08 +00: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
芋道源码
6ec2ee8af4
!245 合并master上1.8.1的修改到master-vxe 
Merge pull request !245 from clockdotnet/master-vxe
 2023-09-20 14:28:20 +00:00
shizhong
ee44bef034 样式 2023-09-20 17:36:08 +08:00
shizhong
ec76b555a3 解决合并出现的问题 2023-09-20 16:53:38 +08:00
xingyu
4a0e850f42 fix: stylelint 
(cherry picked from commit 4ae1722e724632d82d37822a5ce4335b60993c46)
 2023-09-20 12:42:56 +08:00
xingyu
b2f813aa29 chore: vscode setting 
(cherry picked from commit 2035484a83286f7303b4cba3f1b698704604933c)
 2023-09-20 12:42:52 +08:00
xingyu
e2040244cf fix: eslint 
(cherry picked from commit 5494756a6609d3698e259f2ab896b519eabf46ee)
 2023-09-20 12:42:48 +08:00
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