zhangshuai
|
9f77514c17
|
限时折扣
|
3 years ago |
puhui999
|
d62bbcdd92
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
# package.json
# src/views/member/user/detail/UserOrderList.vue
|
3 years ago |
|
puhui999
|
01d78429cc
|
SPU: 完善优惠卷选择
|
3 years ago |
|
puhui999
|
18df708b49
|
SPU: 完善优惠卷选择
|
3 years ago |
|
puhui999
|
3464bb9c74
|
SPU: 新增优惠卷选择
|
3 years ago |
913752709@qq.com
|
7af2a3bcc3
|
feat: CRM 线索表 crud
|
3 years ago |
|
puhui999
|
04d88ce1a6
|
订单列表：自定义列抽离封装为组件
|
3 years ago |
owen
|
ff01effd45
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
owen
|
61b3bdfd4c
|
交易：核销订单
|
3 years ago |
芋道源码
|
40ec1b08ae
|
!275 Review代码修改
Merge pull request !275 from 疯狂的世界/dev
|
3 years ago |
|
芋道源码
|
0089d59d36
|
!274 CRM/合同管理 CRUD初稿
Merge pull request !274 from dhb52/master
|
3 years ago |
|
YunaiV
|
63fd52828c
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
YunaiV
|
aa99c53729
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
# src/views/mall/statistics/member/index.vue
|
3 years ago |
|
芋道源码
|
0242c84196
|
!267 【工作流】加签和减签
Merge pull request !267 from Youkehai/feature/addSignAndSubSign
|
3 years ago |
|
owen
|
57f6367596
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
owen
|
6fc232b758
|
交易：订单核销
|
3 years ago |
dhb52
|
dced551698
|
feat: CRM/合同 crud
|
3 years ago |
jason
|
8626bccc4c
|
钱包 - 钱包余额流水
|
3 years ago |
|
jason
|
ae2c3f2ad5
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
owen
|
6204ce6c1b
|
统计：trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】
|
3 years ago |
|
owen
|
cd4b4cd322
|
统计：Review修改
|
3 years ago |
|
owen
|
8dec8edc6a
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
owen
|
e1a72779d4
|
统计：Review修改
|
3 years ago |
|
YunaiV
|
99172ea088
|
code review：文章管理
|
3 years ago |
|
owen
|
195309dbb6
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
owen
|
3802fee661
|
商城：增加商城首页
|
3 years ago |
|
jason
|
90d6f4da9f
|
钱包- 钱包余额查询
|
3 years ago |
|
puhui999
|
50e43e4028
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
befffb3f7d
|
营销活动：新增文章管理。
|
3 years ago |
|
dhb52
|
4d77d7e136
|
feat: 社交平台登录
|
3 years ago |
|
puhui999
|
36bb90fbb8
|
营销活动：新增文章分类管理
|
3 years ago |
|
jason
|
f9d0c1aa1c
|
钱包-充值套餐
|
3 years ago |
|
芋道源码
|
532b237712
|
!268 统计：会员统计
Merge pull request !268 from 疯狂的世界/dev
|
3 years ago |
|
puhui999
|
3500a20630
|
营销活动：完善 review 提到的问题，添加拼团列表查看弹窗
|
3 years ago |
youkehai
|
62a953815d
|
fix: 减签按钮显示和api地址修改
|
3 years ago |
|
owen
|
6b7040404e
|
统计：会员统计
|
3 years ago |
|
owen
|
d4a521eff1
|
统计：交易统计Review修改
|
3 years ago |
kehaiyou
|
683e319c72
|
fix: 【工作流】--加签减签
|
3 years ago |
|
YunaiV
|
86323f970b
|
code review：拼团记录列表
|
3 years ago |
|
puhui999
|
e86dfa30fd
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
c445173855
|
拼团记录：接口对接
|
3 years ago |
|
YunaiV
|
78062dd474
|
promotion：调整拼团活动的界面
|
3 years ago |
|
puhui999
|
869bac2501
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
YunaiV
|
cf7ac2cb10
|
promotion：新增记录记录列表
|
3 years ago |
|
YunaiV
|
860872a890
|
promotion：新增砍价记录列表
|
3 years ago |
|
owen
|
58b6b1ba57
|
交易：核销
|
3 years ago |
|
YunaiV
|
7c491ff62a
|
promotion：优化秒杀活动的界面
|
3 years ago |
|
YunaiV
|
a9bbbc7b0a
|
trade：优化运费模版的实现
|
3 years ago |
|
YunaiV
|
4fddbccea1
|
trade：完善订单详情
|
3 years ago |
|
YunaiV
|
588ce1c9ae
|
trade：微调 order 列表界面
|
3 years ago |
|
owen
|
3a96812d47
|
会员：会员配置的积分相关字段加上point前缀
|
3 years ago |
|
owen
|
3ab1ed707f
|
会员：积分配置改为会员配置
|
3 years ago |
|
owen
|
0066d79876
|
签到：签到后增加用户积分、经验
|
3 years ago |
|
owen
|
4b7e57e67d
|
会员详情，修改会员积分
|
3 years ago |
|
owen
|
675f3df5cb
|
会员详情，查询钱包信息
|
3 years ago |
|
owen
|
6475f81534
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
owen
|
c322fb3d0d
|
统计：交易统计
|
3 years ago |
|
kehaiyou
|
b1469669e2
|
Merge branch 'feature/bpm-delegate'
# Conflicts:
# src/views/bpm/processInstance/detail/index.vue
|
3 years ago |
|
YunaiV
|
2f82eff526
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
youkehai
|
2aeba127b6
|
Merge remote-tracking branch 'upstream/master' into feature/bpm-delegate
# Conflicts:
# src/views/bpm/processInstance/detail/index.vue
|
3 years ago |
|
owen
|
a5dd7f4a81
|
分销：修正分享海报
|
3 years ago |
|
YunaiV
|
245147223f
|
code review：驳回逻辑
|
3 years ago |
|
芋道源码
|
ada93a160b
|
!251 【工作流】回退fix
Merge pull request !251 from Youkehai/master
|
3 years ago |
|
owen
|
2c22ef8ef1
|
分销：重命名提现类型字段
|
3 years ago |
|
kehaiyou
|
f40d1de62a
|
fix: 【工作流】--回退的高亮和api地址更换
|
3 years ago |
|
kehaiyou
|
20fe343646
|
feat: 【工作流】--委派
|
3 years ago |
|
芋道源码
|
0ffd07447b
|
!248 【工作流】流程实例的任务节点回退
Merge pull request !248 from Youkehai/master
|
3 years ago |
|
kehaiyou
|
de79e79d91
|
feat: 支持回退按钮
|
3 years ago |
|
puhui999
|
dd5a1f2d43
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
owen
|
854acf6e70
|
trade: 分销业务 - 佣金提现后台管理
|
3 years ago |
|
puhui999
|
8778f5746f
|
spu：分佣属性和分佣保持一致
|
3 years ago |
|
芋道源码
|
de615c2387
|
!241 完善分销功能
Merge pull request !241 from 疯狂的世界/brokerage
|
3 years ago |
|
puhui999
|
5dc0c6e3da
|
spu：分佣属性和分佣保持一致
|
3 years ago |
|
puhui999
|
7e511d1e4f
|
mall-order：修复 todo 提到的问题
|
3 years ago |
|
owen
|
5ed909263a
|
trade: 分销业务后台功能：修改上级推广人
|
3 years ago |
|
owen
|
7ea3571356
|
trade: 分销业务后台功能：清除推广员、修改推广资格
|
3 years ago |
|
YunaiV
|
0e2ea39591
|
code review：会员详情
|
3 years ago |
|
YunaiV
|
30f0c1b351
|
Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev
Conflicts:
src/utils/dict.ts
|
3 years ago |
|
YunaiV
|
3c315cf287
|
code review：完善订单详情和售后退款 TODO 提到的问题
|
3 years ago |
|
芋道源码
|
dbfabcbbb5
|
!238 完善订单详情和售后退款 TODO 提到的问题
Merge pull request !238 from puhui999/dev-to-dev
|
3 years ago |
|
owen
|
e9d5027e72
|
trade: 优化分销用户佣金字段名称
|
3 years ago |
|
owen
|
7263315412
|
trade: 优化分销用户绑定用户编号、绑定时间字段名称
|
3 years ago |
|
owen
|
34ce7f7ec5
|
trade: 分销用户管理
|
3 years ago |
|
puhui999
|
f44688d61c
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
73628d3930
|
完善订单详情和售后退款 TODO 提到的问题
|
3 years ago |
|
owen
|
1e2120806d
|
trade: 分销业务从 member 模块 转移到 trade模块
|
3 years ago |
|
owen
|
2ed5d12be8
|
trade: 分销业务从 member 模块 转移到 trade模块
|
3 years ago |
|
owen
|
35664d1f32
|
trade: 增加交易中心配置表
|
3 years ago |
绮梦
|
fe6cf7ce98
|
新增用户详情下成长值页面。
|
3 years ago |
|
owen
|
73f8cef3b4
|
member: 佣金记录
|
3 years ago |
|
owen
|
5a9764c08c
|
member: 分销配置
|
3 years ago |
|
puhui999
|
46fd154e3a
|
完善订单详情和售后退款日志展示样式重构
|
3 years ago |
|
owen
|
5f557c7be5
|
promotion: 优惠券模板 productSpuIds 改成 productScopeValues
|
3 years ago |
|
owen
|
76c4644b4b
|
mall：优惠券发送优化
|
3 years ago |
|
芋道源码
|
190c6e384c
|
!225 优惠券
Merge pull request !225 from 疯狂的世界/owen_dev
|
3 years ago |
|
puhui999
|
f0249e94a5
|
订单管理：完善订单详情
|
3 years ago |
|
YunaiV
|
29b8d06ff2
|
code review：售后详情
|
3 years ago |
|
owen
|
27219e1833
|
mall：优惠券 商品适用范围，增加商品分类
|
3 years ago |
|
puhui999
|
ed739aec55
|
订单售后列表：完善售后详情及相关操作
|
3 years ago |
|
puhui999
|
8a51c9c771
|
订单售后列表：初始化售后详情
|
3 years ago |