215 Commits

Author SHA1 Message Date
d0bbd71dde 修改账单统计 2024-06-07 11:27:08 +08:00
83ec0daaea Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store 2024-06-07 11:13:30 +08:00
4aac0ff460 添加账单详情 2024-06-07 11:13:25 +08:00
liu
434d4c07a5 Merge remote-tracking branch 'origin/main' 2024-06-07 10:07:19 +08:00
liu
32d7887fed 处理调试 2024-06-07 10:07:03 +08:00
e8a515eef1 Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store 2024-06-07 10:05:33 +08:00
99cdb5e150 添加财务账单列表 2024-06-07 10:05:28 +08:00
liu
48376313a9 处理订单查询和退货 2024-06-07 09:31:43 +08:00
mkm
fa07cff6ed feat: 更新系统商店存储列表和逻辑 2024-06-06 18:09:40 +08:00
mkm
42e95677ef feat(store_product): 编辑成功,增加库存操作成功逻辑 2024-06-06 18:02:41 +08:00
cbf01610b6 添加门店设置 2024-06-06 17:45:58 +08:00
16586fd5e7 修改店铺订单查询 2024-06-06 17:36:07 +08:00
e5208db56d Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store 2024-06-06 17:32:30 +08:00
228830c7bf 修改店铺订单查询 2024-06-06 17:32:18 +08:00
mkm
c47cc2d505 feat: 添加门店入库记录功能 2024-06-06 17:31:30 +08:00
ba122381af Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store 2024-06-06 17:15:14 +08:00
94309ff28d 添加门店设置 2024-06-06 17:14:49 +08:00
liu
2627df98eb 活动开启下单后更新用户的等级 2024-06-06 17:04:34 +08:00
f5da7a4359 Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store 2024-06-06 17:02:58 +08:00
64f59e596e 修改店员详情、配送员详情 2024-06-06 17:02:53 +08:00
liu
0cfbab76f3 更改配送用户表判断 2024-06-06 16:55:54 +08:00
4362d43795 Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store 2024-06-06 16:45:20 +08:00
359c015a15 添加配送员管理 2024-06-06 16:45:14 +08:00
liu
8eb46c9d08 订单数量 2024-06-06 16:42:35 +08:00
liu
0a67e0c090 修改下单优惠逻辑 2024-06-06 16:32:05 +08:00
liu
f591acf7ca 修改充值 2024-06-06 16:12:42 +08:00
mkm
5b27ec955f feat: 添加获取日、周、月账单列表API 2024-06-06 16:10:12 +08:00
fa4e005459 添加文件管理 2024-06-06 16:00:20 +08:00
2c6de7c547 添加文件管理 2024-06-06 15:55:35 +08:00
cf79b9e139 Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store 2024-06-06 15:47:20 +08:00
dc789c2f5e 修改订单列表查询 2024-06-06 15:47:13 +08:00
liu
7ce6403ce4 修改二次支付 2024-06-06 15:34:57 +08:00
8515960d83 添加店员管理 2024-06-06 15:00:33 +08:00
liu
73f6fe4032 修改收银台相关接口 2024-06-06 14:58:20 +08:00
mkm
56b7588e54 feat: 添加获取退款订单列表API 2024-06-06 14:38:11 +08:00
fbecb264d5 Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store
# Conflicts:
#	public/admin/index.html
2024-06-06 14:22:29 +08:00
liu
04c186afe0 修改权限和限制核销健壮性 2024-06-06 14:15:42 +08:00
zmj
1e06fc9208 Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store 2024-06-06 14:10:48 +08:00
zmj
9a64209496 多门店前端跟新 2024-06-06 14:10:37 +08:00
liu
f72a9445bc Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store 2024-06-06 13:55:53 +08:00
liu
04241cf26b 修改权限 2024-06-06 13:55:43 +08:00
zmj
c3a35b7ae9 前端页面更新 2024-06-06 13:48:46 +08:00
mkm
c3dbd9a6de Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store into main 2024-06-06 13:44:01 +08:00
liu
3da56c1612 补接口 2024-06-06 13:43:23 +08:00
mkm
37b125b13b Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store into main
Conflicts:
	public/admin/index.html
2024-06-06 12:31:49 +08:00
mkm
6fb1d40281 Add files from public/admin/ 2024-06-06 12:08:50 +08:00
zmj
95fcbe1e4d Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store 2024-06-06 12:04:40 +08:00
zmj
fc1300c694 更新多门店后台前端 2024-06-06 12:04:26 +08:00
liu
c9f2a03563 Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store 2024-06-06 11:57:24 +08:00
liu
495c5ec3ea 修改查询方式 2024-06-06 11:57:07 +08:00