Commit Graph

145 Commits (563c3eeddf285a222130334a693b92e25b047172)

Author SHA1 Message Date
shizhong 5cfe65b87a refactor: 统一 setup 格式 2023-09-22 14:25:05 +08:00
shizhong 7e5ad60d1d refactor: vue3.3 defineOptions 2023-09-22 14:00:50 +08:00
shizhong 20f483f561 refactor: vue3.3 defineOptions 2023-09-22 12:49:25 +08:00
xingyu e2040244cf fix: eslint
(cherry picked from commit 5494756a66)
2023-09-20 12:42:48 +08:00
owen 117577d9d1 mall:修复优惠券模板,固定日期范围保存失败
(cherry picked from commit 7887be6e92)
2023-09-20 12:39:18 +08:00
owen 6f8dc79283 promotion: 优惠券模板 productSpuIds 改成 productScopeValues
(cherry picked from commit 5f557c7be5)
2023-09-20 12:39:13 +08:00
owen 2707c5fadc mall:修复优惠券发券弹窗样式
(cherry picked from commit a68acb096f)
2023-09-20 12:39:07 +08:00
YunaiV fd501a1f5b code review:优惠劵逻辑
(cherry picked from commit d10530c9f5)
2023-09-20 12:39:02 +08:00
YunaiV 2a280e8267 code review:优惠劵逻辑
(cherry picked from commit 4f7d6793fd)
2023-09-20 12:38:39 +08:00
owen 842c922855 mall:优惠券发送优化
(cherry picked from commit 76c4644b4b)
2023-09-20 12:38:35 +08:00
YunaiV 04a16dbb7d code review:订单列表
(cherry picked from commit 0743e4941c)
2023-09-20 12:38:27 +08:00
puhui999 d740a4d894 订单管理:完善订单详情
(cherry picked from commit f0249e94a5)
2023-09-20 12:34:53 +08:00
puhui999 d44c616ecd 售后退款:完善售后管理(列表、详情)
(cherry picked from commit 07a0530fc9)
2023-09-20 12:34:48 +08:00
puhui999 ad2c6654c1 fix: 修正合并差异
(cherry picked from commit 3e7945e437)
2023-09-20 12:34:38 +08:00
YunaiV 27bdeb9b50 code review
(cherry picked from commit 3918fab1ec)
2023-09-20 12:34:16 +08:00
puhui999 a2a343ac2e fix: 1、修复营销活动相关页面打不开的问题 2、修复 spu 添加失败的问题 2、重构 spu 的 sku 校验方式为通用配置的方式
(cherry picked from commit f9780b636c)
2023-09-20 12:33:46 +08:00
puhui999 45e0f5fb6d 更新订单和售后退款详情页面路由
(cherry picked from commit 264a29e451)
2023-09-20 12:33:33 +08:00
puhui999 e777f77ba9 订单列表:添加配送方式筛选
(cherry picked from commit 688dad319e)
2023-09-20 12:33:30 +08:00
puhui999 ca94a1f274 商品列表:修复添加属性时会返回已存在属性值的问题
(cherry picked from commit 5c7796ca6f)
2023-09-20 12:33:25 +08:00
puhui999 95f0a06667 订单售后列表:完善部分 TODO
(cherry picked from commit f5a1772464)
2023-09-20 12:33:19 +08:00
YunaiV 8364e52477 code review:售后详情
(cherry picked from commit 29b8d06ff2)
2023-09-20 12:32:48 +08:00
owen c999b72692 mall:优惠券 商品适用范围,增加商品分类
(cherry picked from commit 27219e1833)
2023-09-20 12:30:42 +08:00
owen 404bb00dbf mall:优惠券 商品选择组件
(cherry picked from commit 60d2e3114b)
2023-09-20 12:30:37 +08:00
puhui999 c738fd417a 订单售后列表:完善售后详情及相关操作
(cherry picked from commit ed739aec55)
2023-09-20 12:30:14 +08:00
YunaiV ed41a9bed6 重构:商品详情界面的路由、文件路径
(cherry picked from commit 8d026f0837)
2023-09-20 12:30:02 +08:00
puhui999 52776c97da 订单售后列表:初始化售后详情
(cherry picked from commit 8a51c9c771)
2023-09-20 12:25:56 +08:00
puhui999 875211e24f 订单售后列表:重构列表
(cherry picked from commit 4f81468695)
2023-09-20 12:25:50 +08:00
puhui999 109e18dba6 订单列表: 修复差异
(cherry picked from commit 8239ca474f)
2023-09-20 12:25:45 +08:00
owen 529ac7d347 mall: 完善后台发送优惠券
(cherry picked from commit beef6a0a94)
2023-09-20 12:25:36 +08:00
YunaiV b9c0d4ffa5 code review:商品评论
(cherry picked from commit 5cd01903e4)
2023-09-20 12:24:24 +08:00
owen ae0982ee44 商品评论:回复表单提取到单独的组件中
(cherry picked from commit 3a15390090)
2023-09-20 12:23:12 +08:00
owen 9f4751b1d7 商品评论:
1.移除scores,由后端自动计算
2.SPU、SKU选择组件,放到SPU组件目录下

(cherry picked from commit 15971b6feb)
2023-09-20 12:23:04 +08:00
YunaiV b55b9966d6 code review:订单列表
(cherry picked from commit b8ca5800c6)
2023-09-20 12:22:48 +08:00
YunaiV 0e36aea9ff code review:商品评论
(cherry picked from commit 84c5eb9942)
2023-09-20 12:22:22 +08:00
owen 1a49567613 商品:完善后台商品评论功能
(cherry picked from commit 814b4631c9)
2023-09-20 12:19:40 +08:00
puhui999 41be920135 订单列表:优化订单列表页面结构
(cherry picked from commit 58502b1241)
2023-09-20 12:18:24 +08:00
puhui999 9d9ccaa1b8 完善 code review 提到的问题
(cherry picked from commit 7db6c121bb)
2023-09-20 12:18:16 +08:00
YunaiV 46ab58ddf0 code review:订单列表、订单详情
(cherry picked from commit cfbc2ed74c)
2023-09-20 12:14:05 +08:00
puhui999 edb88f8548 订单列表:列表重构 添加门店、物流检索条件
(cherry picked from commit 5dceda614a)
2023-09-20 12:12:58 +08:00
puhui999 300cfe694b 订单列表:列表重构: 完善订单发货、修改地址、订单调价、订单备注
(cherry picked from commit 83e780da06)
2023-09-20 12:12:55 +08:00
puhui999 99ef6f83ba 订单列表:列表重构: 完善订单发货、修改地址、订单调价、订单备注
(cherry picked from commit be143ea21b)
2023-09-20 12:12:52 +08:00
puhui999 8a7b6e2be1 订单列表:列表重构 ④ 移除测试数据
(cherry picked from commit ebcbe63d9b)
2023-09-20 12:11:53 +08:00
puhui999 9efe122318 订单列表:列表重构 ③ 添加备注表单和发货表单
(cherry picked from commit 0d202a7a85)
2023-09-20 12:11:09 +08:00
puhui999 c89d08e22a 订单列表:列表重构 ② and 完善订单详情
(cherry picked from commit 345c09ee6c)
2023-09-20 12:10:57 +08:00
YunaiV 5fd150ad84 优化商品属性的编辑按钮
(cherry picked from commit 1db98698bd)
2023-09-20 12:08:44 +08:00
puhui999 21643274cb 订单列表:列表重构 ①
(cherry picked from commit 2eb740765e)
2023-09-19 21:03:26 +08:00
puhui999 1854e891cb fix: 完善砍价活动管理对齐后端
(cherry picked from commit 44be35b5ce)
2023-09-19 20:53:01 +08:00
zws beb13d65d8 fix
https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues/I7SZNW

(cherry picked from commit c368c9b232)
2023-09-19 20:52:42 +08:00
YunaiV cfef155ee2 商城:
1. 微调砍价活动的代码

(cherry picked from commit 7bf3e41c61)
2023-09-19 20:50:54 +08:00
YunaiV 81d8e36ccc 商城:
1. 修复拼团活动,修改商品的拼团价格,会存在 *100 的问题

(cherry picked from commit 127e6b202e)
2023-09-19 20:50:49 +08:00