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 |
|
芋道源码
|
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 4ae1722e72)
|
2023-09-20 12:42:56 +08:00 |
|
xingyu
|
b2f813aa29
|
chore: vscode setting
(cherry picked from commit 2035484a83)
|
2023-09-20 12:42:52 +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 |
|
xingyu
|
3630ff4e9b
|
chore: 1.8.1-snapshot
(cherry picked from commit 1fe950aea5)
|
2023-09-20 12:42:23 +08:00 |
|
xingyu
|
d3571369c8
|
docs: update version
(cherry picked from commit 8f0c6625de)
|
2023-09-20 12:41:40 +08:00 |
|
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 |
|