367 Commits

Author SHA1 Message Date
YunaiV
db1e2beaf0 code review:优化收银台的实现,解决 TODO
(cherry picked from commit 7625e6757c92e5dc5cf76fdc33e31ff3625268d5)
2023-09-19 20:44:38 +08:00
xiaqing
817548c825 会员积分针对代码格式、功能优化
1.优化todo建议
2.删除无用代码

(cherry picked from commit de941ec6ba0327d638dad22f3258ccc50f86a303)
2023-09-19 20:41:09 +08:00
xiaqing
0991528c17 会员签到针对代码格式、功能优化
1.优化todo建议
 2.删除无用代码

(cherry picked from commit f310f65842ce05a391d463610e7f7ac7a86dbe2b)
2023-09-19 20:40:40 +08:00
dhb52
191d149959 feat: 支付功能迁移(初稿)
(cherry picked from commit a6eab3cc9a998cff2120a6db82f6938ab1c2f206)
2023-09-19 20:39:21 +08:00
puhui999
541fc97796 feat: 完善砍价活动管理
(cherry picked from commit 49477169837c87c5590ee4c31945d285792a7375)
2023-09-19 20:36:04 +08:00
YunaiV
f9be77efd4 bugfix:分配角色菜单时,调用接口 404 问题
(cherry picked from commit ef31ec7aaf007054b18a4540d648b5c04f5ecc5b)
2023-09-19 20:35:42 +08:00
dhb52
3f479ecffc feat: 支付管理/应用信息(alpha)
(cherry picked from commit 323417b0d4afac0aa6aede6aae3c5d865efa47cb)
2023-09-19 20:25:26 +08:00
puhui999
da5ad39251 fix: combinationActivity 调整
(cherry picked from commit c327f79177f000edab15c8304d73ed5bc7c910bd)
2023-09-19 20:24:40 +08:00
YunaiV
4cef3e3e5f 登录时,直接从用户信息中,获取菜单。目的:加快首页的加载速度
(cherry picked from commit ee802d6335f7b5e785620c45053dd31f4a95f785)
2023-09-19 19:59:19 +08:00
shizhong
74aac991bc 发布 1.8.0 版本 2023-07-27 20:53:52 +08:00
YunaiV
2104de6a71 review 秒杀、拼团活动的 CRUD
(cherry picked from commit a003b59e3920dfd4a3536b7314857a5c2f5838fd)
2023-07-27 19:51:42 +08:00
puhui999
84d538ad69 fix: 完善拼团活动 CRUD
(cherry picked from commit dc39ad0cd1b5bc4a12983b971449ca1a6792d4b9)
2023-07-27 19:45:36 +08:00
puhui999
85cc7cdb46 fix: mall SeckillConfig
(cherry picked from commit 3fd9f1b43e42a10feb6fd04b2d9dbc2ab5f6edd6)
2023-07-27 19:43:51 +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
puhui999
1ab348f8df fix: mall SeckillActivity
(cherry picked from commit b98149f1a75058edc9e85914772a1ae4cacf479d)
2023-07-27 19:40:48 +08:00
puhui999
22f869db89 feat: mall CombinationActivity
(cherry picked from commit 2e96b1c9840b7adfbc8110eb3a36bd2b406dc392)
2023-07-27 19:36:45 +08:00
xiaqing
195ae79bfc 会员中心代码
1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码

(cherry picked from commit 4251dc5d6167db0befecfacf2402511314eda6ec)
2023-07-27 19:36:28 +08:00
puhui999
1d0d9d24ad fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件
(cherry picked from commit 51e79f29cc70ad1670b93829bab3d5d23751c263)
2023-07-27 19:35:12 +08:00
YunaiV
a22eea8e90 review 营销活动
(cherry picked from commit 5d613e69b3d651806f7710eebb2b14e5c7034097)
2023-07-27 19:34:54 +08:00
puhui999
70c2fe409c fix:完善秒杀活动管理①
(cherry picked from commit b1e7f149638243885ae97f6c31f5df24d9b6ffa2)
2023-07-27 19:33:06 +08:00
puhui999
7da1b04ae2 feat:添加秒杀活动管理
(cherry picked from commit 3d47d6744e0dd78d4df350c5eb6421dba889f8af)
2023-07-27 19:27:44 +08:00
xiaobai
1b5c983d1d 提交订单页面和详情页面 20230619
(cherry picked from commit 42a7aec0b51c4c9f0d2588972a3fddfd3bd2f981)
2023-07-27 19:15:56 +08:00
puhui999
0f9629707f feat: 完事秒杀时段管理
(cherry picked from commit f7b195b226308e4f016817a1bba5ca1a52921906)
2023-07-27 19:14:57 +08:00
puhui999
a233d16dbb feat: 秒杀时段管理
(cherry picked from commit a75720ec0646f4fe5bdf21126bd5c3cf719170e9)
2023-07-27 19:14:47 +08:00
YunaiV
8bf1f04044 code review:订单列表
(cherry picked from commit e3f250fff07ee496c54050d1ed28041c9786d0fd)
2023-07-27 19:11:50 +08:00
xiaqing
98c977a732 初始化积分模块
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理

(cherry picked from commit 1dca8476b35962c278124075acc731319fca60cb)
2023-07-27 19:06:34 +08:00
xiaobai
b9ba1d36c2 20230606 add trade-order and details
(cherry picked from commit 985d764f623e24402b1ba91562d2994b28d1aeec)
2023-07-27 18:54:36 +08:00
YunaiV
f641785df9 code review:优惠劵管理
(cherry picked from commit 51e76ffd53aa1cc76f85cfb4389ac257f2804f8a)
2023-07-27 18:53:49 +08:00
shizhong
0d0b2265c6 !164 优惠券迁移vue3 Merge pull request !164 from dhb52/dev 2023-07-27 18:53:17 +08:00
YunaiV
16c518e18a code review:门店自提、快递运费
(cherry picked from commit 60c1604d4947df8f2eaaa748780af9db9f75831f)
2023-07-27 18:46:14 +08:00
xiaobai
a29421dd41 临时提交
(cherry picked from commit 505f5cfa0c543f779abe43d6d77f260991486fdf)
2023-07-27 18:44:50 +08:00
dhb52
e2faf6a2a4 style: 添加VO
(cherry picked from commit c5a7d05821d4eae7197cbd0dba66f544ee214ecc)
2023-07-27 18:42:44 +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
jason
9e7fe34ae8 新增门店自提管理
(cherry picked from commit 000aa950129d42aa141816f939c64639e89ff7c6)
2023-07-27 13:10:46 +08:00
puhui999
cf7f4ff89e fix: 修改 review 提到的问题,完善分类选择层级校验、完整层级展示
(cherry picked from commit e555977757f76516638ce2c8fb90eb6a186bc25b)
2023-07-27 13:09:36 +08:00
周建
b07cc98619 接口命名统一 2023-06-21 13:22:47 +08:00
jason
88439669c0 运费模板区域改成多选
(cherry picked from commit 70c50827761104b9eb41282d37e1405137e5f1b3)
2023-06-13 14:15:44 +08:00
YunaiV
4cd4327bc8 review + mall:商品管理
(cherry picked from commit 0fba3fd5033a451cfe2c33a1dc8a3d91c90ed9b3)
2023-06-13 14:13:55 +08:00
puhui999
4eacb6dd8c fix: 完善善品导出
(cherry picked from commit d877bfd26e488c4138e0d6e4d6a5b54817d8103e)
2023-06-13 14:12:49 +08:00
jason
bbe9e667c4 运费模板性能优化。区域选择使用懒加载
(cherry picked from commit af2fb4bf5f287a406700ba3a3e083c3d5755d2c1)
2023-06-13 14:12:41 +08:00
jason
90ccc11006 mall: 订单中心->运费模板(第一版 性能有问题)
(cherry picked from commit 4e69f15128b3d93958cc4082cff91c7230feb410)
2023-06-13 14:10:52 +08:00
puhui999
4410bdd93c fix:解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记
(cherry picked from commit 0c42b76a52ce9b29ec68b54d9b74deb4483108dd)
2023-06-13 14:07:22 +08:00
jason
4ec3d3fe72 新增快递公司菜单
(cherry picked from commit b0984c901369dd45091cbe03448aedcab9573627)
2023-06-13 14:06:19 +08:00
puhui999
ea4e2a0bcc fix: 解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记
(cherry picked from commit 4ddba9d454ebfd221f39ba12b375401768ff7f45)
2023-06-13 14:06:16 +08:00
puhui999
74d926172c fix: 进一步完善商品列表,修复TODO
(cherry picked from commit 52bfc4dac00bf1e1be9a3d8e49a72d18c4c401bf)
2023-06-13 14:05:48 +08:00
puhui999
478f02fa7c fix: 整合spu,移动相关类型到spu删除对应文件和文件夹
(cherry picked from commit 50b181318b07c0f93827e8d6c3abfb34a3cd0c84)
2023-06-13 14:05:43 +08:00
shizhong
e81f8c51cb 修复后台”在线用户强退“功能 2023-06-13 14:03:52 +08:00