Commit Graph
86 Commits
Author SHA1 Message Date
dzc c8cd13b6cf Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-cloud-zax 2026-06-10 14:29:21 +08:00
dzc e888f135de feat:订餐确认 2026-06-10 14:29:17 +08:00
zjf c810b0515f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/pages/tabbar/my.vue
2026-06-09 16:03:34 +08:00
zjf 39b05e62bf 新用户首次登录强制修改密码,修改菜单名称 2026-06-09 16:01:47 +08:00
dzc 03f01ebe09 11 2026-06-08 16:40:24 +08:00
dzc 2e1c8e7103 扫一扫支付 2026-06-08 14:35:33 +08:00
dzc 97d72bd4bb Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-cloud-zax
# Conflicts:
#	.env
2026-06-08 12:41:22 +08:00
dzc d904d27b67 feat:商城收获地址 2026-06-08 12:41:09 +08:00
zjf 335df8b593 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.env
#	src/sheep/scss/font/iconfont.scss
2026-06-05 18:36:56 +08:00
zjf ef32ecbf7b 报餐图标更新 2026-06-05 18:35:49 +08:00
dzc 0733ab54db 11 2026-06-03 11:10:06 +08:00
dzc c303520659 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-cloud-zax
# Conflicts:
#	src/sheep/components/crud/crud-layout/crud-layout.vue
2026-06-02 17:35:19 +08:00
dzc 3a95725aca feat:适配页面,控制钱包别名 2026-06-02 17:34:44 +08:00
zjf 0cea375cfc 商品管理 2026-06-02 14:25:35 +08:00
zjf 823e1e3477 Merge remote-tracking branch 'origin/master' 2026-06-01 19:05:13 +08:00
zjf 7014ebf937 商家订单,骑手订单页面 2026-06-01 19:03:30 +08:00
dzc f0a6de01ab feat:付款码支付 2026-06-01 14:29:39 +08:00
dzc ccbb45d1ec Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-cloud-zax
# Conflicts:
#	src/manifest.json
2026-05-27 15:33:03 +08:00
dzc ac62e17031 11 2026-05-27 15:32:42 +08:00
zjf 7d9e021d75 报餐 2026-05-27 14:54:16 +08:00
zjf 72fb3c071d 修改报餐入口,完善报餐餐段 2026-05-27 13:31:06 +08:00
zjf b25642b028 报餐记录改为记录,赚米改为兑换,报餐统计改为统计 2026-05-27 11:10:20 +08:00
zjf 5264ee70ee Merge remote-tracking branch 'origin/master' 2026-05-25 20:10:43 +08:00
zjf d698a703f2 报餐 2026-05-25 20:10:24 +08:00
dzc ee9b51f60a 版本号 2026-05-25 20:06:32 +08:00
dzc 6be24456fb Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-cloud-zax 2026-05-25 19:38:59 +08:00
dzc 42211a8406 11 2026-05-25 19:38:56 +08:00
zjf ef322a8e90 报餐 2026-05-25 18:59:37 +08:00
zjf 392648a16e 报餐 2026-05-25 18:59:29 +08:00
zjf 6777d81473 报餐 2026-05-25 18:59:07 +08:00
dzc 85ac0e2fb1 11 2026-05-18 15:48:28 +08:00
dzc 35cf56e407 feat:预定 2026-05-09 17:57:58 +08:00
dzc e44c7c124f feat:商户功能配置 2026-05-09 15:25:52 +08:00
dzc 5c9a921f9c feat:bug修改 2026-05-09 11:49:38 +08:00
dzc 5800a0c76c feat:支付宝支付 2026-05-08 17:21:00 +08:00
dzc 8d07d19452 feat:充值类型列表 2026-05-06 17:37:45 +08:00
dzc 4bb014324d feat:支付宝支付 2026-04-23 14:51:50 +08:00
dzc f57b6ea7fc feat:支付宝支付 2026-04-22 17:37:09 +08:00
dzc 55d53def08 我的到第一个 2026-04-21 15:31:26 +08:00
dzc 82e3477502 1121 2026-04-15 20:16:31 +08:00
zjf d4a0dec85f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.env
2026-04-15 17:26:52 +08:00
zjf 6f80e96bc1 商家订单管理,样式修改,通知适配 2026-04-15 17:26:30 +08:00
dzc d69ab88f14 11 2026-04-14 16:59:59 +08:00
dzc 6540edd5d1 feat:bug 2026-04-13 18:13:23 +08:00
dzc 163930d64c fix:发现bug 2026-04-13 17:58:23 +08:00
dzc 26b6e99b0a feat:配送费页面ui 2026-04-13 16:39:43 +08:00
dzc f04663c2c1 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-mobile-cloud-zax 2026-04-13 14:46:06 +08:00
dzc f4fd96666b feat:配送费ui 2026-04-13 14:46:03 +08:00
zjf 825e74faaa Merge remote-tracking branch 'origin/master' 2026-04-13 14:19:46 +08:00
zjf e8e67c6749 定时配送 2026-04-13 14:19:32 +08:00