yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
996 Commits
9 Branches
21 Tags
30 MiB
Commit Graph

996 Commits (f0249e94a5829fb3fa2eff0b1b9955c96e0ebe6d)

Author SHA1 Message Date
puhui999 f0249e94a5 订单管理：完善订单详情 2023-09-01 12:04:33 +08:00
puhui999 07a0530fc9 售后退款：完善售后管理（列表、详情） 2023-09-01 10:32:05 +08:00
puhui999 3e7945e437 fix: 修正合并差异 2023-09-01 01:24:46 +08:00
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
 2023-09-01 01:20:08 +08:00
YunaiV 3918fab1ec code review 2023-09-01 00:49:42 +08:00
puhui999 dd3c9f8ddb Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-08-31 21:13:46 +08:00
puhui999 f9780b636c fix: 1、修复营销活动相关页面打不开的问题 2、修复 spu 添加失败的问题 2、重构 spu 的 sku 校验方式为通用配置的方式 2023-08-31 21:13:20 +08:00
YunaiV 135c88a473 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 
 Conflicts:
	src/router/modules/remaining.ts
 2023-08-31 20:37:20 +08:00
芋道源码 2e945d29cc
!227 商品列表：修复添加属性时会返回已存在属性值的问题 
Merge pull request !227 from puhui999/dev-to-dev
 2023-08-31 11:52:12 +00:00
puhui999 264a29e451 更新订单和售后退款详情页面路由 2023-08-31 16:39:48 +08:00
puhui999 688dad319e 订单列表：添加配送方式筛选 2023-08-31 16:26:24 +08:00
puhui999 5c7796ca6f 商品列表：修复添加属性时会返回已存在属性值的问题 2023-08-31 15:58:34 +08:00
puhui999 f5a1772464 订单售后列表：完善部分 TODO 2023-08-31 15:39:13 +08:00
YunaiV 29b8d06ff2 code review：售后详情 2023-08-30 21:18:46 +08:00
芋道源码 09d216394e
!224 订单售后退款：完善列表、详情、售后相关操作 
Merge pull request !224 from puhui999/dev-to-dev
 2023-08-29 01:55:37 +00:00
puhui999 eea285b141 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-08-29 09:49:34 +08:00
puhui999 ed739aec55 订单售后列表：完善售后详情及相关操作 2023-08-29 09:48:33 +08:00
YunaiV 8d026f0837 重构：商品详情界面的路由、文件路径 2023-08-28 18:56:37 +08:00
xingyu e6a9dd0e4c fix: 个人中心头像为空时不能修改 2023-08-28 17:53:45 +08:00
xingyu e8dce93d66 perf: add ep include 2023-08-28 17:44:59 +08:00
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
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