Commit Graph

550 Commits

Author SHA1 Message Date
YeMingfei666 0ad3080e71 代客下单更新
确认订单时购物车数据为空时不请求修改就餐模式
2024-10-11 18:16:08 +08:00
YeMingfei666 ca919a04c3 Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-11 17:54:24 +08:00
YeMingfei666 6938cf7204 代课下单更新 2024-10-11 17:53:30 +08:00
YeMingfei666 f439dca343 订单详情页面总技保持两位小数 2024-10-11 17:53:11 +08:00
YeMingfei666 0cfc3aebc7 增加搜索功能 2024-10-11 17:47:31 +08:00
GaoHao d53d72ae1a Merge branch 'gh' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-11 17:42:33 +08:00
GaoHao fa5cf04ac1 门店位置编辑更新 2024-10-11 17:41:57 +08:00
YeMingfei666 9eb875ea08 修复桌台筛选条件为并的关系
修复桌台刷新时未根据筛选条件筛选台桌
2024-10-11 17:03:49 +08:00
YeMingfei666 c9e195c859 代客下单修改部分页面跳转逻辑 2024-10-11 15:48:52 +08:00
YeMingfei666 ec509d1186 订单详情页面隐藏一些暂时没有的功能 2024-10-11 15:45:43 +08:00
YeMingfei666 6460dcf33d 订单列表页面更新 2024-10-11 15:45:06 +08:00
YeMingfei666 f0b3a35d87 待客下单更新:
先付款模式下必须完成支付才能离开支付页面
2024-10-11 15:44:46 +08:00
YeMingfei666 6ef7ce8d89 修复分页问题 2024-10-11 14:10:36 +08:00
YeMingfei666 0430e560e7 Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf 2024-10-11 10:06:33 +08:00
YeMingfei666 a51f6c7d72 更新 2024-10-11 10:06:18 +08:00
YeMingfei666 f44a0c0a50 代客下单增加搜索 2024-10-11 10:05:34 +08:00
YeMingfei666 bc03b2c30e 去除全部请求拦截提示弹窗的icon 2024-10-11 10:01:00 +08:00
YeMingfei666 6b329a7e2e 取消弹窗mask 2024-10-11 10:00:31 +08:00
GaoHao 71e6eeba5e Merge branch 'gh' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-11 09:13:41 +08:00
GaoHao 3a1e8fa211 店铺详情编辑修改 2024-10-11 09:12:22 +08:00
YeMingfei666 7aee58ce89 台桌列表更新 2024-10-10 18:01:40 +08:00
YeMingfei666 e2c3dbca87 修改订单详情,未选择用户显示服务员下单 2024-10-10 18:01:13 +08:00
YeMingfei666 4c5199f9d8 代客下单更新
1.去除选择桌台和用户搜索自动聚焦
2.增加扫描二维码
3.确认订单页面禁止切换桌台
2024-10-10 18:00:28 +08:00
YeMingfei666 8361ec77ec 修复:
代客下单支付完订单号未将购物车置空
未将台桌置空
2024-10-10 17:10:15 +08:00
YeMingfei666 35d5dc3d32 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-10 16:41:42 +08:00
YeMingfei666 ee61d3db7c 修复支付订单未显示订单绑定用户余额问题 2024-10-10 16:40:55 +08:00
YeMingfei666 204923af19 代客下单去除不选择人数下单 2024-10-10 16:40:23 +08:00
YeMingfei666 33e1b60551 增加部分公共样式 2024-10-10 16:25:31 +08:00
YeMingfei666 388f33985e 去除提示弹窗icon 2024-10-10 16:25:14 +08:00
YeMingfei666 376aa06705 用户管理增加订单跳转 2024-10-10 16:24:15 +08:00
YeMingfei666 4db00359e5 桌台更新 2024-10-10 16:23:58 +08:00
YeMingfei666 9c0a4e704f 订单管理更新 2024-10-10 16:23:23 +08:00
YeMingfei666 0632e395ce 代客下单更新 2024-10-10 16:23:09 +08:00
YeMingfei666 efa346ade6 商品管理更新 2024-10-10 16:21:58 +08:00
duan 82ad5973fb Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb 2024-10-10 15:22:48 +08:00
duan 16508515c4 供应商列表 2024-10-10 15:22:36 +08:00
YeMingfei666 09781b82e1 台桌列表修改
当台桌状态为开台中时
如果台桌没有返回下单生成订单id,
将台桌当做空闲处理
2024-10-10 11:47:19 +08:00
YeMingfei666 8329d9cfad 增加商品规格权限验证 2024-10-10 09:39:41 +08:00
YeMingfei666 13e851da4f Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-09 17:46:32 +08:00
YeMingfei666 d8b9bd1ad6 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-09 17:46:23 +08:00
YeMingfei666 703da8e683 update 2024-10-09 17:46:04 +08:00
YeMingfei666 cf6dbab969 增加单品备注 2024-10-09 17:41:00 +08:00
YeMingfei666 b37510e804 增加退款权限校验 2024-10-09 17:34:24 +08:00
YeMingfei666 bf588ca7fb 增加登录类型 2024-10-09 17:33:54 +08:00
YeMingfei666 fbfcfc4d82 增加商品管理编辑权限验证 2024-10-09 17:33:34 +08:00
YeMingfei666 f700096359 修改增加部分api 2024-10-09 17:33:10 +08:00
YeMingfei666 2b9aacdf73 my-tabs组件增加size属性 2024-10-09 17:32:41 +08:00
YeMingfei666 77b9ed369a 修改my-switch组件禁止时透明度变化为可控 2024-10-09 17:32:13 +08:00
YeMingfei666 b5eb099c75 增加店铺员工id 2024-10-09 17:31:17 +08:00
YeMingfei666 1f499a3bd6 增加全局权限验证方法 2024-10-09 17:30:50 +08:00