1037 Commits (8778f5746ffe4e8f4f159cdc5affef6f3a5c2577)
 

Author SHA1 Message Date
puhui999 8778f5746f spu:分佣属性和分佣保持一致 3 years ago
puhui999 5dc0c6e3da spu:分佣属性和分佣保持一致 3 years ago
puhui999 615763d415 order:完善订单聚合搜索 3 years ago
puhui999 7e511d1e4f mall-order:修复 todo 提到的问题 3 years ago
puhui999 a79f1452b3 登录界面:姐姐点击登录后界面疯狂闪动的问题 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
芋道源码 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
芋道源码 1719debd11
!237 分销业务从 member 模块 转移到 trade模块
Merge pull request !237 from 疯狂的世界/brokerage
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 1e2120806d trade: 分销业务从 member 模块 转移到 trade模块 3 years ago
owen 2ed5d12be8 trade: 分销业务从 member 模块 转移到 trade模块 3 years ago
owen 35664d1f32 trade: 增加交易中心配置表 3 years ago
绮梦 2318f176a6 新增用户详情下订单页面 3 years ago
芋道源码 d8ca08a348
!235 会员:佣金记录、配置
Merge pull request !235 from 疯狂的世界/brokerage
3 years ago
绮梦 fe6cf7ce98 新增用户详情下成长值页面。 3 years ago
owen 73f8cef3b4 member: 佣金记录 3 years ago
owen 5a9764c08c member: 分销配置 3 years ago
芋道源码 130208959d
!231 优惠券优化
Merge pull request !231 from 疯狂的世界/coupon
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
芋道源码 22d95fa0ac
!229 完善订单管理和售后管理相关问题
Merge pull request !229 from puhui999/dev-to-dev
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 dd3c9f8ddb Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
puhui999 f9780b636c fix: 1、修复营销活动相关页面打不开的问题 2、修复 spu 添加失败的问题 2、重构 spu 的 sku 校验方式为通用配置的方式 3 years ago
YunaiV 135c88a473 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/router/modules/remaining.ts
3 years ago
芋道源码 2e945d29cc
!227 商品列表:修复添加属性时会返回已存在属性值的问题
Merge pull request !227 from puhui999/dev-to-dev
3 years ago
puhui999 264a29e451 更新订单和售后退款详情页面路由 3 years ago
puhui999 688dad319e 订单列表:添加配送方式筛选 3 years ago
puhui999 5c7796ca6f 商品列表:修复添加属性时会返回已存在属性值的问题 3 years ago