Commit Graph

  • 8dbe5dd2d1
    Pre Merge pull request !238 from puhui999/dev-to-dev puhui999 2023-09-08 15:18:34 +0000
  • 1719debd11
    !237 分销业务从 member 模块 转移到 trade模块 Merge pull request !237 from 疯狂的世界/brokerage 芋道源码 2023-09-08 15:18:32 +0000
  • e2fb072329
    Pre Merge pull request !237 from 疯狂的世界/brokerage 疯狂的世界 2023-09-08 15:10:11 +0000
  • e9d5027e72 trade: 优化分销用户佣金字段名称 owen 2023-09-08 23:10:04 +0800
  • 7263315412 trade: 优化分销用户绑定用户编号、绑定时间字段名称 owen 2023-09-08 22:51:04 +0800
  • e3f8a3a94b feat: chat dylanmay 2023-09-08 17:36:37 +0800
  • 34ce7f7ec5 trade: 分销用户管理 owen 2023-09-08 10:59:06 +0800
  • b3639977a7 完善订单详情 puhui999 2023-09-08 01:01:50 +0800
  • f44688d61c Merge remote-tracking branch 'yudao/dev' into dev-to-dev puhui999 2023-09-08 01:00:59 +0800
  • 73628d3930 完善订单详情和售后退款 TODO 提到的问题 puhui999 2023-09-06 11:23:16 +0800
  • 1e2120806d trade: 分销业务从 member 模块 转移到 trade模块 owen 2023-09-06 00:41:20 +0800
  • 2ed5d12be8 trade: 分销业务从 member 模块 转移到 trade模块 owen 2023-09-06 00:33:59 +0800
  • 35664d1f32 trade: 增加交易中心配置表 owen 2023-09-05 22:31:35 +0800
  • f977500b06
    Pre Merge pull request !236 from 岁月不经谈/N/A 岁月不经谈 2023-09-05 10:14:43 +0000
  • a1ce9eda2a
    update src/views/system/user/DeptTree.vue 部门树节点过滤不生效 部门树节点过滤不生效 岁月不经谈 2023-09-05 10:14:42 +0000
  • 2318f176a6 新增用户详情下订单页面 绮梦 2023-09-05 10:15:12 +0800
  • d8ca08a348
    !235 会员:佣金记录、配置 Merge pull request !235 from 疯狂的世界/brokerage 芋道源码 2023-09-05 01:58:33 +0000
  • 0d82ca8b14
    Pre Merge pull request !235 from 疯狂的世界/brokerage 疯狂的世界 2023-09-05 01:05:48 +0000
  • 26c87b8e55
    Pre Merge pull request !234 from 风狗/dev 风狗 2023-09-04 09:25:17 +0000
  • 34fdcd44f4 登录后强制获取当前用户信息 lehug 2023-09-04 15:34:45 +0800
  • fe6cf7ce98 新增用户详情下成长值页面。 绮梦 2023-09-04 15:02:41 +0800
  • c6493767ce 修复isToken判断失效问题 lehug 2023-09-04 14:48:50 +0800
  • d74f96fe17
    update src/components/Dialog/src/Dialog.vue. 解决了弹窗默认top为0的问题 AKING 2023-09-04 03:31:35 +0000
  • 73f8cef3b4 member: 佣金记录 owen 2023-09-03 23:04:20 +0800
  • 5a9764c08c member: 分销配置 owen 2023-09-03 21:14:44 +0800
  • 881ec67236 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 v1.8.1 YunaiV 2023-09-03 19:25:33 +0800
  • 067f89f1d4
    !226 update src/hooks/web/useCrudSchemas.ts. Merge pull request !226 from AKING/N/A 芋道源码 2023-09-03 10:56:36 +0000
  • 620d330113
    Pre Merge pull request !202 from yingming006/feat_tagsView yingming006 2023-09-03 10:55:36 +0000
  • 130208959d
    !231 优惠券优化 Merge pull request !231 from 疯狂的世界/coupon 芋道源码 2023-09-03 10:55:35 +0000
  • 46fd154e3a 完善订单详情和售后退款日志展示样式重构 puhui999 2023-09-03 01:44:22 +0800
  • b42ff44a1d
    Pre Merge pull request !231 from 疯狂的世界/coupon 疯狂的世界 2023-09-02 02:42:59 +0000
  • 7887be6e92 mall:修复优惠券模板,固定日期范围保存失败 owen 2023-09-02 10:42:55 +0800
  • 5f557c7be5 promotion: 优惠券模板 productSpuIds 改成 productScopeValues owen 2023-09-02 09:53:36 +0800
  • a68acb096f mall:修复优惠券发券弹窗样式 owen 2023-09-02 08:39:53 +0800
  • d10530c9f5 code review:优惠劵逻辑 YunaiV 2023-09-02 00:34:45 +0800
  • 9aa7ba3578
    !230 mall:优惠券发送优化 Merge pull request !230 from 疯狂的世界/mall_coupon_send 芋道源码 2023-09-01 16:33:43 +0000
  • 5983329eef
    Pre Merge pull request !230 from 疯狂的世界/mall_coupon_send 疯狂的世界 2023-09-01 16:12:27 +0000
  • 4f7d6793fd code review:优惠劵逻辑 YunaiV 2023-09-02 00:12:21 +0800
  • 76c4644b4b mall:优惠券发送优化 owen 2023-09-01 23:50:26 +0800
  • 190c6e384c
    !225 优惠券 Merge pull request !225 from 疯狂的世界/owen_dev 芋道源码 2023-09-01 14:55:30 +0000
  • 65b61b1217
    Pre Merge pull request !225 from 疯狂的世界/owen_dev 疯狂的世界 2023-09-01 12:03:13 +0000
  • 0743e4941c code review:订单列表 YunaiV 2023-09-01 20:03:08 +0800
  • 22d95fa0ac
    !229 完善订单管理和售后管理相关问题 Merge pull request !229 from puhui999/dev-to-dev 芋道源码 2023-09-01 11:41:17 +0000
  • 20a891adb1
    Pre Merge pull request !229 from puhui999/dev-to-dev puhui999 2023-09-01 04:04:40 +0000
  • f0249e94a5 订单管理:完善订单详情 puhui999 2023-09-01 12:04:33 +0800
  • 07a0530fc9 售后退款:完善售后管理(列表、详情) puhui999 2023-09-01 10:32:05 +0800
  • 3e7945e437 fix: 修正合并差异 puhui999 2023-09-01 01:24:46 +0800
  • 5035fc77e7 Merge remote-tracking branch 'yudao/dev' into dev-to-dev puhui999 2023-09-01 01:20:08 +0800
  • 3918fab1ec code review YunaiV 2023-09-01 00:49:42 +0800
  • dd3c9f8ddb Merge remote-tracking branch 'yudao/dev' into dev-to-dev puhui999 2023-08-31 21:13:46 +0800
  • f9780b636c fix: 1、修复营销活动相关页面打不开的问题 2、修复 spu 添加失败的问题 2、重构 spu 的 sku 校验方式为通用配置的方式 puhui999 2023-08-31 21:13:20 +0800
  • cc51025e57
    Pre Merge pull request !226 from AKING/N/A AKING 2023-08-31 12:38:07 +0000
  • 5c7b2c8c5d
    !228 同步商城最新代码 Merge pull request !228 from 芋道源码/dev 芋道源码 2023-08-31 12:38:05 +0000
  • 6cdfc410ed
    Pre Merge pull request !228 from 芋道源码/dev 芋道源码 2023-08-31 12:37:51 +0000
  • 135c88a473 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev YunaiV 2023-08-31 20:37:20 +0800
  • 2e945d29cc
    !227 商品列表:修复添加属性时会返回已存在属性值的问题 Merge pull request !227 from puhui999/dev-to-dev 芋道源码 2023-08-31 11:52:12 +0000
  • 1b6d037ba7
    Pre Merge pull request !227 from puhui999/dev-to-dev puhui999 2023-08-31 08:39:57 +0000
  • 264a29e451 更新订单和售后退款详情页面路由 puhui999 2023-08-31 16:39:48 +0800
  • 688dad319e 订单列表:添加配送方式筛选 puhui999 2023-08-31 16:26:24 +0800
  • 5c7796ca6f 商品列表:修复添加属性时会返回已存在属性值的问题 puhui999 2023-08-31 15:58:34 +0800
  • f5a1772464 订单售后列表:完善部分 TODO puhui999 2023-08-31 15:39:13 +0800
  • 3e67f3bc4c
    update src/hooks/web/useCrudSchemas.ts. 解决了当使用默认的dict选项时,form中事件不能触发的问题 AKING 2023-08-31 03:50:51 +0000
  • 29b8d06ff2 code review:售后详情 YunaiV 2023-08-30 21:18:46 +0800
  • 27219e1833 mall:优惠券 商品适用范围,增加商品分类 owen 2023-08-30 20:54:20 +0800
  • 60d2e3114b mall:优惠券 商品选择组件 owen 2023-08-30 11:50:21 +0800
  • 09d216394e
    !224 订单售后退款:完善列表、详情、售后相关操作 Merge pull request !224 from puhui999/dev-to-dev 芋道源码 2023-08-29 01:55:37 +0000
  • df6705678a
    Pre Merge pull request !224 from puhui999/dev-to-dev puhui999 2023-08-29 01:53:14 +0000
  • eea285b141 Merge remote-tracking branch 'yudao/dev' into dev-to-dev puhui999 2023-08-29 09:49:34 +0800
  • ed739aec55 订单售后列表:完善售后详情及相关操作 puhui999 2023-08-29 09:48:33 +0800
  • 8d026f0837 重构:商品详情界面的路由、文件路径 YunaiV 2023-08-28 18:56:37 +0800
  • e6a9dd0e4c fix: 个人中心头像为空时不能修改 xingyu 2023-08-28 17:53:45 +0800
  • e8dce93d66 perf: add ep include xingyu 2023-08-28 17:44:59 +0800
  • 54c41b4445 fix: router xingyu 2023-08-28 17:44:47 +0800
  • 5724539caf docs: update deps xingyu 2023-08-28 17:41:09 +0800
  • 547b1741fc fix: router xingyu 2023-08-28 17:40:15 +0800
  • bd2d6adafa chore: update deps xingyu 2023-08-28 17:40:07 +0800
  • 8a51c9c771 订单售后列表:初始化售后详情 puhui999 2023-08-28 17:18:42 +0800
  • 4f81468695 订单售后列表:重构列表 puhui999 2023-08-28 14:00:09 +0800
  • 8239ca474f 订单列表: 修复差异 puhui999 2023-08-28 10:05:49 +0800
  • ce84b14d15
    !223 同步最新商城的代码 Merge pull request !223 from 芋道源码/dev 芋道源码 2023-08-27 13:03:31 +0000
  • ee9e9da45c
    Pre Merge pull request !223 from 芋道源码/dev 芋道源码 2023-08-27 13:03:19 +0000
  • 9507e2b687 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev YunaiV 2023-08-27 21:02:52 +0800
  • df69c035e6
    !213 update src/components/Dialog/src/Dialog.vue. Merge pull request !213 from AKING/N/A 芋道源码 2023-08-27 03:25:00 +0000
  • aac377a338
    Pre Merge pull request !213 from AKING/N/A AKING 2023-08-27 03:24:06 +0000
  • a9bfa36584
    !216 update src/components/Pagination/index.vue. Merge pull request !216 from AKING/N/A 芋道源码 2023-08-27 03:24:04 +0000
  • beef6a0a94 mall: 完善后台发送优惠券 owen 2023-08-26 22:29:55 +0800
  • 5cd01903e4 code review:商品评论 YunaiV 2023-08-26 21:23:10 +0800
  • d09366b9bd
    !222 优化商品评论 Merge pull request !222 from 疯狂的世界/owen_dev 芋道源码 2023-08-26 12:58:49 +0000
  • 5542d12b9c
    Pre Merge pull request !222 from 疯狂的世界/owen_dev 疯狂的世界 2023-08-26 12:57:27 +0000
  • 2d8d323767 code review:会员中心 YunaiV 2023-08-26 20:57:22 +0800
  • a4841accc2
    !221 账户信息组件 增加等级、成长值和积分的显示 Merge pull request !221 from 风狗/dev 芋道源码 2023-08-26 12:47:33 +0000
  • b483a13cff
    Pre Merge pull request !221 from 风狗/dev 风狗 2023-08-26 05:59:25 +0000
  • 76e37a3ee7 Merge remote-tracking branch 'origin/dev' into dev-gitee 绮梦 2023-08-26 13:58:11 +0800
  • 45a6b3bcc7 账户信息组件 增加等级、成长值和积分的显示。 增加一些配套的svg 图标。 增加tab 的懒加载。 绮梦 2023-08-26 13:48:43 +0800
  • afaf7749c2 调整icon的大小 绮梦 2023-08-26 13:45:59 +0800
  • 3a15390090 商品评论:回复表单提取到单独的组件中 owen 2023-08-26 13:34:07 +0800
  • 4d9ae73211 调整icon的对齐方式为中间居中 绮梦 2023-08-26 13:24:23 +0800
  • 15971b6feb 商品评论: 1.移除scores,由后端自动计算 2.SPU、SKU选择组件,放到SPU组件目录下 owen 2023-08-26 13:09:14 +0800
  • ec412f7a7f Merge remote-tracking branch 'origin/dev' into owen_dev owen 2023-08-26 13:05:30 +0800
  • b8ca5800c6 code review:订单列表 YunaiV 2023-08-26 11:41:43 +0800