owen
|
2bfc9c3b13
|
统计：处理会员性别统计，存在未知的情况
|
2023-10-16 13:25:15 +08:00 |
|
owen
|
661e72bcfd
|
统计：修复错误
|
2023-10-16 13:15:17 +08:00 |
|
owen
|
8dec8edc6a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-16 13:01:02 +08:00 |
|
owen
|
e1a72779d4
|
统计：Review修改
|
2023-10-16 13:00:13 +08:00 |
|
YunaiV
|
99172ea088
|
code review：文章管理
|
2023-10-16 09:57:46 +08:00 |
|
owen
|
195309dbb6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-16 09:52:35 +08:00 |
|
owen
|
3802fee661
|
商城：增加商城首页
|
2023-10-16 09:51:19 +08:00 |
|
puhui999
|
befffb3f7d
|
营销活动：新增文章管理。
|
2023-10-15 16:14:09 +08:00 |
|
puhui999
|
36bb90fbb8
|
营销活动：新增文章分类管理
|
2023-10-15 00:54:28 +08:00 |
|
xingyu
|
e04ca7aac7
|
fix: unocss eslint
|
2023-10-13 10:34:01 +08:00 |
|
芋道源码
|
532b237712
|
!268 统计：会员统计
Merge pull request !268 from 疯狂的世界/dev
|
2023-10-11 04:34:07 +00:00 |
|
YunaiV
|
855b37c1ab
|
code review：拼团记录列表
|
2023-10-11 11:04:03 +08:00 |
|
puhui999
|
3500a20630
|
营销活动：完善 review 提到的问题，添加拼团列表查看弹窗
|
2023-10-10 16:53:22 +08:00 |
|
owen
|
6b7040404e
|
统计：会员统计
|
2023-10-09 23:27:32 +08:00 |
|
owen
|
d4a521eff1
|
统计：交易统计Review修改
|
2023-10-09 23:27:32 +08:00 |
|
YunaiV
|
86323f970b
|
code review：拼团记录列表
|
2023-10-08 07:30:14 +08:00 |
|
puhui999
|
5b4983a3e9
|
拼团记录：优化页面布局，添加日期快捷选项
|
2023-10-07 11:10:26 +08:00 |
|
puhui999
|
8c347e5990
|
拼团活动：表单添加虚拟成团控制按钮
|
2023-10-07 10:04:05 +08:00 |
|
puhui999
|
e86dfa30fd
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-10-06 22:21:10 +08:00 |
|
puhui999
|
c445173855
|
拼团记录：接口对接
|
2023-10-06 22:20:40 +08:00 |
|
YunaiV
|
24fc36e23a
|
promotion：调整拼团活动的界面
|
2023-10-06 21:03:17 +08:00 |
|
puhui999
|
eee3d0fef5
|
拼团记录： 完成 UI 部分
|
2023-10-06 18:40:21 +08:00 |
|
YunaiV
|
78062dd474
|
promotion：调整拼团活动的界面
|
2023-10-06 10:58:31 +08:00 |
|
puhui999
|
869bac2501
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-10-05 21:50:33 +08:00 |
|
YunaiV
|
cf7ac2cb10
|
promotion：新增记录记录列表
|
2023-10-05 12:42:00 +08:00 |
|
YunaiV
|
860872a890
|
promotion：新增砍价记录列表
|
2023-10-05 12:06:57 +08:00 |
|
YunaiV
|
42f0bf07f0
|
promotion：优化砍价活动的管理
|
2023-10-05 02:17:44 +08:00 |
|
owen
|
58b6b1ba57
|
交易：核销
|
2023-10-04 10:51:35 +08:00 |
|
YunaiV
|
7c491ff62a
|
promotion：优化秒杀活动的界面
|
2023-10-03 18:41:57 +08:00 |
|
YunaiV
|
40f44fc78e
|
promotion：优化优惠劵的界面
|
2023-10-03 13:01:31 +08:00 |
|
YunaiV
|
59ab6218ca
|
trade：优化分销界面的 width 列宽度，和一些非空判断
|
2023-10-03 12:16:24 +08:00 |
|
YunaiV
|
ab95d87c68
|
trade：优化门店的 list 列表，新增是否自提的配置项
|
2023-10-02 21:18:31 +08:00 |
|
YunaiV
|
a9bbbc7b0a
|
trade：优化运费模版的实现
|
2023-10-02 18:30:22 +08:00 |
|
YunaiV
|
bb08f6f54f
|
trade：完善退款详情
|
2023-10-02 15:44:26 +08:00 |
|
YunaiV
|
4fddbccea1
|
trade：完善订单详情
|
2023-10-02 10:34:37 +08:00 |
|
YunaiV
|
588ce1c9ae
|
trade：微调 order 列表界面
|
2023-10-01 23:44:38 +08:00 |
|
YunaiV
|
17c31978f7
|
product：优化商品评论
|
2023-10-01 21:23:50 +08:00 |
|
YunaiV
|
8b7543acd5
|
product：优化属性列表
|
2023-10-01 21:11:47 +08:00 |
|
YunaiV
|
5f80d1611c
|
product：优化分类列表
|
2023-10-01 20:55:51 +08:00 |
|
YunaiV
|
88677ee121
|
product：优化商品发布页
|
2023-10-01 20:16:02 +08:00 |
|
YunaiV
|
3a9668d632
|
product：优化商品列表的样式、实现代码
|
2023-10-01 19:44:13 +08:00 |
|
YunaiV
|
fb94ae9674
|
trade：退款理由的维护
|
2023-09-29 13:35:52 +08:00 |
|
YunaiV
|
04e02ffbd2
|
trade：分佣界面的微调
|
2023-09-28 16:38:51 +08:00 |
|
YunaiV
|
74de8e9687
|
trade：优化交易配置的参数校验
|
2023-09-28 15:29:15 +08:00 |
|
芋道源码
|
b9881f2941
|
!252 分销：Review代码修改
Merge pull request !252 from 疯狂的世界/brokerage
|
2023-09-25 00:37:31 +00:00 |
|
owen
|
a5dd7f4a81
|
分销：修正分享海报
|
2023-09-24 23:18:50 +08:00 |
|
owen
|
2c22ef8ef1
|
分销：重命名提现类型字段
|
2023-09-24 22:32:10 +08:00 |
|
YunaiV
|
ce78336fca
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-09-24 12:10:14 +08:00 |
|
YunaiV
|
e489627748
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
# src/views/mall/trade/order/index.vue
# src/views/member/user/detail/index.vue
|
2023-09-24 12:00:10 +08:00 |
|
owen
|
21c67b1b75
|
Trade: 完善配置
|
2023-09-22 22:51:45 +08:00 |
|
xingyu
|
2a58e3f691
|
style: unocss eslint
|
2023-09-22 17:49:11 +08:00 |
|
puhui999
|
dd5a1f2d43
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-09-20 16:39:19 +08:00 |
|
芋道源码
|
df6a384321
|
!244 trade: 分销业务review代码修改
Merge pull request !244 from 疯狂的世界/brokerage
|
2023-09-19 17:12:27 +00:00 |
|
owen
|
854acf6e70
|
trade: 分销业务 - 佣金提现后台管理
|
2023-09-19 22:03:28 +08:00 |
|
owen
|
18b6c70d1a
|
trade: 分销业务review代码修改
|
2023-09-19 16:37:50 +08:00 |
|
绮梦
|
245301452c
|
订单详情页面 请求详情接口改为真实携带的id
|
2023-09-19 13:57:26 +08:00 |
|
puhui999
|
8778f5746f
|
spu：分佣属性和分佣保持一致
|
2023-09-13 10:17:14 +08:00 |
|
芋道源码
|
de615c2387
|
!241 完善分销功能
Merge pull request !241 from 疯狂的世界/brokerage
|
2023-09-12 15:19:33 +00:00 |
|
YunaiV
|
8b65a2866e
|
code review：订单相关的逻辑
|
2023-09-12 23:14:53 +08:00 |
|
xingyu
|
5494756a66
|
fix: eslint
|
2023-09-11 17:08:39 +08:00 |
|
owen
|
2e830d14d5
|
trade: 分销业务review代码修改
|
2023-09-11 00:54:11 +08:00 |
|
owen
|
0582d41972
|
trade: 分销业务后台功能：推广订单列表
|
2023-09-10 23:30:43 +08:00 |
|
owen
|
2aa372d8f4
|
trade: 分销业务后台功能：推广用户列表
|
2023-09-10 22:32:38 +08:00 |
|
puhui999
|
5dc0c6e3da
|
spu：分佣属性和分佣保持一致
|
2023-09-09 23:14:02 +08:00 |
|
puhui999
|
615763d415
|
order：完善订单聚合搜索
|
2023-09-09 23:08:28 +08:00 |
|
puhui999
|
7e511d1e4f
|
mall-order：修复 todo 提到的问题
|
2023-09-09 20:51:33 +08:00 |
|
owen
|
87ca916e69
|
trade: 分销业务后台功能：佣金格式化
|
2023-09-09 20:00:56 +08:00 |
|
owen
|
5ed909263a
|
trade: 分销业务后台功能：修改上级推广人
|
2023-09-09 19:20:12 +08:00 |
|
owen
|
7ea3571356
|
trade: 分销业务后台功能：清除推广员、修改推广资格
|
2023-09-09 14:40:06 +08:00 |
|
YunaiV
|
0e2ea39591
|
code review：会员详情
|
2023-09-09 10:06:32 +08:00 |
|
芋道源码
|
e3b9a15c26
|
!239 分销员表格佣金字段格式化
Merge pull request !239 from 疯狂的世界/brokerage
|
2023-09-09 01:46:05 +00:00 |
|
YunaiV
|
3c315cf287
|
code review：完善订单详情和售后退款 TODO 提到的问题
|
2023-09-09 01:44:08 +08:00 |
|
芋道源码
|
dbfabcbbb5
|
!238 完善订单详情和售后退款 TODO 提到的问题
Merge pull request !238 from puhui999/dev-to-dev
|
2023-09-08 17:29:05 +00:00 |
|
owen
|
dbb87e3850
|
trade: 分销员表格佣金字段格式化
|
2023-09-08 23:58:45 +08:00 |
|
owen
|
e9d5027e72
|
trade: 优化分销用户佣金字段名称
|
2023-09-08 23:10:04 +08:00 |
|
owen
|
7263315412
|
trade: 优化分销用户绑定用户编号、绑定时间字段名称
|
2023-09-08 22:51:04 +08:00 |
|
owen
|
34ce7f7ec5
|
trade: 分销用户管理
|
2023-09-08 11:05:31 +08:00 |
|
puhui999
|
b3639977a7
|
完善订单详情
|
2023-09-08 01:01:50 +08:00 |
|
puhui999
|
f44688d61c
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-09-08 01:00:59 +08:00 |
|
puhui999
|
73628d3930
|
完善订单详情和售后退款 TODO 提到的问题
|
2023-09-06 11:23:16 +08:00 |
|
owen
|
2ed5d12be8
|
trade: 分销业务从 member 模块 转移到 trade模块
|
2023-09-06 00:33:59 +08:00 |
|
owen
|
35664d1f32
|
trade: 增加交易中心配置表
|
2023-09-05 22:31:35 +08:00 |
|
puhui999
|
46fd154e3a
|
完善订单详情和售后退款日志展示样式重构
|
2023-09-03 01:44:22 +08:00 |
|
owen
|
7887be6e92
|
mall：修复优惠券模板，固定日期范围保存失败
|
2023-09-02 10:42:55 +08:00 |
|
owen
|
5f557c7be5
|
promotion: 优惠券模板 productSpuIds 改成 productScopeValues
|
2023-09-02 09:53:36 +08:00 |
|
owen
|
a68acb096f
|
mall：修复优惠券发券弹窗样式
|
2023-09-02 08:39:53 +08:00 |
|
YunaiV
|
d10530c9f5
|
code review：优惠劵逻辑
|
2023-09-02 00:34:45 +08:00 |
|
芋道源码
|
9aa7ba3578
|
!230 mall：优惠券发送优化
Merge pull request !230 from 疯狂的世界/mall_coupon_send
|
2023-09-01 16:33:43 +00:00 |
|
YunaiV
|
4f7d6793fd
|
code review：优惠劵逻辑
|
2023-09-02 00:12:21 +08:00 |
|
owen
|
76c4644b4b
|
mall：优惠券发送优化
|
2023-09-01 23:50:26 +08:00 |
|
芋道源码
|
190c6e384c
|
!225 优惠券
Merge pull request !225 from 疯狂的世界/owen_dev
|
2023-09-01 14:55:30 +00:00 |
|
YunaiV
|
0743e4941c
|
code review：订单列表
|
2023-09-01 20:03:08 +08:00 |
|
puhui999
|
f0249e94a5
|
订单管理：完善订单详情
|
2023-09-01 12:04:33 +08:00 |
|
puhui999
|
07a0530fc9
|
售后退款：完善售后管理（列表、详情）
|
2023-09-01 10:32:05 +08:00 |
|
puhui999
|
3e7945e437
|
fix: 修正合并差异
|
2023-09-01 01:24:46 +08:00 |
|
puhui999
|
5035fc77e7
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
# src/views/mall/product/spu/components/index.ts
# src/views/mall/product/spu/form/BasicInfoForm.vue
|
2023-09-01 01:20:08 +08:00 |
|
YunaiV
|
3918fab1ec
|
code review
|
2023-09-01 00:49:42 +08:00 |
|
puhui999
|
f9780b636c
|
fix: 1、修复营销活动相关页面打不开的问题 2、修复 spu 添加失败的问题 2、重构 spu 的 sku 校验方式为通用配置的方式
|
2023-08-31 21:13:20 +08:00 |
|
puhui999
|
264a29e451
|
更新订单和售后退款详情页面路由
|
2023-08-31 16:39:48 +08:00 |
|
puhui999
|
688dad319e
|
订单列表：添加配送方式筛选
|
2023-08-31 16:26:24 +08:00 |
|