Commit Graph

90 Commits (4c5d0392d71f34aa3fb1c6e6ee694fad0094a1fe)

Author SHA1 Message Date
owen 5f557c7be5 promotion: 优惠券模板 productSpuIds 改成 productScopeValues 3 years ago
YunaiV d10530c9f5 code review:优惠劵逻辑 3 years ago
YunaiV 4f7d6793fd code review:优惠劵逻辑 3 years ago
芋道源码 190c6e384c
!225 优惠券
Merge pull request !225 from 疯狂的世界/owen_dev
3 years ago
YunaiV 0743e4941c code review:订单列表 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 f9780b636c fix: 1、修复营销活动相关页面打不开的问题 2、修复 spu 添加失败的问题 2、重构 spu 的 sku 校验方式为通用配置的方式 3 years ago
puhui999 5c7796ca6f 商品列表:修复添加属性时会返回已存在属性值的问题 3 years ago
owen 27219e1833 mall:优惠券 商品适用范围,增加商品分类 3 years ago
owen 60d2e3114b mall:优惠券 商品选择组件 3 years ago
YunaiV 8d026f0837 重构:商品详情界面的路由、文件路径 3 years ago
YunaiV 5cd01903e4 code review:商品评论 3 years ago
owen 3a15390090 商品评论:回复表单提取到单独的组件中 3 years ago
owen 15971b6feb 商品评论:
1.移除scores,由后端自动计算
2.SPU、SKU选择组件,放到SPU组件目录下
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
owen 814b4631c9 商品:完善后台商品评论功能 3 years ago
puhui999 7db6c121bb 完善 code review 提到的问题 3 years ago
puhui999 71f9337d82 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
YunaiV 1db98698bd 优化商品属性的编辑按钮 3 years ago
puhui999 44be35b5ce fix: 完善砍价活动管理对齐后端 3 years ago
xingyu 003751a41c fix: dialog 3 years ago
xingyu 8e78975521 fix: eslint 3 years ago
puhui999 4057130275 fix: mall SeckillActivity and CombinationActivity 3 years ago
puhui999 ce3ca7c6ce fix: mall SeckillActivity 3 years ago
puhui999 36c0bce184 fix: mall SeckillActivity 3 years ago
YunaiV b1ce2672e4 review 秒杀活动 3 years ago
puhui999 51e79f29cc fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件 3 years ago
puhui999 76ccc54a35 fix: 修复 spu 详情查看错误,同步 mall seckill 组件 name 配置方式 3 years ago
puhui999 c9ae0fbdbe Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
puhui999 b1e7f14963 fix:完善秒杀活动管理① 3 years ago
YunaiV e1b1c134d9 合并 master 代码的冲突 3 years ago
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
3 years ago
puhui999 3d47d6744e feat:添加秒杀活动管理 3 years ago
xingyu c1a4edf7b1 refactor: 统一 setup 格式 3 years ago
xingyu 922f83d99c refactor: vue3.3 defineOptions 3 years ago
YunaiV ae69492b53 code review:spu todo 去掉 3 years ago
puhui999 d31ade7a5f fix: 完善 SPU 相关路由 review 3 years ago
puhui999 20f3f72670 fix: 数组操作添加 ? 可选操作符,避免属性值为 null 时报错 3 years ago
puhui999 b89db1af55 fix: review 3 years ago
puhui999 7fe8dee9ed Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
puhui999 a1b45f80bc fix: 优化 spu 相关路由配置 3 years ago
YunaiV 158585670c code review:商品管理 3 years ago
puhui999 7fb6258bed fix: 修复善品测试发现的问题 3 years ago
puhui999 6a10a81f58 fix: 引入 v-dompurify-html 指令解决 v-html 的安全隐患 3 years ago
puhui999 2ddb605076 fix: 完善 SPU 选择快递模版的功能 3 years ago
puhui999 39c92cb944 fix: 完善 SPU 查看详情 3 years ago
puhui999 e555977757 fix: 修改 review 提到的问题,完善分类选择层级校验、完整层级展示 3 years ago