318 Commits (6fc232b758f5d540389be60367b6866ded7ec5aa)

Author SHA1 Message Date
owen 6fc232b758 交易:订单核销 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
puhui999 50e43e4028 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
puhui999 befffb3f7d 营销活动:新增文章管理。 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
owen 6b7040404e 统计:会员统计 3 years ago
owen d4a521eff1 统计:交易统计Review修改 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
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