puhui999
|
ea546e4831
|
完善文章管理 review 提到的问题
(cherry picked from commit 0730e215d8)
|
2024-03-05 17:20:29 +08:00 |
|
zhangshuai
|
9f04b8e34b
|
限时折扣
(cherry picked from commit 9f77514c17)
|
2024-03-05 17:20:00 +08:00 |
|
puhui999
|
139f45003d
|
SPU: 新增完善活动优先级拖拽排序
(cherry picked from commit 1e8945de63)
|
2024-03-05 17:16:39 +08:00 |
|
puhui999
|
ccec7ad410
|
SPU: 完善优惠卷选择
(cherry picked from commit 01d78429cc)
|
2024-03-05 17:15:16 +08:00 |
|
puhui999
|
de53601fcb
|
SPU: 完善优惠卷选择
(cherry picked from commit 18df708b49)
|
2024-03-05 17:14:29 +08:00 |
|
YunaiV
|
801ea4c176
|
code review：门店自提
(cherry picked from commit 2457665b55)
|
2024-03-05 17:14:23 +08:00 |
|
puhui999
|
e9da54b100
|
SPU: 新增优惠卷选择
(cherry picked from commit 3464bb9c74)
|
2024-03-05 17:12:24 +08:00 |
|
puhui999
|
b8b549462d
|
OrderTableColumn: 商品信息列样式调整2
(cherry picked from commit 5b3bcecef2)
|
2024-03-05 17:12:20 +08:00 |
|
puhui999
|
a313663c99
|
OrderTableColumn: 商品信息列样式调整
(cherry picked from commit 094f8e16db)
|
2024-03-05 17:12:15 +08:00 |
|
puhui999
|
9dae60b597
|
订单列表：完善表头宽度自适应
(cherry picked from commit 5270c83876)
|
2024-03-05 17:11:37 +08:00 |
|
puhui999
|
bb18f469de
|
订单列表：自定义列抽离封装为组件
(cherry picked from commit 04d88ce1a6)
|
2024-03-05 17:11:17 +08:00 |
|
puhui999
|
432620ffec
|
营销文章：新增表单属性移除浏览量
(cherry picked from commit d1a3fe5d5a)
|
2024-03-05 17:10:30 +08:00 |
|
owen
|
d04c1f0213
|
统计卡片修改为全局组件
(cherry picked from commit 431fff28ce)
|
2024-03-05 17:08:22 +08:00 |
|
owen
|
174b95fdef
|
交易：核销订单
(cherry picked from commit 61b3bdfd4c)
|
2024-03-05 17:07:35 +08:00 |
|
owen
|
18b7dd3b7e
|
交易：订单核销
(cherry picked from commit 6fc232b758)
|
2024-03-05 17:06:12 +08:00 |
|
owen
|
aaead6c2b9
|
统计：修复错误
(cherry picked from commit e3a0cfe5e9)
|
2024-03-05 17:03:47 +08:00 |
|
owen
|
1dba566d1d
|
统计：trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】
(cherry picked from commit 6204ce6c1b)
|
2024-03-05 17:03:42 +08:00 |
|
owen
|
25a1e27a12
|
统计：Review修改
(cherry picked from commit cd4b4cd322)
|
2024-03-05 17:03:35 +08:00 |
|
YunaiV
|
e3f1c21e53
|
code review：文章管理
(cherry picked from commit 66ec610801)
|
2024-03-05 17:03:19 +08:00 |
|
xingyu
|
d02f5570f5
|
style: stylelint
(cherry picked from commit 1a1b70a350)
|
2024-03-05 16:59:51 +08:00 |
|
owen
|
35803ba77a
|
统计：会员终端统计，处理未知终端情况
(cherry picked from commit edfd03903f)
|
2024-03-05 16:53:34 +08:00 |
|
owen
|
d46adb0683
|
统计：处理会员性别统计，存在未知的情况
(cherry picked from commit 2bfc9c3b13)
|
2024-03-05 16:53:25 +08:00 |
|
owen
|
eddac7c9be
|
统计：修复错误
(cherry picked from commit 661e72bcfd)
|
2024-03-05 16:53:16 +08:00 |
|
owen
|
3c51e98682
|
统计：Review修改
(cherry picked from commit e1a72779d4)
|
2024-03-05 16:53:07 +08:00 |
|
YunaiV
|
f0542fef06
|
code review：文章管理
(cherry picked from commit 99172ea088)
|
2024-03-05 16:52:46 +08:00 |
|
owen
|
230d073fb8
|
商城：增加商城首页
(cherry picked from commit 3802fee661)
|
2024-03-05 16:52:31 +08:00 |
|
puhui999
|
7c41ce1796
|
营销活动：新增文章管理。
(cherry picked from commit befffb3f7d)
|
2024-03-05 16:50:47 +08:00 |
|
puhui999
|
54e1a8843b
|
营销活动：新增文章分类管理
(cherry picked from commit 36bb90fbb8)
|
2024-03-05 16:50:22 +08:00 |
|
xingyu
|
46bce2750f
|
fix: unocss eslint
(cherry picked from commit e04ca7aac7)
|
2024-03-05 16:49:25 +08:00 |
|
YunaiV
|
721fc5c026
|
code review：拼团记录列表
(cherry picked from commit 855b37c1ab)
|
2024-03-05 16:48:59 +08:00 |
|
puhui999
|
848e0b7023
|
营销活动：完善 review 提到的问题，添加拼团列表查看弹窗
(cherry picked from commit 3500a20630)
|
2024-03-05 16:33:41 +08:00 |
|
owen
|
c4e6163437
|
统计：会员统计
(cherry picked from commit 22adab8590)
|
2024-03-05 16:32:14 +08:00 |
|
YunaiV
|
a06369d427
|
code review：拼团记录列表
(cherry picked from commit 86323f970b)
|
2024-03-05 16:05:22 +08:00 |
|
puhui999
|
9f836ad25b
|
拼团记录：优化页面布局，添加日期快捷选项
(cherry picked from commit 5b4983a3e9)
|
2024-03-05 16:04:54 +08:00 |
|
puhui999
|
799ec653dd
|
拼团活动：表单添加虚拟成团控制按钮
(cherry picked from commit 8c347e5990)
|
2024-03-05 16:04:45 +08:00 |
|
puhui999
|
22449ed21a
|
拼团记录：接口对接
(cherry picked from commit c445173855)
|
2024-03-05 16:04:39 +08:00 |
|
YunaiV
|
edfc7e7c01
|
promotion：调整拼团活动的界面
(cherry picked from commit 24fc36e23a)
|
2024-03-05 16:04:34 +08:00 |
|
puhui999
|
8346717986
|
拼团记录： 完成 UI 部分
(cherry picked from commit eee3d0fef5)
|
2024-03-05 16:04:27 +08:00 |
|
owen
|
e30e0e2d32
|
统计：交易统计Review修改
(cherry picked from commit 2a58b04a98)
|
2024-03-05 16:03:05 +08:00 |
|
YunaiV
|
2b4c192423
|
promotion：调整拼团活动的界面
(cherry picked from commit 78062dd474)
|
2024-03-05 16:03:00 +08:00 |
|
YunaiV
|
be2f92754b
|
promotion：新增记录记录列表
(cherry picked from commit cf7ac2cb10)
|
2024-03-05 15:58:09 +08:00 |
|
YunaiV
|
d9ec3f6e61
|
promotion：新增砍价记录列表
(cherry picked from commit 860872a890)
|
2024-03-05 15:58:04 +08:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
YunaiV
|
ca0ec86913
|
code review：会员详情
(cherry picked from commit 0e2ea39591)
|
2023-09-25 12:41:27 +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
|
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 |
|
puhui999
|
c960ba1e20
|
完善订单详情和售后退款日志展示样式重构
(cherry picked from commit 46fd154e3a)
|
2023-09-25 12:24:59 +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 |
|
xingyu
|
e2040244cf
|
fix: eslint
(cherry picked from commit 5494756a66)
|
2023-09-20 12:42:48 +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 |
|