Commit Graph
243 Commits
Author SHA1 Message Date
dzc 1393c6a38f Merge branch 'master' of https://gitea.zianxin.com/zianxin/biz-mobile-cloud-zax 2026-10-16 11:35:56 +08:00
dzc eb99a0fcee 11 2026-10-16 11:31:33 +08:00
zjf b9e2010cd2 酒店优化 2026-10-16 11:09:25 +08:00
zjf 751993856b 酒店优化 2026-10-15 13:38:49 +08:00
zjf d441fffc19 酒店详情 2026-10-13 17:31:41 +08:00
zjf 0958d8dded Merge remote-tracking branch 'origin/master' 2026-10-13 16:43:41 +08:00
zjf de3d5f052e 酒店 2026-10-13 16:43:25 +08:00
dzc 291e0e39cf Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-cloud-zax 2026-10-12 13:44:53 +08:00
dzc 32743c6570 feat:钱包流水增加设备类型
fix:退款bug
2026-10-12 13:44:49 +08:00
zjf eb46a785e6 Merge remote-tracking branch 'origin/master' 2026-10-10 18:03:47 +08:00
zjf b6380ab6da 酒店 2026-10-10 18:03:37 +08:00
dzc bc85e793d2 feat:菜谱页面适配国际化
feat:钱包页面增加人员选择
2026-10-10 12:05:20 +08:00
zjf c958509e8a Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-cloud-zax 2026-10-10 12:02:52 +08:00
zjf 8cb8eac9cd 食堂字段 2026-10-10 12:02:41 +08:00
dzc f10575a873 11 2026-10-08 13:11:58 +08:00
dzc 1664b320f0 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-cloud-zax 2026-10-08 11:47:58 +08:00
dzc 84f085f483 feat:迁移hard和wallet模块的定时任务
feat:增加订餐预约时间管理
2026-10-08 11:47:55 +08:00
zjf 71ba22bedc h5环境配置 2026-09-28 17:25:10 +08:00
zjf 487082cc80 h5环境配置 2026-09-28 17:16:27 +08:00
zjf a82b41585b 1.套餐字段添加 2.移除浙政钉环境和诗画环境 2026-09-28 16:53:17 +08:00
zjf 7850e0a042 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.env
#	src/sheep/hooks/use-scan-code.ts
2026-09-28 16:52:27 +08:00
zjf 5c977fbc4b 1.套餐字段添加 2.移除浙政钉环境和诗画环境 2026-09-28 16:50:24 +08:00
dzc 65e4157b59 feat咖啡机支付 2026-09-24 14:34:52 +08:00
dzc 3097cb2253 feat:咖啡机订单优化 2026-09-23 10:51:15 +08:00
zjf 82eb671f0d Merge remote-tracking branch 'origin/master' 2026-09-22 14:13:10 +08:00
zjf 0f2926ff91 ai点餐 2026-09-22 14:12:57 +08:00
dzc 2283919a6b feat:删除发现页面 2026-09-22 10:32:06 +08:00
zjf 69f48c4595 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/pages/root/login.vue
2026-09-21 15:07:56 +08:00
zjf a6e71a1e22 登录增强 2026-09-21 15:01:13 +08:00
dzc 81f5591bbc feat:咖啡机 2026-09-18 14:38:10 +08:00
dzc 79ebcec760 feat:app流水通知显示备注
feat:咖啡机初步
2026-09-18 12:53:39 +08:00
dzc dcac6536ff fix:菜谱修改 2026-09-17 18:47:01 +08:00
dzc 39f60bb2c7 fix:订单列表展示购买商品数量 2026-09-15 17:43:18 +08:00
dzc 80b04689de feat:大量导入用户创建钱包死锁问题
feat:自动核销
feat:订单页面修改、订单地图
2026-09-14 18:34:31 +08:00
dzc da43c52cb4 feat:订单页重构 2026-09-14 11:05:40 +08:00
dzc 9d0ede33c6 11 2026-09-13 16:41:55 +08:00
dzc 32e21fbb5c Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-cloud-zax 2026-09-09 14:44:15 +08:00
dzc 703815cabd 11 2026-09-09 14:44:11 +08:00
zjf f76aee3ecc Merge remote-tracking branch 'origin/master' 2026-09-09 10:41:31 +08:00
zjf 09d4f2430d 国际化 2026-09-09 10:41:15 +08:00
dzc 3e07075268 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-cloud-zax 2026-09-08 18:28:03 +08:00
dzc 8ac5c0cf14 11 2026-09-08 18:27:59 +08:00
zjf 3cbb8fb6df Merge remote-tracking branch 'origin/master' 2026-09-08 11:03:19 +08:00
zjf 51515a71a9 中文简体,邀请注册 2026-09-08 11:03:04 +08:00
dzc 6fc455dbaf 11 2026-09-07 14:05:23 +08:00
dzc 86a0e9ce46 fix:核销bug修改 2026-09-04 18:57:49 +08:00
dzc c37f52a580 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-cloud-zax 2026-09-03 17:25:16 +08:00
dzc f2a2aebee4 1111111 2026-09-03 17:25:12 +08:00
zjf ded3be3fb5 Merge remote-tracking branch 'origin/master' 2026-09-03 14:03:56 +08:00
zjf cb348cacae 订单页面样式调整,个别页面国际化适配完善 2026-09-03 14:03:39 +08:00