Commit Graph

178 Commits (d838891667956391870894ed9c7a4ac81729c166)

Author SHA1 Message Date
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 befffb3f7d 营销活动:新增文章管理。 3 years ago
puhui999 36bb90fbb8 营销活动:新增文章分类管理 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 4fddbccea1 trade:完善订单详情 3 years ago
owen a5dd7f4a81 分销:修正分享海报 3 years ago
owen 2c22ef8ef1 分销:重命名提现类型字段 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 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
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
puhui999 4f81468695 订单售后列表:重构列表 3 years ago
owen beef6a0a94 mall: 完善后台发送优惠券 3 years ago
芋道源码 2605cb7de5
!217 完善 TODO 提到的问题,优化订单列表相关页面结构
Merge pull request !217 from puhui999/dev-to-dev
3 years ago
owen 814b4631c9 商品:完善后台商品评论功能 3 years ago
puhui999 7db6c121bb 完善 code review 提到的问题 3 years ago
YunaiV cfbc2ed74c code review:订单列表、订单详情 3 years ago
puhui999 5dceda614a 订单列表:列表重构 添加门店、物流检索条件 3 years ago
puhui999 be143ea21b 订单列表:列表重构: 完善订单发货、修改地址、订单调价、订单备注 3 years ago
puhui999 0d202a7a85 订单列表:列表重构 ③ 添加备注表单和发货表单 3 years ago
puhui999 345c09ee6c 订单列表:列表重构 ② and 完善订单详情 3 years ago
puhui999 2eb740765e 订单列表:列表重构 ① 3 years ago
puhui999 44be35b5ce fix: 完善砍价活动管理对齐后端 3 years ago
YunaiV 127e6b202e 商城:
1. 修复拼团活动,修改商品的拼团价格,会存在 *100 的问题
3 years ago
YunaiV 9984de0dc7 商城:
1. 调整优惠劵的目录
2. 简化秒杀时间配置
3 years ago
puhui999 4947716983 feat: 完善砍价活动管理 3 years ago
puhui999 c327f79177 fix: combinationActivity 调整 3 years ago
YunaiV a003b59e39 review 秒杀、拼团活动的 CRUD 3 years ago
puhui999 dc39ad0cd1 fix: 完善拼团活动 CRUD 3 years ago
puhui999 3fd9f1b43e fix: mall SeckillConfig 3 years ago
puhui999 4057130275 fix: mall SeckillActivity and CombinationActivity 3 years ago
puhui999 ce3ca7c6ce fix: mall SeckillActivity 3 years ago
puhui999 36c0bce184 fix: mall SeckillActivity 3 years ago
puhui999 b98149f1a7 fix: mall SeckillActivity 3 years ago
puhui999 2e96b1c984 feat: mall CombinationActivity 3 years ago
puhui999 51e79f29cc fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件 3 years ago
YunaiV 5d613e69b3 review 营销活动 3 years ago
芋道源码 fa71d3e7dd
!175 mall seckill
Merge pull request !175 from puhui999/dev-to-dev
3 years ago
puhui999 b1e7f14963 fix:完善秒杀活动管理① 3 years ago
puhui999 3d47d6744e feat:添加秒杀活动管理 3 years ago
xiaobai ca01b16096 提交订单列表和详情20230619 3 years ago
xiaobai 42a7aec0b5 提交订单页面和详情页面 20230619 3 years ago
puhui999 f7b195b226 feat: 完事秒杀时段管理 3 years ago
puhui999 ee698fd8b2 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
puhui999 a75720ec06 feat: 秒杀时段管理 3 years ago
YunaiV e3f250fff0 code review:订单列表 3 years ago
xiaobai e2d795f49d add trade order 20230606 3 years ago
xiaobai ec3b028d55 sync dev-20230606 3 years ago
xiaobai 985d764f62 20230606 add trade-order and details 3 years ago
YunaiV 51e76ffd53 code review:优惠劵管理 3 years ago
芋道源码 7c6d7e8061
!164 优惠券迁移vue3
Merge pull request !164 from dhb52/dev
3 years ago
芋道源码 541b23c8c1
!159 完善商品查看详情,修改了一些问题
Merge pull request !159 from puhui999/dev-to-dev
3 years ago
YunaiV 60c1604d49 code review:门店自提、快递运费 3 years ago
xiaobai 505f5cfa0c 临时提交 3 years ago
dhb52 c5a7d05821 style: 添加VO 3 years ago
puhui999 91a5f8044c Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
puhui999 2ddb605076 fix: 完善 SPU 选择快递模版的功能 3 years ago
puhui999 39c92cb944 fix: 完善 SPU 查看详情 3 years ago
jason 000aa95012 新增门店自提管理 3 years ago
puhui999 e555977757 fix: 修改 review 提到的问题,完善分类选择层级校验、完整层级展示 3 years ago
dhb52 c3b0403ade Merge remote-tracking branch 'yudao/dev' into dev 3 years ago
jason 70c5082776 运费模板区域改成多选 3 years ago
dhb52 ed9f042975 feat: mall 优惠券 初稿 3 years ago