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 |
岁月不经谈
|
a1ce9eda2a
|
update src/views/system/user/DeptTree.vue 部门树节点过滤不生效
部门树节点过滤不生效
Signed-off-by: 岁月不经谈 <473831241@qq.com>
|
3 years ago |
绮梦
|
2318f176a6
|
新增用户详情下订单页面
|
3 years ago |
|
绮梦
|
fe6cf7ce98
|
新增用户详情下成长值页面。
|
3 years ago |
AKING
|
d74f96fe17
|
update src/components/Dialog/src/Dialog.vue.
解决了弹窗默认top为0的问题
Signed-off-by: AKING <2734339436@qq.com>
|
3 years ago |
|
owen
|
73f8cef3b4
|
member: 佣金记录
|
3 years ago |
|
owen
|
5a9764c08c
|
member: 分销配置
|
3 years ago |
YunaiV
|
881ec67236
|
Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
3 years ago |
|
芋道源码
|
067f89f1d4
|
!226 update src/hooks/web/useCrudSchemas.ts.
Merge pull request !226 from AKING/N/A
|
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
|
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 |
|
puhui999
|
264a29e451
|
更新订单和售后退款详情页面路由
|
3 years ago |
|
puhui999
|
688dad319e
|
订单列表：添加配送方式筛选
|
3 years ago |
|
puhui999
|
5c7796ca6f
|
商品列表：修复添加属性时会返回已存在属性值的问题
|
3 years ago |
|
puhui999
|
f5a1772464
|
订单售后列表：完善部分 TODO
|
3 years ago |
|
AKING
|
3e67f3bc4c
|
update src/hooks/web/useCrudSchemas.ts.
解决了当使用默认的dict选项时，form中事件不能触发的问题
Signed-off-by: AKING <2734339436@qq.com>
|
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 |
xingyu
|
e6a9dd0e4c
|
fix: 个人中心头像为空时不能修改
|
3 years ago |
|
xingyu
|
54c41b4445
|
fix: router
|
3 years ago |
|
xingyu
|
547b1741fc
|
fix: router
|
3 years ago |
|
puhui999
|
8a51c9c771
|
订单售后列表：初始化售后详情
|
3 years ago |
|
puhui999
|
4f81468695
|
订单售后列表：重构列表
|
3 years ago |
|
puhui999
|
8239ca474f
|
订单列表： 修复差异
|
3 years ago |
|
YunaiV
|
9507e2b687
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts:
src/views/member/user/detail/UserPointList.vue
|
3 years ago |
|
芋道源码
|
df69c035e6
|
!213 update src/components/Dialog/src/Dialog.vue.
Merge pull request !213 from AKING/N/A
|
3 years ago |
|
owen
|
beef6a0a94
|
mall: 完善后台发送优惠券
|
3 years ago |
|
YunaiV
|
5cd01903e4
|
code review：商品评论
|
3 years ago |
|
芋道源码
|
d09366b9bd
|
!222 优化商品评论
Merge pull request !222 from 疯狂的世界/owen_dev
|
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 |
|
绮梦
|
afaf7749c2
|
调整icon的大小
|
3 years ago |
|
owen
|
3a15390090
|
商品评论：回复表单提取到单独的组件中
|
3 years ago |
|
绮梦
|
4d9ae73211
|
调整icon的对齐方式为中间居中
|
3 years ago |
|
owen
|
15971b6feb
|
商品评论：
1.移除scores，由后端自动计算
2.SPU、SKU选择组件，放到SPU组件目录下
|
3 years ago |
|
YunaiV
|
b8ca5800c6
|
code review：订单列表
|
3 years ago |
|
芋道源码
|
2605cb7de5
|
!217 完善 TODO 提到的问题，优化订单列表相关页面结构
Merge pull request !217 from puhui999/dev-to-dev
|
3 years ago |
|
YunaiV
|
84c5eb9942
|
code review：商品评论
|
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
|
58502b1241
|
订单列表：优化订单列表页面结构
|
3 years ago |
|
puhui999
|
7db6c121bb
|
完善 code review 提到的问题
|
3 years ago |
|
AKING
|
ff8a8e7243
|
update src/components/Pagination/index.vue.
解决了当全局size为small的时候分页组件样式太大的问题，当组件为small时，则会显示小的分页组件，具体请参照ep官网：https://element-plus.org/zh-CN/component/pagination.html#%E9%99%84%E5%8A%A0%E5%8A%9F%E8%83%BD
Signed-off-by: AKING <2734339436@qq.com>
|
3 years ago |
|
绮梦
|
f17bb9a7eb
|
重命名组件名称
|
3 years ago |
|
绮梦
|
d1bb736973
|
会员详情页的跳转携带参数方式改为params
|
3 years ago |
|
xingyu
|
e30d5559e6
|
fix: 路径错误
|
3 years ago |
|
绮梦
|
451458eb1e
|
会员列表页面增加详情页的跳转。
|
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
|
83e780da06
|
订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注
|
3 years ago |
|
puhui999
|
be143ea21b
|
订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注
|
3 years ago |
|
AKING
|
cba35d698f
|
update src/components/Dialog/src/Dialog.vue.
解决了单独使用elementplus diaolog组件时，样式被篡改的问题
Signed-off-by: AKING <2734339436@qq.com>
|
3 years ago |
|
绮梦
|
c1a40e7c98
|
用户详情-积分tab 去除无用的组件。
|
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
|
ebcbe63d9b
|
订单列表：列表重构 ④ 移除测试数据
|
3 years ago |
|
owen
|
c5a703f488
|
会员：等级下拉框显示图标
|
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 |