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 |