Commit Graph

341 Commits

Author SHA1 Message Date
YeMingfei666 4e835eb43d fix: 修复历史订单切换就餐模式,修改代客下单就餐类型根据店铺信息做限制,修改店铺配置至少勾选一种就餐模式 2025-03-18 16:59:06 +08:00
YeMingfei666 c722cd4c79 fix: 修改代客下单添加时增加商品类型,修改激活码列表信息展示 2025-03-18 16:14:22 +08:00
duan 2058acc254 Merge branch 'dwb' of https://e.coding.net/g-cphe0354/cashier/cashier-web 2025-03-18 16:06:32 +08:00
duan 188aad8035 feat: 分组追加商品修复 2025-03-18 16:04:30 +08:00
YeMingfei666 7ec4fe0c83 fix: 修改支付方式挂单文字改为挂账 2025-03-18 14:28:11 +08:00
YeMingfei666 85c22d506e fix: 修复自取模式下添加可选套餐默认打包数量为0问题 2025-03-18 14:25:37 +08:00
YeMingfei666 53529df072 fix: 修复代客下单初始化时init传参问题 2025-03-18 14:10:36 +08:00
YeMingfei666 88cef08f87 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf 2025-03-18 14:03:19 +08:00
YeMingfei666 735b325fd3 feat: 增加代课下单收到商品信息变动时重新获取商品信息初始化购物车数据 2025-03-18 14:03:07 +08:00
duan 0cb12ccc5a Merge branch 'dwb' of https://e.coding.net/g-cphe0354/cashier/cashier-web 2025-03-18 11:50:32 +08:00
duan 14d3ffb4cf feat: 商品列表跳转到订单列表 2025-03-18 11:49:59 +08:00
YeMingfei666 cefabae276 fix: 修改优化转桌功能 2025-03-18 10:20:42 +08:00
YeMingfei666 90dc61dee8 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf 2025-03-18 09:24:14 +08:00
YeMingfei666 259d6db77f fix: 修改代客下单逻辑,收到清空购物车消息和切换台桌时获取该台桌订单 2025-03-18 09:22:55 +08:00
duan b7195ce21e Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web 2025-03-17 18:28:21 +08:00
duan c410e752dd feat: 商品列表修改退回退款到表格 2025-03-17 18:28:14 +08:00
YeMingfei666 df66a131bf Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web 2025-03-17 18:11:27 +08:00
YeMingfei666 61607fcc44 fix: 修改积分相关接口传参userId改为shopUserId,修改耗材出入库展示,修改点歌页面跳转 2025-03-17 18:07:55 +08:00
duan d89eda96a9 Merge branch 'dwb' of https://e.coding.net/g-cphe0354/cashier/cashier-web 2025-03-17 18:07:27 +08:00
duan 5cb3378217 feat: 商品列表,绑定耗材 2025-03-17 18:06:57 +08:00
duan e97424262b feat: 商品列表-报损-售罄-库存预警 2025-03-17 16:06:51 +08:00
YeMingfei666 4599274813 feat: 增加打包不同环境命令配置 2025-03-17 15:06:53 +08:00
YeMingfei666 2850cb94d4 fix: 修改代客下单仅下单后不展示历史下单数据 2025-03-17 14:35:52 +08:00
YeMingfei666 09aec0e733 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf 2025-03-17 14:19:38 +08:00
YeMingfei666 c24fae21c4 fix: 更新店铺管理页面:增加删除功能,修改必填项增加激活码和手机号为必填 2025-03-17 14:17:35 +08:00
YeMingfei666 399cbcfc3f fix: 修复店铺添加经营模式初始值问题 2025-03-17 13:56:26 +08:00
duan ab5a258e66 Merge branch 'dwb' of https://e.coding.net/g-cphe0354/cashier/cashier-web 2025-03-17 13:27:55 +08:00
duan f403426164 feat: 活动管理,允许充值自定义金额 2025-03-17 13:27:24 +08:00
YeMingfei666 8ea8c257d2 feat: 交班管理增加交班数据导出功能 2025-03-17 11:38:03 +08:00
YeMingfei666 2fe360bcb2 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf 2025-03-17 11:14:20 +08:00
YeMingfei666 8f65232d11 fix: 修复耗材绑定商品点击未跳转问题 2025-03-17 11:14:10 +08:00
duan 68dff42278 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into dwb 2025-03-17 11:09:31 +08:00
duan bf7091c554 feat: 交班 2025-03-17 11:08:44 +08:00
YeMingfei666 ed25a9c5e6 feat: 增加点歌配置列表页面,修复转桌报错导致页面无反应问题,去除添加耗材的库存数量以及弹窗关闭表单重置失败问题 2025-03-17 10:55:01 +08:00
YeMingfei666 6a37b53c8c fix: 订单详情增加退菜数量退款数量,修改可退款数量为下单数量-退菜-已退款 2025-03-15 14:57:19 +08:00
YeMingfei666 31d451894f fix: 代客下单优化离开代客下单页面时主动断开scoket,添加优惠券修改,修改获取优惠券记录请求方式改为get 2025-03-15 14:39:26 +08:00
YeMingfei666 d310638697 fix: 优化美团核销时,未绑定店铺增加弹窗是否去绑定 2025-03-15 13:51:21 +08:00
YeMingfei666 410dbb5fcf fix: 修改数量弹窗第一次显示数量为0 2025-03-15 13:41:18 +08:00
YeMingfei666 7cd9db724c fix: 修改用户列表昵称太长时超出省略 2025-03-15 13:28:31 +08:00
YeMingfei666 98a0e4a5bb fix: 修改复制手机号成功文字 2025-03-15 13:25:00 +08:00
YeMingfei666 cf81e2fd72 fix: 修复耗材添加失败,修复用户列表展示头像问题 2025-03-15 11:49:45 +08:00
YeMingfei666 4adb1bf713 fix: 修复会员编辑时生日数据格式问题 2025-03-15 11:37:27 +08:00
YeMingfei666 45f516eace fix: 修复代客下单购物车删除时收到消息未删除问题 2025-03-15 11:34:06 +08:00
YeMingfei666 a1b5a468a9 fix: 修复更新数据可能有skudata不存在报错 2025-03-15 10:43:49 +08:00
YeMingfei666 72fddad3eb feat: 增加数量编辑弹窗,修复数量输入键盘问题增加限制最多两位小数,增加socket重连次数上限弹窗 2025-03-15 10:27:21 +08:00
YeMingfei666 7b7dcefd5f fix: 代客下单称重商品增加起售数量判断 2025-03-14 18:30:41 +08:00
YeMingfei666 3c182c8e2f fix: 修复订单详情退款按钮显示判断 2025-03-14 17:17:21 +08:00
YeMingfei666 088826881b fix: 修复代客下单左边购物车点击立即支付显示订单生成问题 2025-03-14 17:11:07 +08:00
YeMingfei666 05ce745e58 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf 2025-03-14 17:01:55 +08:00
YeMingfei666 a6cc1656f8 feat: 订单详情增加直接退款 2025-03-14 17:01:45 +08:00