Commit Graph

464 Commits

Author SHA1 Message Date
duan aa8d1b76e4 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-08-27 10:58:17 +08:00
duan c5ec0da61c 修改充值文字。增减余额 2024-08-27 10:58:09 +08:00
YeMingfei666 483ff5d234 修改台桌裂变编辑状态为仅编辑时出现 2024-08-26 17:56:02 +08:00
YeMingfei666 da29e0b249 台桌列表增加编辑台桌里可修改台桌状态 2024-08-26 17:52:39 +08:00
YeMingfei666 c70a6b2f68 代客人下单增加过滤掉下架的单规格商品 2024-08-26 17:51:59 +08:00
gyq 07a3c8e5f4 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-08-26 17:06:07 +08:00
gyq 9d8e1e1bf2 更新员工优惠折扣 2024-08-26 17:05:58 +08:00
YeMingfei666 770c369ebd Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-08-26 11:15:34 +08:00
YeMingfei666 711bd0ca77 代客下单修复购物车里商品输入框输入数量数据未更新问题 2024-08-26 11:15:23 +08:00
duan 7542134ac7 余额增减修改输入小数点 2024-08-26 10:37:17 +08:00
duan 71b6d1929b Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-08-26 10:14:57 +08:00
duan 30656b3005 Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-08-26 10:14:47 +08:00
duan 2fe66b28a8 修改显示余额 2024-08-26 10:14:36 +08:00
YeMingfei666 5e14f29ecb 代客下单修改是否售尽判断 2024-08-26 09:51:03 +08:00
YeMingfei666 f2c73eca9a 代客下单
1.增加删除挂单判断当前挂单是否为当前订单
2.修复备注问题
2024-08-23 18:14:37 +08:00
YeMingfei666 ec75feddce 代客下单修复
确认挂单后再操作购物车再次存单时挂单列表数据未更新
2024-08-23 16:17:09 +08:00
YeMingfei666 423ad16727 代客下单
1.增加确认此单不删除本地订单
2.修改部分样式
2024-08-23 15:48:10 +08:00
YeMingfei666 963c1c81ba 代客下单修改部分样式 2024-08-23 15:28:08 +08:00
YeMingfei666 ab7c61231b 修改页面布局,增加全屏退出全屏功能 2024-08-23 15:22:19 +08:00
YeMingfei666 4c2d88ed99 修改会员余额支付文字为会员支付 2024-08-23 15:21:51 +08:00
YeMingfei666 d275c5ea3c Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-08-23 14:32:07 +08:00
YeMingfei666 eaaf7f5c60 代客下单挂单增加参数tableID 2024-08-23 14:22:04 +08:00
YeMingfei666 335d604f5f 代客下单增加结账金钱输入键盘 2024-08-23 13:57:53 +08:00
YeMingfei666 34f18e0e07 代客下单增加关台时禁止点餐 2024-08-23 13:57:23 +08:00
gyq d0f567209b Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-08-23 13:56:01 +08:00
gyq f5b364b0f3 添加员工新增优惠类型 2024-08-23 13:55:50 +08:00
duan ccd66bd2be 修改vip颜色 2024-08-23 11:45:54 +08:00
duan 82624d49b5 优化 2024-08-23 10:38:05 +08:00
YeMingfei666 d64555e905 暂时隐藏充值按钮 2024-08-23 10:21:10 +08:00
YeMingfei666 052d06bb75 增加会员余额支付方式 2024-08-23 10:20:52 +08:00
YeMingfei666 b0811452a4 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-08-23 09:57:43 +08:00
duan dfc9667c90 修改活动管理编辑-是否赠送商品开关入参类型 2024-08-22 16:39:16 +08:00
YeMingfei666 5d1961d772 代客下单更新
1.筛选时去除头尾空格来匹配
2024-08-22 16:02:03 +08:00
YeMingfei666 a14a9877c2 代客下单修改
1.默认布局更改为图片文字布局
2.增加选择用户时点击用户或者选择都可选择用户
2024-08-22 14:20:42 +08:00
YeMingfei666 dba71a0f11 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-08-22 09:34:42 +08:00
YeMingfei666 9e4eaf1ebc 代客下单修改文字布局售完展示样式 2024-08-22 09:30:58 +08:00
YeMingfei666 f07b6ec29b 增加不同布局售尽样式 2024-08-21 18:26:30 +08:00
YeMingfei666 3f8a41f694 代客下单增加开台中状态 2024-08-21 15:55:11 +08:00
YeMingfei666 0b3084a3f9 代客下单后付款修复 2024-08-21 15:36:23 +08:00
YeMingfei666 0a36882c8b 代客下单增加先付费后付费选择 2024-08-21 15:23:10 +08:00
YeMingfei666 18c2c68c9f 更新客下单支付订单 2024-08-21 13:44:39 +08:00
YeMingfei666 1bc4cf134c 代客下单增加下单关闭回调,当点餐页面关闭刷新桌台状态 2024-08-21 13:30:09 +08:00
YeMingfei666 8a84a99272 代课下单代码优化,修复部分问题 2024-08-21 10:58:57 +08:00
duan 37f7e51f69 优化和会员问题 2024-08-21 08:58:08 +08:00
YeMingfei666 555d0ebaa0 代课下单修改存单取单以及用户切换时masterid相关逻辑
当是取出的订单状态时使用订单的masterID
2024-08-20 17:46:25 +08:00
duan baa60b0021 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-08-20 16:58:20 +08:00
duan c563f646cc Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-08-20 16:58:07 +08:00
duan 39ec8a57cb Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into test 2024-08-20 16:57:45 +08:00
duan 1fde054290 用户编辑和余额增加减 2024-08-20 16:57:26 +08:00
YeMingfei666 977b2e5cd7 Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-08-20 16:47:42 +08:00