mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,870 Commits 15 Branches 15 Tags
Commit Graph

2870 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mkm
bb93f8f238 Merge pull request 'dev' (#31) from dev into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/31
 2025-04-28 11:56:35 +08:00
lewis
f3b547b835 修改仓库商品查询的错误 2025-04-28 11:55:17 +08:00
mkm
bcbcd626c3 1 2025-04-24 18:36:25 +08:00
mkm
7e11bf3bb2 1 2025-04-24 18:36:14 +08:00
mkm
03af4a589a Merge pull request 'feat(admin): 为商品列表添加图片字段' (#30) from dev into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/30
 2025-04-24 15:58:33 +08:00
mkm
13a575ca0c feat(admin): 为商品列表添加图片字段 
- 在 StoreProductLists 类中添加了 'image' => '图片' 字段
- 此修改使得商品列表能够显示商品图片，提高列表的可读性和直观性
 2025-04-24 15:57:54 +08:00
mkm
fb3b626970 Merge pull request '添加导入商品采购价' (#29) from dev into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/29
 2025-04-23 15:22:57 +08:00
lewis
959978f746 添加导入商品采购价 2025-04-23 15:22:27 +08:00
mkm
fbba725ce7 Merge pull request '同步商品价格比例' (#28) from dev into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/28
 2025-04-18 18:00:39 +08:00
lewis
11687aa3d4 同步商品价格比例 2025-04-18 18:00:11 +08:00
mkm
a08d11f69c Merge pull request '同步商品价格比例' (#27) from dev into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/27
 2025-04-18 17:50:28 +08:00
lewis
49d534a48d 同步商品价格比例 2025-04-18 17:49:43 +08:00
mkm
0a046509dd Merge pull request '添加商品价格更新时间' (#26) from dev into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/26
 2025-04-18 17:30:15 +08:00
lewis
970a7f07c5 添加商品价格更新时间 2025-04-18 17:22:06 +08:00
mkm
848dbf2c80 Merge pull request 'dev' (#25) from dev into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/25
 2025-04-18 16:33:03 +08:00
lewis
463da3cef1 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev 2025-04-18 16:32:27 +08:00
lewis
5e35acdc39 修改商品零售价格的错误 2025-04-18 16:31:14 +08:00
mkm
58b70c53f8 Merge pull request 'refactor(xlsx): 调整订单供货出库表格的列标题和数据填充逻辑' (#24) from dev into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/24
 2025-04-18 15:20:36 +08:00
mkm
b9e34a94d9 refactor(xlsx): 调整订单供货出库表格的列标题和数据填充逻辑 
- 将"出库单价"、"出库总价"、"供货价"、"供货总价"等列
 2025-04-18 15:19:00 +08:00
mkm
6d67d00c63 Merge pull request 'feat(admin): 仓库产品列表增加分类搜索功能' (#23) from dev into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/23
 2025-04-18 13:48:42 +08:00
mkm
3976af97f1 feat(admin): 仓库产品列表增加分类搜索功能 
- 添加了根据分类 ID 进行搜索的功能
- 如果请求中包含 'class_all' 参数，则在查询中加入相应的条件
- 通过 StoreProduct 模型获取符合条件的产品 ID 列表
- 如果没有符合条件的产品，则返回空数组
 2025-04-18 13:47:42 +08:00
mkm
a89f7fbe28 Merge pull request '调整了查询条件，增加了对class_all参数的处理。' (#22) from dev into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/22
 2025-04-18 12:07:45 +08:00
lewis
bb039fcf5e 调整了查询条件，增加了对class_all参数的处理。 2025-04-18 12:06:16 +08:00
mkm
b461c79b53 Merge pull request '修改商品列表搜索' (#21) from dev into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/21
 2025-04-17 09:57:21 +08:00
lewis
197a31668e 修改商品列表搜索 2025-04-17 09:57:07 +08:00
mkm
b3dee9c166 Merge pull request '修改商品列表搜索' (#20) from dev into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/20
 2025-04-17 09:44:42 +08:00
lewis
6dcd228e3c 修改商品列表搜索 2025-04-17 09:44:17 +08:00
mkm
fb4d528070 Merge pull request '更新 app/admin/logic/store_product/StoreProductLogic.php' (#19) from mkm-patch-2 into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/19
 2025-04-16 18:20:31 +08:00
mkm
90927b1c8e 更新 app/admin/logic/store_product/StoreProductLogic.php 2025-04-16 18:20:21 +08:00
mkm
363c7d604a Merge pull request 'dev' (#18) from dev into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/18
 2025-04-16 17:18:47 +08:00
lewis
eb24c561ad 修改商品列表搜索 2025-04-16 17:17:55 +08:00
lewis
4fc5b2d8dd 修改商品列表搜索 2025-04-16 17:14:58 +08:00
mkm
42750fcab9 Merge pull request '修改商品列表搜索' (#17) from dev into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/17
 2025-04-16 17:00:51 +08:00
lewis
022a25c6a6 修改商品列表搜索 2025-04-16 17:00:29 +08:00
mkm
4f7c8ffa85 Merge pull request '修改商品列表搜索' (#16) from dev into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/16
 2025-04-16 16:44:58 +08:00
lewis
881164ebbd 修改商品列表搜索 2025-04-16 16:43:41 +08:00
mkm
0d6c8f8057 Merge pull request '调试导入赠品' (#15) from dev into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/15
 2025-04-16 10:29:23 +08:00
lewis
fae49b796f 调试导入赠品 2025-04-16 10:24:40 +08:00
mkm
7e8a5d5420 Merge pull request 'dev' (#14) from dev into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/14
 2025-04-14 17:31:58 +08:00
lewis
3d47bb1b5d 修改预订单商品退库 2025-04-14 17:30:52 +08:00
sjeam
c19efa176a 商品图片管理1 2025-04-14 16:02:44 +08:00
sjeam
c19ef6080a 商品图片管理 2025-04-14 15:33:52 +08:00
mkm
e220e660f8 Merge pull request 'dev' (#13) from dev into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/13
 2025-04-14 14:45:22 +08:00
lewis
daf4b858ce 修改采购价格录入限制 2025-04-14 14:44:25 +08:00
lewis
e6e0eaadab 调试图片上传和识别 2025-04-14 09:40:54 +08:00
mkm
a4eb84500a Merge pull request 'fix(product): 修复商品价格保存逻辑' (#12) from dev into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/12
 2025-04-12 15:57:00 +08:00
mkm
f9d969c85c fix(product): 修复商品价格保存逻辑 
- 在 StoreProductPriceLogic 类中，将价格保存逻辑中的 'price' 字段错误地设置为 'vip_price' 的值
- 已将相关代码修正，确保 'price' 字段正确保存为 'price' 的值
 2025-04-12 15:56:30 +08:00
mkm
0ae06f9bfb Merge pull request '商品列表添加改价' (#11) from dev into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/11
 2025-04-12 11:43:30 +08:00
lewis
41264fd9a0 商品列表添加改价 2025-04-12 11:24:54 +08:00
mkm
40ede21710 Merge pull request '修改往期补单入库' (#10) from dev into main 
Reviewed-on: https://gitea.lihaink.cn/mkm/multi-store/pulls/10
 2025-04-11 10:24:37 +08:00