289 Commits (80e72fd924e6ea0c094ec9800aa2bd70928336be)

Author SHA1 Message Date
owen d4a521eff1 统计:交易统计Review修改 3 years ago
YunaiV 86323f970b code review:拼团记录列表 3 years ago
puhui999 5b4983a3e9 拼团记录:优化页面布局,添加日期快捷选项 3 years ago
puhui999 8c347e5990 拼团活动:表单添加虚拟成团控制按钮 3 years ago
puhui999 e86dfa30fd Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
puhui999 c445173855 拼团记录:接口对接 3 years ago
YunaiV 24fc36e23a promotion:调整拼团活动的界面 3 years ago
puhui999 eee3d0fef5 拼团记录: 完成 UI 部分 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
YunaiV 42f0bf07f0 promotion:优化砍价活动的管理 3 years ago
owen 58b6b1ba57 交易:核销 3 years ago
YunaiV 7c491ff62a promotion:优化秒杀活动的界面 3 years ago
YunaiV 40f44fc78e promotion:优化优惠劵的界面 3 years ago
YunaiV 59ab6218ca trade:优化分销界面的 width 列宽度,和一些非空判断 3 years ago
YunaiV ab95d87c68 trade:优化门店的 list 列表,新增是否自提的配置项 3 years ago
YunaiV a9bbbc7b0a trade:优化运费模版的实现 3 years ago
YunaiV bb08f6f54f trade:完善退款详情 3 years ago
YunaiV 4fddbccea1 trade:完善订单详情 3 years ago
YunaiV 588ce1c9ae trade:微调 order 列表界面 3 years ago
YunaiV 17c31978f7 product:优化商品评论 3 years ago
YunaiV 8b7543acd5 product:优化属性列表 3 years ago
YunaiV 5f80d1611c product:优化分类列表 3 years ago
YunaiV 88677ee121 product:优化商品发布页 3 years ago
YunaiV 3a9668d632 product:优化商品列表的样式、实现代码 3 years ago
YunaiV fb94ae9674 trade:退款理由的维护 3 years ago
YunaiV 04e02ffbd2 trade:分佣界面的微调 3 years ago
YunaiV 74de8e9687 trade:优化交易配置的参数校验 3 years ago
芋道源码 b9881f2941
!252 分销:Review代码修改
Merge pull request !252 from 疯狂的世界/brokerage
3 years ago
owen a5dd7f4a81 分销:修正分享海报 3 years ago
owen 2c22ef8ef1 分销:重命名提现类型字段 3 years ago
YunaiV ce78336fca Merge remote-tracking branch 'origin/dev' into dev 3 years ago
YunaiV e489627748 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/mall/trade/order/index.vue
#	src/views/member/user/detail/index.vue
3 years ago
owen 21c67b1b75 Trade: 完善配置 3 years ago
xingyu 2a58e3f691 style: unocss eslint 3 years ago
puhui999 dd5a1f2d43 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
芋道源码 df6a384321
!244 trade: 分销业务review代码修改
Merge pull request !244 from 疯狂的世界/brokerage
3 years ago
owen 854acf6e70 trade: 分销业务 - 佣金提现后台管理 3 years ago
owen 18b6c70d1a trade: 分销业务review代码修改 3 years ago
绮梦 245301452c 订单详情页面 请求详情接口改为真实携带的id 3 years ago
puhui999 8778f5746f spu:分佣属性和分佣保持一致 3 years ago
芋道源码 de615c2387
!241 完善分销功能
Merge pull request !241 from 疯狂的世界/brokerage
3 years ago
YunaiV 8b65a2866e code review:订单相关的逻辑 3 years ago
xingyu 5494756a66 fix: eslint 3 years ago
owen 2e830d14d5 trade: 分销业务review代码修改 3 years ago
owen 0582d41972 trade: 分销业务后台功能:推广订单列表 3 years ago
owen 2aa372d8f4 trade: 分销业务后台功能:推广用户列表 3 years ago
puhui999 5dc0c6e3da spu:分佣属性和分佣保持一致 3 years ago
puhui999 615763d415 order:完善订单聚合搜索 3 years ago
puhui999 7e511d1e4f mall-order:修复 todo 提到的问题 3 years ago
owen 87ca916e69 trade: 分销业务后台功能:佣金格式化 3 years ago
owen 5ed909263a trade: 分销业务后台功能:修改上级推广人 3 years ago
owen 7ea3571356 trade: 分销业务后台功能:清除推广员、修改推广资格 3 years ago
YunaiV 0e2ea39591 code review:会员详情 3 years ago
芋道源码 e3b9a15c26
!239 分销员表格佣金字段格式化
Merge pull request !239 from 疯狂的世界/brokerage
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 dbb87e3850 trade: 分销员表格佣金字段格式化 3 years ago
owen e9d5027e72 trade: 优化分销用户佣金字段名称 3 years ago
owen 7263315412 trade: 优化分销用户绑定用户编号、绑定时间字段名称 3 years ago
owen 34ce7f7ec5 trade: 分销用户管理 3 years ago
puhui999 b3639977a7 完善订单详情 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 2ed5d12be8 trade: 分销业务从 member 模块 转移到 trade模块 3 years ago
owen 35664d1f32 trade: 增加交易中心配置表 3 years ago
puhui999 46fd154e3a 完善订单详情和售后退款日志展示样式重构 3 years ago
owen 7887be6e92 mall:修复优惠券模板,固定日期范围保存失败 3 years ago
owen 5f557c7be5 promotion: 优惠券模板 productSpuIds 改成 productScopeValues 3 years ago
owen a68acb096f mall:修复优惠券发券弹窗样式 3 years ago
YunaiV d10530c9f5 code review:优惠劵逻辑 3 years ago
芋道源码 9aa7ba3578
!230 mall:优惠券发送优化
Merge pull request !230 from 疯狂的世界/mall_coupon_send
3 years ago
YunaiV 4f7d6793fd code review:优惠劵逻辑 3 years ago
owen 76c4644b4b mall:优惠券发送优化 3 years ago
芋道源码 190c6e384c
!225 优惠券
Merge pull request !225 from 疯狂的世界/owen_dev
3 years ago
YunaiV 0743e4941c code review:订单列表 3 years ago
puhui999 f0249e94a5 订单管理:完善订单详情 3 years ago
puhui999 07a0530fc9 售后退款:完善售后管理(列表、详情) 3 years ago
puhui999 3e7945e437 fix: 修正合并差异 3 years ago
puhui999 5035fc77e7 Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
#	src/views/mall/product/spu/components/index.ts
#	src/views/mall/product/spu/form/BasicInfoForm.vue
3 years ago
YunaiV 3918fab1ec code review 3 years ago
puhui999 f9780b636c fix: 1、修复营销活动相关页面打不开的问题 2、修复 spu 添加失败的问题 2、重构 spu 的 sku 校验方式为通用配置的方式 3 years ago
puhui999 264a29e451 更新订单和售后退款详情页面路由 3 years ago
puhui999 688dad319e 订单列表:添加配送方式筛选 3 years ago
puhui999 5c7796ca6f 商品列表:修复添加属性时会返回已存在属性值的问题 3 years ago
puhui999 f5a1772464 订单售后列表:完善部分 TODO 3 years ago
YunaiV 29b8d06ff2 code review:售后详情 3 years ago
owen 27219e1833 mall:优惠券 商品适用范围,增加商品分类 3 years ago
owen 60d2e3114b mall:优惠券 商品选择组件 3 years ago
puhui999 eea285b141 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
puhui999 ed739aec55 订单售后列表:完善售后详情及相关操作 3 years ago
YunaiV 8d026f0837 重构:商品详情界面的路由、文件路径 3 years ago
puhui999 8a51c9c771 订单售后列表:初始化售后详情 3 years ago
puhui999 4f81468695 订单售后列表:重构列表 3 years ago
puhui999 8239ca474f 订单列表: 修复差异 3 years ago
owen beef6a0a94 mall: 完善后台发送优惠券 3 years ago
YunaiV 5cd01903e4 code review:商品评论 3 years ago
owen 3a15390090 商品评论:回复表单提取到单独的组件中 3 years ago