puhui999
|
d62bbcdd92
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
# package.json
# src/views/member/user/detail/UserOrderList.vue
|
2023-10-20 16:40:19 +08:00 |
|
puhui999
|
3464bb9c74
|
SPU: 新增优惠卷选择
|
2023-10-19 17:33:42 +08:00 |
|
YunaiV
|
aa99c53729
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
# src/views/mall/statistics/member/index.vue
|
2023-10-17 19:02:37 +08:00 |
|
芋道源码
|
0242c84196
|
!267 【工作流】加签和减签
Merge pull request !267 from Youkehai/feature/addSignAndSubSign
|
2023-10-17 11:01:18 +00:00 |
|
xingyu
|
8c18ad941e
|
perf: is utils
|
2023-10-16 15:09:47 +08:00 |
|
xingyu
|
5da9b660bd
|
perf: propTypes
|
2023-10-16 15:09:13 +08:00 |
|
owen
|
3802fee661
|
商城：增加商城首页
|
2023-10-16 09:51:19 +08:00 |
|
芋道源码
|
889334bc37
|
!266 修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Merge pull request !266 from 风狗/N/A
|
2023-10-14 10:19:37 +00:00 |
|
芋道源码
|
6ed7b3a69e
|
!270 合并商城最新代码
Merge pull request !270 from 芋道源码/dev
|
2023-10-12 13:53:25 +00:00 |
|
puhui999
|
b08e0e5ab2
|
营销活动：完善 review 提到的问题，添加拼团列表查看弹窗
|
2023-10-10 16:55:53 +08:00 |
|
puhui999
|
3500a20630
|
营销活动：完善 review 提到的问题，添加拼团列表查看弹窗
|
2023-10-10 16:53:22 +08:00 |
|
kehaiyou
|
683e319c72
|
fix: 【工作流】--加签减签
|
2023-10-08 22:35:50 +08:00 |
|
风狗
|
aa5f27bec7
|
修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Signed-off-by: 风狗 <909275705@qq.com>
|
2023-10-08 08:26:07 +00:00 |
|
puhui999
|
5b4983a3e9
|
拼团记录：优化页面布局，添加日期快捷选项
|
2023-10-07 11:10:26 +08:00 |
|
puhui999
|
eee3d0fef5
|
拼团记录： 完成 UI 部分
|
2023-10-06 18:40:21 +08:00 |
|
YunaiV
|
860872a890
|
promotion：新增砍价记录列表
|
2023-10-05 12:06:57 +08:00 |
|
owen
|
58b6b1ba57
|
交易：核销
|
2023-10-04 10:51:35 +08:00 |
|
YunaiV
|
4fddbccea1
|
trade：完善订单详情
|
2023-10-02 10:34:37 +08:00 |
|
芋道源码
|
a5808c9e9c
|
!259 Review代码修改
Merge pull request !259 from 疯狂的世界/dev
|
2023-10-01 13:57:56 +00:00 |
|
YunaiV
|
3a9668d632
|
product：优化商品列表的样式、实现代码
|
2023-10-01 19:44:13 +08:00 |
|
owen
|
675f3df5cb
|
会员详情，查询钱包信息
|
2023-09-30 12:40:21 +08:00 |
|
owen
|
6475f81534
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-09-29 21:08:48 +08:00 |
|
owen
|
c322fb3d0d
|
统计：交易统计
|
2023-09-29 21:08:14 +08:00 |
|
YunaiV
|
74de8e9687
|
trade：优化交易配置的参数校验
|
2023-09-28 15:29:15 +08:00 |
|
shizhong
|
361e4fadda
|
解决处理顶级非目录路由的组件名称逻辑缺失的问题
|
2023-09-25 15:25:33 +08:00 |
|
owen
|
21c67b1b75
|
Trade: 完善配置
|
2023-09-22 22:51:45 +08:00 |
|
owen
|
854acf6e70
|
trade: 分销业务 - 佣金提现后台管理
|
2023-09-19 22:03:28 +08:00 |
|
owen
|
18b6c70d1a
|
trade: 分销业务review代码修改
|
2023-09-19 16:37:50 +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 |
|
YunaiV
|
0e2ea39591
|
code review：会员详情
|
2023-09-09 10:06:32 +08:00 |
|
YunaiV
|
30f0c1b351
|
Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev
Conflicts:
src/utils/dict.ts
|
2023-09-09 09:50:13 +08:00 |
|
芋道源码
|
e3b9a15c26
|
!239 分销员表格佣金字段格式化
Merge pull request !239 from 疯狂的世界/brokerage
|
2023-09-09 01:46:05 +00:00 |
|
owen
|
dbb87e3850
|
trade: 分销员表格佣金字段格式化
|
2023-09-08 23:58:45 +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 |
|
绮梦
|
fe6cf7ce98
|
新增用户详情下成长值页面。
|
2023-09-04 15:02:41 +08:00 |
|
owen
|
73f8cef3b4
|
member: 佣金记录
|
2023-09-03 23:04:20 +08:00 |
|
owen
|
5a9764c08c
|
member: 分销配置
|
2023-09-03 21:14:44 +08:00 |
|
puhui999
|
46fd154e3a
|
完善订单详情和售后退款日志展示样式重构
|
2023-09-03 01:44:22 +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 |
|
owen
|
27219e1833
|
mall：优惠券 商品适用范围，增加商品分类
|
2023-08-30 20:54:20 +08:00 |
|
YunaiV
|
b8ca5800c6
|
code review：订单列表
|
2023-08-26 11:41:43 +08:00 |
|
芋道源码
|
2605cb7de5
|
!217 完善 TODO 提到的问题，优化订单列表相关页面结构
Merge pull request !217 from puhui999/dev-to-dev
|
2023-08-26 03:21:35 +00:00 |
|
绮梦
|
28951fb31d
|
重命名组件名称,增加用户地址查看api和页面、统一组件的props userId 变量名。
|
2023-08-25 11:27:47 +08:00 |
|
puhui999
|
7db6c121bb
|
完善 code review 提到的问题
|
2023-08-23 15:04:46 +08:00 |
|