Commit Graph

1477 Commits

Author SHA1 Message Date
xingyu
54c41b4445 fix: router 2023-08-28 17:44:47 +08:00
xingyu
5724539caf docs: update deps 2023-08-28 17:41:09 +08:00
xingyu
547b1741fc fix: router 2023-08-28 17:40:15 +08:00
xingyu
bd2d6adafa chore: update deps 2023-08-28 17:40:07 +08:00
puhui999
8a51c9c771 订单售后列表:初始化售后详情 2023-08-28 17:18:42 +08:00
puhui999
4f81468695 订单售后列表:重构列表 2023-08-28 14:00:09 +08:00
puhui999
8239ca474f 订单列表: 修复差异 2023-08-28 10:05:49 +08:00
芋道源码
ce84b14d15
!223 同步最新商城的代码
Merge pull request !223 from 芋道源码/dev
2023-08-27 13:03:31 +00:00
YunaiV
9507e2b687 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/views/member/user/detail/UserPointList.vue
2023-08-27 21:02:52 +08:00
芋道源码
df69c035e6
!213 update src/components/Dialog/src/Dialog.vue.
Merge pull request !213 from AKING/N/A
2023-08-27 03:25:00 +00:00
芋道源码
a9bfa36584
!216 update src/components/Pagination/index.vue.
Merge pull request !216 from AKING/N/A
2023-08-27 03:24:04 +00:00
owen
beef6a0a94 mall: 完善后台发送优惠券 2023-08-26 22:29:55 +08:00
YunaiV
5cd01903e4 code review:商品评论 2023-08-26 21:23:10 +08:00
芋道源码
d09366b9bd
!222 优化商品评论
Merge pull request !222 from 疯狂的世界/owen_dev
2023-08-26 12:58:49 +00:00
YunaiV
2d8d323767 code review:会员中心 2023-08-26 20:57:22 +08:00
芋道源码
a4841accc2
!221 账户信息组件 增加等级、成长值和积分的显示
Merge pull request !221 from 风狗/dev
2023-08-26 12:47:33 +00:00
绮梦
76e37a3ee7 Merge remote-tracking branch 'origin/dev' into dev-gitee 2023-08-26 13:58:11 +08:00
绮梦
45a6b3bcc7 账户信息组件 增加等级、成长值和积分的显示。
增加一些配套的svg 图标。
增加tab 的懒加载。
2023-08-26 13:48:43 +08:00
绮梦
afaf7749c2 调整icon的大小 2023-08-26 13:45:59 +08:00
owen
3a15390090 商品评论:回复表单提取到单独的组件中 2023-08-26 13:34:07 +08:00
绮梦
4d9ae73211 调整icon的对齐方式为中间居中 2023-08-26 13:24:23 +08:00
owen
15971b6feb 商品评论:
1.移除scores,由后端自动计算
2.SPU、SKU选择组件,放到SPU组件目录下
2023-08-26 13:09:14 +08:00
owen
ec412f7a7f Merge remote-tracking branch 'origin/dev' into owen_dev 2023-08-26 13:05:30 +08:00
YunaiV
b8ca5800c6 code review:订单列表 2023-08-26 11:41:43 +08:00
芋道源码
2605cb7de5
!217 完善 TODO 提到的问题,优化订单列表相关页面结构
Merge pull request !217 from puhui999/dev-to-dev
2023-08-26 03:21:35 +00:00
YunaiV
84c5eb9942 code review:商品评论 2023-08-26 11:19:29 +08:00
芋道源码
343b6bbf18
!220 商品:完善商品评论功能
Merge pull request !220 from 疯狂的世界/owen_dev
2023-08-26 02:59:07 +00:00
owen
bce427f702 Merge remote-tracking branch 'origin/dev' into owen_dev 2023-08-26 07:31:38 +08:00
YunaiV
1b6c9b2e29 code review:用户详情 2023-08-26 01:59:36 +08:00
YunaiV
415309469c Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/views/member/user/index.vue
2023-08-26 01:24:30 +08:00
owen
2c56345875 Merge remote-tracking branch 'origin/dev' into member_dev 2023-08-25 21:03:38 +08:00
owen
814b4631c9 商品:完善后台商品评论功能 2023-08-25 21:02:48 +08:00
绮梦
28951fb31d 重命名组件名称,增加用户地址查看api和页面、统一组件的props userId 变量名。 2023-08-25 11:27:47 +08:00
puhui999
6b487c7e68 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-08-24 14:39:09 +08:00
puhui999
58502b1241 订单列表:优化订单列表页面结构 2023-08-24 14:34:35 +08:00
芋道源码
5fb5c6cbcf
!215 会员: 会员等级功能调整
Merge pull request !215 from 疯狂的世界/member_dev
2023-08-23 16:46:34 +00:00
puhui999
7db6c121bb 完善 code review 提到的问题 2023-08-23 15:04:46 +08:00
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>
2023-08-23 05:51:24 +00:00
绮梦
f17bb9a7eb 重命名组件名称 2023-08-23 13:40:57 +08:00
绮梦
d1bb736973 会员详情页的跳转携带参数方式改为params 2023-08-23 13:12:05 +08:00
xingyu
65f9e3ee6c docs: update deps 2023-08-23 10:42:42 +08:00
xingyu
0207affd02 chore: update deps 2023-08-23 10:42:35 +08:00
xingyu
e30d5559e6 fix: 路径错误 2023-08-23 10:40:03 +08:00
绮梦
451458eb1e 会员列表页面增加详情页的跳转。 2023-08-23 10:23:22 +08:00
owen
2e68a5239d Merge remote-tracking branch 'origin/dev' into member_dev
# Conflicts:
#	src/views/member/user/UserForm.vue
2023-08-23 10:22:03 +08:00
owen
e9120f06cf 会员: 会员等级取消分页功能 2023-08-23 10:12:20 +08:00
YunaiV
55772cbba0 code review:用户详情 2023-08-23 01:41:25 +08:00
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
2023-08-23 00:49:48 +08:00
芋道源码
d096e6e712
!212 管理后台 用户详情
Merge pull request !212 from 风狗/用户详情
2023-08-22 16:49:17 +00:00
YunaiV
cfbc2ed74c code review:订单列表、订单详情 2023-08-23 00:43:40 +08:00