owen
|
1e2120806d
|
trade: 分销业务从 member 模块 转移到 trade模块
|
3 years ago |
|
owen
|
2ed5d12be8
|
trade: 分销业务从 member 模块 转移到 trade模块
|
3 years ago |
|
owen
|
35664d1f32
|
trade: 增加交易中心配置表
|
3 years ago |
绮梦
|
fe6cf7ce98
|
新增用户详情下成长值页面。
|
3 years ago |
|
owen
|
73f8cef3b4
|
member: 佣金记录
|
3 years ago |
|
owen
|
5a9764c08c
|
member: 分销配置
|
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 |
|
YunaiV
|
2d8d323767
|
code review：会员中心
|
3 years ago |
|
绮梦
|
76e37a3ee7
|
Merge remote-tracking branch 'origin/dev' into dev-gitee
|
3 years ago |
|
绮梦
|
45a6b3bcc7
|
账户信息组件 增加等级、成长值和积分的显示。
增加一些配套的svg 图标。
增加tab 的懒加载。
|
3 years ago |
|
芋道源码
|
2605cb7de5
|
!217 完善 TODO 提到的问题，优化订单列表相关页面结构
Merge pull request !217 from puhui999/dev-to-dev
|
3 years ago |
|
芋道源码
|
343b6bbf18
|
!220 商品：完善商品评论功能
Merge pull request !220 from 疯狂的世界/owen_dev
|
3 years ago |
|
YunaiV
|
1b6c9b2e29
|
code review：用户详情
|
3 years ago |
|
YunaiV
|
415309469c
|
Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev
Conflicts:
src/views/member/user/index.vue
|
3 years ago |
|
owen
|
814b4631c9
|
商品：完善后台商品评论功能
|
3 years ago |
|
绮梦
|
28951fb31d
|
重命名组件名称,增加用户地址查看api和页面、统一组件的props userId 变量名。
|
3 years ago |
|
puhui999
|
6b487c7e68
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
7db6c121bb
|
完善 code review 提到的问题
|
3 years ago |
|
owen
|
2e68a5239d
|
Merge remote-tracking branch 'origin/dev' into member_dev
# Conflicts:
# src/views/member/user/UserForm.vue
|
3 years ago |
|
owen
|
e9120f06cf
|
会员: 会员等级取消分页功能
|
3 years ago |
|
YunaiV
|
55772cbba0
|
code review：用户详情
|
3 years ago |
|
YunaiV
|
746bf864d9
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts:
src/views/mall/promotion/combination/record/index.vue
|
3 years ago |
|
YunaiV
|
cfbc2ed74c
|
code review：订单列表、订单详情
|
3 years ago |
|
芋道源码
|
69a66b2a06
|
!210 订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注
Merge pull request !210 from puhui999/dev-to-dev
|
3 years ago |
|
YunaiV
|
bb0c1cb536
|
code review：会员等级
|
3 years ago |
|
puhui999
|
5dceda614a
|
订单列表：列表重构 添加门店、物流检索条件
|
3 years ago |
|
puhui999
|
be143ea21b
|
订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注
|
3 years ago |
|
绮梦
|
10d9f11fba
|
增加用户详情页以及 签到、积分等用户详情下的子tab页。
增加 用户、签到、积分 接口的VO,方便在组件中使用。
|
3 years ago |
|
芋道源码
|
40711c0eb8
|
!209 会员：增加用户等级功能
Merge pull request !209 from 疯狂的世界/member_dev
|
3 years ago |
|
owen
|
51738f8f6e
|
会员: 修改会员等级，使用单独的表单、接口
|
3 years ago |
|
puhui999
|
71f9337d82
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
0d202a7a85
|
订单列表：列表重构 ③ 添加备注表单和发货表单
|
3 years ago |
|
owen
|
78917cd2be
|
会员：增加用户分组
|
3 years ago |
|
puhui999
|
345c09ee6c
|
订单列表：列表重构 ② and 完善订单详情
|
3 years ago |
|
owen
|
884bb055b0
|
会员：用户标签增加下拉框使用的 精简信息列表查询接口
|
3 years ago |
|
owen
|
7bef240926
|
会员：后台调整会员等级
|
3 years ago |
|
YunaiV
|
be485cc4ab
|
code review：签到记录
|
3 years ago |
|
YunaiV
|
82628ce780
|
code review：签到配置
|
3 years ago |
|
owen
|
f1735a4010
|
会员：增加会员等级增删改查
|
3 years ago |
|
YunaiV
|
76a63e01c9
|
code review：会员签到配置
|
3 years ago |
|
芋道源码
|
cbd3d6c9a2
|
!204 会员积分和会员签到模块todo修改
Merge pull request !204 from QingX/dev
|
3 years ago |
|
puhui999
|
161feab244
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
2eb740765e
|
订单列表：列表重构 ①
|
3 years ago |
|
owen
|
334962fe09
|
会员：
1.增加会员标签功能
|
3 years ago |
xiaqing
|
f96882c841
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
YunaiV
|
4fd9dfd1f8
|
会员中心：会员管理 50%
|
3 years ago |
|
xiaqing
|
19444021ca
|
会员积分和会员签到模块todo修改
|
3 years ago |
|
puhui999
|
44be35b5ce
|
fix: 完善砍价活动管理对齐后端
|
3 years ago |
|
YunaiV
|
127e6b202e
|
商城：
1. 修复拼团活动，修改商品的拼团价格，会存在 *100 的问题
|
3 years ago |
|
YunaiV
|
9984de0dc7
|
商城：
1. 调整优惠劵的目录
2. 简化秒杀时间配置
|
3 years ago |
|
YunaiV
|
90f22934da
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
YunaiV
|
1ab7ea0640
|
code review：优化支付通知的实现
|
3 years ago |
|
YunaiV
|
7625e6757c
|
code review：优化收银台的实现，解决 TODO
|
3 years ago |
|
YunaiV
|
551ebbd41d
|
Merge branch 'master' of https://gitee.com/dhb52/yudao-ui-admin-vue3
Conflicts:
src/utils/constants.ts
|
3 years ago |
|
xiaqing
|
de941ec6ba
|
会员积分针对代码格式、功能优化
1.优化todo建议
2.删除无用代码
|
3 years ago |
|
xiaqing
|
f310f65842
|
会员签到针对代码格式、功能优化
1.优化todo建议
2.删除无用代码
|
3 years ago |
dhb52
|
a6eab3cc9a
|
feat: 支付功能迁移（初稿）
|
3 years ago |
|
puhui999
|
79413e0ae2
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
4947716983
|
feat: 完善砍价活动管理
|
3 years ago |
|
YunaiV
|
0139443909
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
YunaiV
|
ef31ec7aaf
|
bugfix：分配角色菜单时，调用接口 404 问题
|
3 years ago |
|
芋道源码
|
7c87f94985
|
!187 修正合并代码后前端不能正常启动的问题
Merge pull request !187 from puhui999/dev-to-dev
|
3 years ago |
|
dhb52
|
323417b0d4
|
feat: 支付管理/应用信息(alpha)
|
3 years ago |
|
puhui999
|
c327f79177
|
fix: combinationActivity 调整
|
3 years ago |
|
YunaiV
|
ee802d6335
|
登录时，直接从用户信息中，获取菜单。目的：加快首页的加载速度
|
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
|
a5330958ba
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
芋道源码
|
032d5a0a06
|
!178 会员中心(积分、签到)优化
Merge pull request !178 from QingX/dev
|
3 years ago |
|
puhui999
|
2e96b1c984
|
feat: mall CombinationActivity
|
3 years ago |
|
xiaqing
|
4251dc5d61
|
会员中心代码
1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码
|
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 |
|
芋道源码
|
867c47de61
|
!165 trade-order 列表和详情初版
Merge pull request !165 from 矿泉水/dev
|
3 years ago |
|
YunaiV
|
023539b0db
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts:
package.json
src/utils/dict.ts
|
3 years ago |
|
xiaqing
|
1dca8476b3
|
初始化积分模块
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理
|
3 years ago |