owen
|
3f127d4d44
|
trade: 分销业务review代码修改
(cherry picked from commit 18b6c70d1a)
|
2023-09-25 12:48:04 +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 |
|
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 |
|
owen
|
ba8840de4f
|
trade: 分销员表格佣金字段格式化
(cherry picked from commit dbb87e3850)
|
2023-09-25 12:38:37 +08:00 |
|
puhui999
|
69eb2c0f3a
|
完善订单详情和售后退款 TODO 提到的问题
(cherry picked from commit 73628d3930)
|
2023-09-25 12:30:24 +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 |
|
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 |
|
owen
|
c999b72692
|
mall：优惠券 商品适用范围，增加商品分类
(cherry picked from commit 27219e1833)
|
2023-09-20 12:30:42 +08:00 |
|
YunaiV
|
b55b9966d6
|
code review：订单列表
(cherry picked from commit b8ca5800c6)
|
2023-09-20 12:22:48 +08:00 |
|
绮梦
|
72e494c532
|
重命名组件名称,增加用户地址查看api和页面、统一组件的props userId 变量名。
(cherry picked from commit 28951fb31d)
|
2023-09-20 12:19:00 +08:00 |
|
puhui999
|
9d9ccaa1b8
|
完善 code review 提到的问题
(cherry picked from commit 7db6c121bb)
|
2023-09-20 12:18:16 +08:00 |
|
YunaiV
|
46ab58ddf0
|
code review：订单列表、订单详情
(cherry picked from commit cfbc2ed74c)
|
2023-09-20 12:14:05 +08:00 |
|
puhui999
|
99ef6f83ba
|
订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注
(cherry picked from commit be143ea21b)
|
2023-09-20 12:12:52 +08:00 |
|
puhui999
|
c89d08e22a
|
订单列表：列表重构 ② and 完善订单详情
(cherry picked from commit 345c09ee6c)
|
2023-09-20 12:10:57 +08:00 |
|
YunaiV
|
f48c55a0b6
|
code review：积分记录
(cherry picked from commit 4bc3f15571)
|
2023-09-19 21:04:10 +08:00 |
|
dhb52
|
149a463a6b
|
fix: 支付管理/退款订单 对标 vue2
(cherry picked from commit 620a2009c3)
|
2023-09-19 20:51:33 +08:00 |
|
YunaiV
|
db1e2beaf0
|
code review：优化收银台的实现，解决 TODO
(cherry picked from commit 7625e6757c)
|
2023-09-19 20:44:38 +08:00 |
|
dhb52
|
191d149959
|
feat: 支付功能迁移（初稿）
(cherry picked from commit a6eab3cc9a)
|
2023-09-19 20:39:21 +08:00 |
|
YunaiV
|
544adb9811
|
支付应用：模拟支付的添加代码优化
(cherry picked from commit a2fdff47df)
|
2023-09-19 20:32:24 +08:00 |
|
dhb52
|
3f479ecffc
|
feat: 支付管理/应用信息(alpha)
(cherry picked from commit 323417b0d4)
|
2023-09-19 20:25:26 +08:00 |
|
shizhong
|
b376e8e2a8
|
增加部门和菜单的详情，解决个人中心无法上传图片的问题
|
2023-08-22 17:33:04 +08:00 |
|
puhui999
|
0394f81dab
|
fix: mall SeckillActivity and CombinationActivity
(cherry picked from commit 4057130275)
|
2023-07-27 19:41:21 +08:00 |
|
YunaiV
|
23fa3fe14c
|
review 积分配置
(cherry picked from commit 4571f893ed)
|
2023-07-27 19:37:26 +08:00 |
|
puhui999
|
22f869db89
|
feat: mall CombinationActivity
(cherry picked from commit 2e96b1c984)
|
2023-07-27 19:36:45 +08:00 |
|
xiaqing
|
195ae79bfc
|
会员中心代码
1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码
(cherry picked from commit 4251dc5d61)
|
2023-07-27 19:36:28 +08:00 |
|
YunaiV
|
a22eea8e90
|
review 营销活动
(cherry picked from commit 5d613e69b3)
|
2023-07-27 19:34:54 +08:00 |
|
puhui999
|
a233d16dbb
|
feat: 秒杀时段管理
(cherry picked from commit a75720ec06)
|
2023-07-27 19:14:47 +08:00 |
|
YunaiV
|
8bf1f04044
|
code review：订单列表
(cherry picked from commit e3f250fff0)
|
2023-07-27 19:11:50 +08:00 |
|
shizhong
|
1e8b1c8a1d
|
!165 trade-order 列表和详情初版 Merge pull request !165 from 矿泉水/dev
|
2023-07-27 19:11:40 +08:00 |
|
YunaiV
|
d4902558e6
|
code review：会员积分配置
(cherry picked from commit 5eaf054646)
|
2023-07-27 19:09:38 +08:00 |
|
shizhong
|
7a35f7fe6e
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2023-07-27 19:08:57 +08:00 |
|
YunaiV
|
24a4ed134a
|
code review：处理字典数据的冲突
(cherry picked from commit 8666307d47)
|
2023-07-27 19:07:23 +08:00 |
|
xiaqing
|
98c977a732
|
初始化积分模块
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理
(cherry picked from commit 1dca8476b3)
|
2023-07-27 19:06:34 +08:00 |
|
puhui999
|
2d88367e61
|
fix: review
(cherry picked from commit b89db1af55)
|
2023-07-27 19:02:19 +08:00 |
|
shizhong
|
274d85010f
|
add trade order 20230606
|
2023-07-27 19:01:41 +08:00 |
|
shizhong
|
45bf152dd2
|
sync dev-20230606
|
2023-07-27 19:00:31 +08:00 |
|
YunaiV
|
f641785df9
|
code review：优惠劵管理
(cherry picked from commit 51e76ffd53)
|
2023-07-27 18:53:49 +08:00 |
|
YunaiV
|
79a4aa5189
|
code review：商品管理
(cherry picked from commit 158585670c)
|
2023-07-27 18:50:01 +08:00 |
|
xiaobai
|
a29421dd41
|
临时提交
(cherry picked from commit 505f5cfa0c)
|
2023-07-27 18:44:50 +08:00 |
|
dhb52
|
e2faf6a2a4
|
style: 添加VO
(cherry picked from commit c5a7d05821)
|
2023-07-27 18:42:44 +08:00 |
|
puhui999
|
d35ac547ac
|
fix: 完善 SPU 查看详情
(cherry picked from commit 39c92cb944)
|
2023-07-27 13:10:58 +08:00 |
|
puhui999
|
cf7f4ff89e
|
fix: 修改 review 提到的问题，完善分类选择层级校验、完整层级展示
(cherry picked from commit e555977757)
|
2023-07-27 13:09:36 +08:00 |
|