Commit Graph

99 Commits

Author SHA1 Message Date
YunaiV
17c31978f7 product:优化商品评论 2023-10-01 21:23:50 +08:00
YunaiV
8b7543acd5 product:优化属性列表 2023-10-01 21:11:47 +08:00
YunaiV
5f80d1611c product:优化分类列表 2023-10-01 20:55:51 +08:00
YunaiV
88677ee121 product:优化商品发布页 2023-10-01 20:16:02 +08:00
YunaiV
3a9668d632 product:优化商品列表的样式、实现代码 2023-10-01 19:44:13 +08:00
YunaiV
e489627748 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/mall/trade/order/index.vue
#	src/views/member/user/detail/index.vue
2023-09-24 12:00:10 +08:00
xingyu
2a58e3f691 style: unocss eslint 2023-09-22 17:49:11 +08:00
xingyu
5494756a66 fix: eslint 2023-09-11 17:08:39 +08:00
puhui999
5dc0c6e3da spu:分佣属性和分佣保持一致 2023-09-09 23:14:02 +08:00
owen
5f557c7be5 promotion: 优惠券模板 productSpuIds 改成 productScopeValues 2023-09-02 09:53:36 +08:00
YunaiV
d10530c9f5 code review:优惠劵逻辑 2023-09-02 00:34:45 +08:00
YunaiV
4f7d6793fd code review:优惠劵逻辑 2023-09-02 00:12:21 +08:00
芋道源码
190c6e384c
!225 优惠券
Merge pull request !225 from 疯狂的世界/owen_dev
2023-09-01 14:55:30 +00:00
YunaiV
0743e4941c code review:订单列表 2023-09-01 20:03:08 +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
f9780b636c fix: 1、修复营销活动相关页面打不开的问题 2、修复 spu 添加失败的问题 2、重构 spu 的 sku 校验方式为通用配置的方式 2023-08-31 21:13:20 +08:00
puhui999
5c7796ca6f 商品列表:修复添加属性时会返回已存在属性值的问题 2023-08-31 15:58:34 +08:00
owen
27219e1833 mall:优惠券 商品适用范围,增加商品分类 2023-08-30 20:54:20 +08:00
owen
60d2e3114b mall:优惠券 商品选择组件 2023-08-30 11:50:21 +08:00
YunaiV
8d026f0837 重构:商品详情界面的路由、文件路径 2023-08-28 18:56:37 +08:00
YunaiV
5cd01903e4 code review:商品评论 2023-08-26 21:23:10 +08:00
owen
3a15390090 商品评论:回复表单提取到单独的组件中 2023-08-26 13:34:07 +08:00
owen
15971b6feb 商品评论:
1.移除scores,由后端自动计算
2.SPU、SKU选择组件,放到SPU组件目录下
2023-08-26 13:09:14 +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
owen
814b4631c9 商品:完善后台商品评论功能 2023-08-25 21:02:48 +08:00
puhui999
7db6c121bb 完善 code review 提到的问题 2023-08-23 15:04:46 +08:00
puhui999
71f9337d82 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-08-22 00:39:11 +08:00
YunaiV
1db98698bd 优化商品属性的编辑按钮 2023-08-21 10:34:10 +08:00
puhui999
44be35b5ce fix: 完善砍价活动管理对齐后端 2023-08-17 10:52:40 +08:00
xingyu
003751a41c fix: dialog 2023-08-04 21:44:55 +08:00
xingyu
8e78975521 fix: eslint 2023-07-29 12:55:51 +08:00
puhui999
4057130275 fix: mall SeckillActivity and CombinationActivity 2023-07-05 18:24:32 +08:00
puhui999
ce3ca7c6ce fix: mall SeckillActivity 2023-07-05 17:12:53 +08:00
puhui999
36c0bce184 fix: mall SeckillActivity 2023-07-05 11:32:32 +08:00
YunaiV
b1ce2672e4 review 秒杀活动 2023-07-02 21:46:04 +08:00
puhui999
51e79f29cc fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件 2023-06-25 16:43:49 +08:00
puhui999
76ccc54a35 fix: 修复 spu 详情查看错误,同步 mall seckill 组件 name 配置方式 2023-06-25 09:35:20 +08:00
puhui999
c9ae0fbdbe Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-06-24 01:48:36 +08:00
puhui999
b1e7f14963 fix:完善秒杀活动管理① 2023-06-24 01:48:07 +08:00
YunaiV
e1b1c134d9 合并 master 代码的冲突 2023-06-23 14:08:09 +08:00
YunaiV
b159240824 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/views/infra/build/index.vue
	src/views/mall/product/spu/components/DescriptionForm.vue
	src/views/mall/product/spu/components/OtherSettingsForm.vue
	src/views/mall/product/spu/components/ProductPropertyAddForm.vue
	src/views/mall/product/spu/components/SkuList.vue
2023-06-23 13:54:43 +08:00
puhui999
3d47d6744e feat:添加秒杀活动管理 2023-06-22 17:31:36 +08:00
xingyu
c1a4edf7b1 refactor: 统一 setup 格式 2023-06-21 19:35:11 +08:00
xingyu
922f83d99c refactor: vue3.3 defineOptions 2023-06-21 19:14:34 +08:00
YunaiV
ae69492b53 code review:spu todo 去掉 2023-06-17 18:48:49 +08:00
puhui999
d31ade7a5f fix: 完善 SPU 相关路由 review 2023-06-07 18:31:28 +08:00
puhui999
20f3f72670 fix: 数组操作添加 ? 可选操作符,避免属性值为 null 时报错 2023-06-07 08:59:03 +08:00