Commit Graph

714 Commits

Author SHA1 Message Date
YeMingfei666 2c7042e6e2 修复代客下单扫码支付金额不对 2024-10-12 15:53:29 +08:00
魏啾 f623106dce Merge branch 'wwz' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-12 14:48:26 +08:00
魏啾 327e8ef17c 订单编号点击跳转 2024-10-12 14:47:54 +08:00
YeMingfei666 0e7f5885e0 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-12 13:59:46 +08:00
YeMingfei666 79e27f0098 代客下单修改
先付费模式下只要生成订单就清空购物车
2024-10-12 13:59:16 +08:00
魏啾 fec143eb44 操作类型 2024-10-12 13:46:44 +08:00
魏啾 893ec1bec4 耗材修改 2024-10-12 11:00:50 +08:00
duan 49a458de76 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb 2024-10-12 10:44:06 +08:00
duan 8f7aaf87d5 打印机部分修改优化 2024-10-12 10:43:56 +08:00
gyq 9c561ff725 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-12 10:37:15 +08:00
gyq 5608d7569b 优化商品列表首页统计 2024-10-12 10:37:05 +08:00
魏啾 9d42cda990 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-10-12 10:08:40 +08:00
魏啾 7bad259789 耗材 2024-10-12 10:08:27 +08:00
gyq 7a065c64cc Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-12 09:48:10 +08:00
gyq a21199d217 优化商品列表 2024-10-12 09:47:58 +08:00
YeMingfei666 23782f0f82 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-11 17:22:12 +08:00
YeMingfei666 9785038621 修复代课下单用户扫码支付后未清除定时器 2024-10-11 17:21:44 +08:00
duan 6882f41786 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-11 14:51:49 +08:00
duan c52422d4f6 Merge branch 'dwb' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-11 14:51:46 +08:00
duan 0e030b29c1 打印机部分修改 2024-10-11 14:51:27 +08:00
魏啾 eb11c3a082 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-10-11 10:55:40 +08:00
魏啾 ca496bf0db 按钮置灰 2024-10-11 10:55:28 +08:00
gyq 8d8def8e52 销售统计增加订单号 2024-10-11 09:41:48 +08:00
gyq 43d619f7bd Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-10 16:33:11 +08:00
gyq 5c10f30eae 优化 2024-10-10 16:33:02 +08:00
魏啾 6fb458b824 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-10-10 15:57:43 +08:00
魏啾 fb355a1913 商品分类和添加‘使用微信扫描二维码绑定订阅消息’ 2024-10-10 15:57:23 +08:00
gyq 64b4ebb88a Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-10 11:22:42 +08:00
gyq abd6385f02 优化店铺装修 2024-10-10 11:22:29 +08:00
魏啾 275cf34424 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-10-09 17:42:48 +08:00
魏啾 f6324f0cfe 销量统计 2024-10-09 17:42:13 +08:00
duan 089a92bcac Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-09 16:19:51 +08:00
duan f619a448b3 打印机优化 2024-10-09 16:19:34 +08:00
YeMingfei666 510039789a Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-09 15:05:34 +08:00
YeMingfei666 e8634dc187 代客下单获取masterId增加传参orderId 2024-10-09 15:04:27 +08:00
YeMingfei666 bd97ca779d 代客下单修改
台桌列表跳转到代客下单立即结账时使用当前台桌的masterId
2024-10-09 14:44:12 +08:00
duan d703e77ce7 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-09 14:13:14 +08:00
duan f3554b2b4a 修改打印机状态接口 2024-10-09 14:13:11 +08:00
魏啾 63f8aca317 商品分组修改 2024-10-09 13:58:30 +08:00
gyq 940ceee222 优化商品列表数据展示 2024-10-09 09:33:30 +08:00
gyq 44c2f6c3dd 商品列表新增时间筛选,增加库存预警,优化耗材绑定显示 2024-10-08 16:37:39 +08:00
gyq 976aecb7bf Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-08 15:25:43 +08:00
gyq 477906d4c5 优化商品列表 2024-10-08 15:25:33 +08:00
魏啾 b432b8b3b9 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-10-08 14:42:09 +08:00
魏啾 ab42e8d9f9 商品列表与订单列表的详情 2024-10-08 14:41:58 +08:00
duan df3546c378 员工权限颜色 2024-10-08 13:57:35 +08:00
gyq 544038bb36 优化首页销售趋势数据变化 2024-10-08 13:34:59 +08:00
YeMingfei666 89d5974fd2 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-08 10:56:44 +08:00
YeMingfei666 4056eae94f 代客下单增加根据店铺配置的就餐类型来判断该就餐类型是否可用 2024-10-08 09:53:00 +08:00
YeMingfei666 e6e0ecced6 代客下单增加用户扫描二维码支付 2024-09-29 10:01:05 +08:00