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 |
|
YunaiV
|
e35ef6fec7
|
恢复 SSO 界面的路由
(cherry picked from commit e2a08ddbac)
|
2024-03-05 16:51:13 +08:00 |
|
jason
|
e5f043c24b
|
钱包- 钱包余额查询
(cherry picked from commit 90d6f4da9f)
|
2024-03-05 16:51:04 +08:00 |
|
puhui999
|
7c41ce1796
|
营销活动：新增文章管理。
(cherry picked from commit befffb3f7d)
|
2024-03-05 16:50:47 +08:00 |
|
dhb52
|
50197497b3
|
fix: 删除SSOLogin.vue组建，解决登录界面不停重定向问题
(cherry picked from commit 89417ac393)
|
2024-03-05 16:50:43 +08:00 |
|
dhb52
|
f1909bf365
|
fix: 路由缺少name字段，ts不高兴
(cherry picked from commit 3587d1ef97)
|
2024-03-05 16:50:37 +08:00 |
|
dhb52
|
5bf9baf456
|
feat: 社交平台登录
(cherry picked from commit 4d77d7e136)
|
2024-03-05 16:50:30 +08:00 |
|
puhui999
|
54e1a8843b
|
营销活动：新增文章分类管理
(cherry picked from commit 36bb90fbb8)
|
2024-03-05 16:50:22 +08:00 |
|
jason
|
7162525bc7
|
钱包-充值套餐
(cherry picked from commit f9d0c1aa1c)
|
2024-03-05 16:49:58 +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
|
d4d41701ab
|
营销活动：完善 review 提到的问题，添加拼团列表查看弹窗
(cherry picked from commit b08e0e5ab2)
|
2024-03-05 16:48:39 +08:00 |
|
puhui999
|
848e0b7023
|
营销活动：完善 review 提到的问题，添加拼团列表查看弹窗
(cherry picked from commit 3500a20630)
|
2024-03-05 16:33:41 +08:00 |
|
youkehai
|
dbcefcca9b
|
fix: 减签按钮显示和api地址修改
(cherry picked from commit 62a953815d)
|
2024-03-05 16:33:32 +08:00 |
|
owen
|
c4e6163437
|
统计：会员统计
(cherry picked from commit 22adab8590)
|
2024-03-05 16:32:14 +08:00 |
|
shizhong
|
f0cdee8e9a
|
fix: 【工作流】--加签减签
|
2024-03-05 16:31:04 +08:00 |
|
风狗
|
a2c4cb22f4
|
修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Signed-off-by: 风狗 <909275705@qq.com>
(cherry picked from commit aa5f27bec7)
|
2024-03-05 16:05:34 +08:00 |
|
YunaiV
|
a06369d427
|
code review：拼团记录列表
(cherry picked from commit 86323f970b)
|
2024-03-05 16:05:22 +08:00 |
|
天痕
|
abca5a7669
|
修复，刷新菜单缓存失效问题
Signed-off-by: 天痕 <614891294@qq.com>
(cherry picked from commit fff4cfd012)
|
2024-03-05 16:05:13 +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 |
|
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 |