Commit Graph

797 Commits

Author SHA1 Message Date
gyq af54cb73ad 优化数据统计 2024-10-25 09:37:29 +08:00
gyq 647912fa1f Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dev 2024-10-24 17:29:08 +08:00
gyq 01003c84ab 优化 2024-10-24 17:28:30 +08:00
gyq e1fb69f424 优化 2024-10-24 16:30:27 +08:00
gyq 163757f27b Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dev 2024-10-24 16:08:10 +08:00
gyq f585e2f020 1.优化首页 2.优化绑定耗材 2024-10-24 15:38:55 +08:00
YeMingfei666 c473f30a37 修改代客下单商品是否能够下单的逻辑 2024-10-24 14:52:52 +08:00
YeMingfei666 57ef84aae1 代客下单增加无台桌获取masterId 2024-10-24 11:40:52 +08:00
gyq 2261b0520a Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-24 11:10:46 +08:00
gyq abac233027 1.店铺设置 - 店铺信息 - 桌位费开启免餐位费不可修改输入框
2.店铺设置 - 店铺信息logo、门店、二维码、小程序码图片添加下载按钮
3.新增pad点单设置
2024-10-24 11:10:33 +08:00
魏啾 b2e27c0035 Merge branch 'wwz' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-23 17:13:48 +08:00
YeMingfei666 3fb8a7b748 代码合并 2024-10-23 16:38:46 +08:00
YeMingfei666 76e5b89fb7 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev 2024-10-23 16:33:20 +08:00
YeMingfei666 5ea24d76c8 修复:
1.代客下单先付费下直接点扫码支付获取支付链接失败
2.修复清空购物车删除因为报错导致购物车清空事变
2024-10-23 16:32:04 +08:00
魏啾 e5aec2e236 霸王餐 2024-10-23 16:00:56 +08:00
duan 09716e7492 修改打印机跳转 2024-10-23 14:51:26 +08:00
魏啾 8a7a97c9ca 退出 2024-10-23 14:24:19 +08:00
魏啾 54d4f468c1 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-10-23 14:23:08 +08:00
魏啾 ea8df2a3b3 全屏 2024-10-23 14:22:04 +08:00
YeMingfei666 ab1f5bd199 增加订单退款退菜 2024-10-23 13:53:11 +08:00
duan 12e66e8866 Merge branch 'dwb' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-22 14:28:36 +08:00
duan 9c2ce903b2 叫号语音播放 2024-10-22 14:27:35 +08:00
YeMingfei666 36d667326e 增加退款退菜功能 2024-10-22 13:28:09 +08:00
YeMingfei666 9593d8f906 修复退菜数量不对问题 2024-10-22 08:58:27 +08:00
duan bc3929a32e Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-21 17:17:42 +08:00
duan 998874db87 保存商户信息 2024-10-21 17:17:39 +08:00
YeMingfei666 f15c2c0135 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-21 11:06:05 +08:00
YeMingfei666 727d79a253 修复代客下单权限校验后无反应
增加桌台结账权限校验
2024-10-21 11:05:46 +08:00
YeMingfei666 f93b07e798 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-21 10:58:56 +08:00
YeMingfei666 ec7db7612b 增加代客下单权限校验 2024-10-21 10:58:33 +08:00
GaoHao ae82be372d Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-21 10:40:41 +08:00
GaoHao c017e9d318 用户权限调整 2024-10-21 10:39:42 +08:00
YeMingfei666 c86a85473b Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-10-21 09:34:21 +08:00
YeMingfei666 9fbacf0398 更新页面样式,增加退菜数量选择以及退款原因 2024-10-18 16:55:43 +08:00
duan f442efd357 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-18 15:53:23 +08:00
duan 0fd7264309 打印机修改 2024-10-18 15:53:21 +08:00
魏啾 8cc30448ca Merge branch 'wwz' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-18 15:15:56 +08:00
魏啾 0c7637f507 耗材修改 2024-10-18 15:15:32 +08:00
duan 460bbc6e18 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-18 13:44:13 +08:00
duan 401e9fc8d3 打印机默认值 2024-10-18 13:44:11 +08:00
魏啾 d21d4f490d Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-18 11:19:41 +08:00
魏啾 49b1eae1fa 库存盘点 2024-10-18 11:19:35 +08:00
gyq dfcc643e8f 修复UI提出的问题 2024-10-18 10:26:46 +08:00
gyq 9b144138e9 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-18 09:10:35 +08:00
gyq b52ed29d11 优化面包屑首页跳转 2024-10-18 09:10:26 +08:00
GaoHao a9aad48ef3 Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-17 14:18:59 +08:00
GaoHao 511d266f72 数据统计销售金额,充值金额隐藏 2024-10-17 14:17:52 +08:00
duan 527714c16f Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-17 14:03:51 +08:00
duan 453955ca76 排队样式修改 2024-10-17 14:03:49 +08:00
YeMingfei666 d40a7b1856 修改默认布局 2024-10-17 13:55:01 +08:00