46 Commits

Author SHA1 Message Date
owen
a494d2723b 营销:适配商城装修组件【优惠券】
(cherry picked from commit 253401ace3578ed3118b912b039304e40ee95399)
2024-03-06 20:55:51 +08:00
owen
e2fb9df663 商品中心:修复商品表格选择对话框,在多选时表头内的多选框不显示选中效果的问题
(cherry picked from commit 1bb9df7b3c6b7fd8b91195664a36afe151141f4c)
2024-03-06 20:50:08 +08:00
owen
f0991ddedb 商品评论、优惠券模板复用组件【商品橱窗】
(cherry picked from commit e0a731dd86f76292a4b6a7aef3cad1f188c1ff0c)
2024-03-06 20:49:53 +08:00
owen
a616b019b8 营销:适配商城装修组件【商品栏】
(cherry picked from commit 3198688eb53ae39f76472643c8ee80db903e7ab2)
2024-03-06 20:49:48 +08:00
owen
d492186d3e 营销:适配商城装修组件【商品卡片】
(cherry picked from commit b4a177258467e3a08c33524e50c80b46eaca5215)
2024-03-06 20:44:34 +08:00
YunaiV
23c4bde627 product:优化商品评论
(cherry picked from commit 17c31978f7478a130c00bf6b9fee2ecd8e17ebbb)
2024-03-05 15:53:47 +08:00
shizhong
969155c6cf style: unocss eslint 2023-09-25 13:14:05 +08:00
puhui999
9607127897 spu:分佣属性和分佣保持一致
(cherry picked from commit 5dc0c6e3da8e7d200773d79cb31d699004b6cd6d)
2023-09-25 12:43:15 +08:00
shizhong
7e5ad60d1d refactor: vue3.3 defineOptions 2023-09-22 14:00:50 +08:00
YunaiV
fd501a1f5b code review:优惠劵逻辑
(cherry picked from commit d10530c9f5d731d3419e9adee60c4a7b3cb4213c)
2023-09-20 12:39:02 +08:00
YunaiV
27bdeb9b50 code review
(cherry picked from commit 3918fab1ec69793f7e3a6e1b3cc86fa5f30d987e)
2023-09-20 12:34:16 +08:00
puhui999
a2a343ac2e fix: 1、修复营销活动相关页面打不开的问题 2、修复 spu 添加失败的问题 2、重构 spu 的 sku 校验方式为通用配置的方式
(cherry picked from commit f9780b636c3f7320e71707f2d0bc9311632d68db)
2023-09-20 12:33:46 +08:00
owen
404bb00dbf mall:优惠券 商品选择组件
(cherry picked from commit 60d2e3114b4e6d41e0790c06ad02f93ce5f9eec9)
2023-09-20 12:30:37 +08:00
YunaiV
ed41a9bed6 重构:商品详情界面的路由、文件路径
(cherry picked from commit 8d026f0837db722fb7516564fd4d46d40c6c145d)
2023-09-20 12:30:02 +08:00
owen
9f4751b1d7 商品评论:
1.移除scores,由后端自动计算
2.SPU、SKU选择组件,放到SPU组件目录下

(cherry picked from commit 15971b6feb67dabbfffe7773a3c65ca3d7eeb92f)
2023-09-20 12:23:04 +08:00
puhui999
9d9ccaa1b8 完善 code review 提到的问题
(cherry picked from commit 7db6c121bb6e788bf4b05a0772a510cdcb3d9ed1)
2023-09-20 12:18:16 +08:00
puhui999
1854e891cb fix: 完善砍价活动管理对齐后端
(cherry picked from commit 44be35b5ce3159b525d17ab7abbd931c114867e8)
2023-09-19 20:53:01 +08:00
xingyu
c7d6d35642 fix: eslint
(cherry picked from commit 8e7897552193e6aa4112ac27d5a1dc76fae645e8)
2023-09-19 20:02:03 +08:00
puhui999
0394f81dab fix: mall SeckillActivity and CombinationActivity
(cherry picked from commit 40571302753292182bb8a7052aae1fb6f3117503)
2023-07-27 19:41:21 +08:00
puhui999
d1cc7d134b fix: mall SeckillActivity
(cherry picked from commit ce3ca7c6cef7dbe18b224f831be4fae75d9407b2)
2023-07-27 19:41:03 +08:00
puhui999
de53abb249 fix: mall SeckillActivity
(cherry picked from commit 36c0bce1845b288ec1ea2f5f1528c07247502c21)
2023-07-27 19:40:57 +08:00
YunaiV
401112f668 review 秒杀活动
(cherry picked from commit b1ce2672e418cc9a970992787d5ba405c92d5070)
2023-07-27 19:37:02 +08:00
puhui999
1d0d9d24ad fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件
(cherry picked from commit 51e79f29cc70ad1670b93829bab3d5d23751c263)
2023-07-27 19:35:12 +08:00
puhui999
670ebb8ba5 fix: 修复 spu 详情查看错误,同步 mall seckill 组件 name 配置方式
(cherry picked from commit 76ccc54a350a6183b6aa89599d3e010b467263b6)
2023-07-27 19:35:01 +08:00
puhui999
70c2fe409c fix:完善秒杀活动管理①
(cherry picked from commit b1e7f149638243885ae97f6c31f5df24d9b6ffa2)
2023-07-27 19:33:06 +08:00
YunaiV
d32d3fb2ed 合并 master 代码的冲突
(cherry picked from commit e1b1c134d9014ba0b1612e85468d145e124a7278)
2023-07-27 19:32:36 +08:00
shizhong
419a572e80 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-07-27 19:32:27 +08:00
puhui999
7da1b04ae2 feat:添加秒杀活动管理
(cherry picked from commit 3d47d6744e0dd78d4df350c5eb6421dba889f8af)
2023-07-27 19:27:44 +08:00
YunaiV
1fad4f626c code review:spu todo 去掉
(cherry picked from commit ae69492b53ceeb006c72c1ef70d1b0b15685dee2)
2023-07-27 19:09:57 +08:00
puhui999
9d8e0d507b fix: 数组操作添加 ? 可选操作符,避免属性值为 null 时报错
(cherry picked from commit 20f3f7267023b21fc28541ed7a0f35f3a0d3e832)
2023-07-27 19:02:29 +08:00
puhui999
2d88367e61 fix: review
(cherry picked from commit b89db1af55127fef5b558e2fdcd6f8401ccdc7df)
2023-07-27 19:02:19 +08:00
YunaiV
79a4aa5189 code review:商品管理
(cherry picked from commit 158585670ccab231b7a0902f62b9d134af747d50)
2023-07-27 18:50:01 +08:00
puhui999
b28bfc4081 fix: 修复善品测试发现的问题
(cherry picked from commit 7fb6258bed0ad06943000d9884a3757539d68519)
2023-07-27 18:36:45 +08:00
shizhong
c2168466f3 fix: 引入 v-dompurify-html 指令解决 v-html 的安全隐患 2023-07-27 18:36:06 +08:00
puhui999
144be6ef44 fix: 完善 SPU 选择快递模版的功能
(cherry picked from commit 2ddb6050763cb395dbe4c1d475a127e6e8da58ca)
2023-07-27 13:11:05 +08:00
puhui999
d35ac547ac fix: 完善 SPU 查看详情
(cherry picked from commit 39c92cb944e2b41007d1870d411f5255c9da1d70)
2023-07-27 13:10:58 +08:00
puhui999
cf7f4ff89e fix: 修改 review 提到的问题,完善分类选择层级校验、完整层级展示
(cherry picked from commit e555977757f76516638ce2c8fb90eb6a186bc25b)
2023-07-27 13:09:36 +08:00
YunaiV
4cd4327bc8 review + mall:商品管理
(cherry picked from commit 0fba3fd5033a451cfe2c33a1dc8a3d91c90ed9b3)
2023-06-13 14:13:55 +08:00
puhui999
c254222b5f fix: 优化相关逻辑,修复遗留bug
(cherry picked from commit 38545e89c6b6cb98f7a70d69583110338b02d499)
2023-06-13 14:07:33 +08:00
puhui999
4410bdd93c fix:解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记
(cherry picked from commit 0c42b76a52ce9b29ec68b54d9b74deb4483108dd)
2023-06-13 14:07:22 +08:00
puhui999
ea4e2a0bcc fix: 解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记
(cherry picked from commit 4ddba9d454ebfd221f39ba12b375401768ff7f45)
2023-06-13 14:06:16 +08:00
puhui999
d73a32106a fix: 修复 OtherSettingsForm TODO 优化相关算法,解决上一版本遗留的bug
(cherry picked from commit 3c4a39df01d59be0a320044a75fad2412d578a7d)
2023-06-13 14:06:02 +08:00
puhui999
085dbd6220 fix: 修复 SkuList TODO 优化相关算法
(cherry picked from commit 9c06832d7e12bfd01e4633342fbff729b648474b)
2023-06-13 14:05:57 +08:00
puhui999
73b2809654 fix: 添加商品属性去掉备注
(cherry picked from commit 6ac8c78d570737194327958736adf05551ff4ac1)
2023-06-13 14:05:53 +08:00
puhui999
cafd74193f fix: 移动copyValueToTarget方法到utils/index中
(cherry picked from commit 43e541f9449e3474379b8bd7903666f783454963)
2023-06-13 14:05:38 +08:00
YunaiV
7a5993c584 code review 商品管理的实现
(cherry picked from commit e92361ed401771998c6abd6d9ba53801a6e0cfa6)
2023-06-13 13:56:48 +08:00