 YeMingfei666
|
f53f9b0f07
|
修改余额支付为会员支付
|
2024-08-30 17:34:38 +08:00 |
duan
|
38f8bd1ea9
|
隐藏余额列表
|
2024-08-30 17:07:41 +08:00 |
|
YeMingfei666
|
4748ea46e3
|
代客下单修复已下单菜品选中时再添加商品，未取消已下单菜品选中
|
2024-08-30 17:07:04 +08:00 |
|
YeMingfei666
|
16b49e08d2
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf
|
2024-08-30 17:00:51 +08:00 |
|
YeMingfei666
|
d889b9b1ad
|
代客下单增加历史订单，代码优化
|
2024-08-30 17:00:29 +08:00 |
|
YeMingfei666
|
eb7522c222
|
修改台桌状态，开台中时按钮展示加菜和结账
|
2024-08-30 16:59:12 +08:00 |
|
YeMingfei666
|
d5dd4d0915
|
代客下单备份
|
2024-08-30 16:37:38 +08:00 |
|
YeMingfei666
|
773af51758
|
修改判断商品是否可以下单
|
2024-08-30 16:37:19 +08:00 |
|
YeMingfei666
|
016bc3fc0c
|
商品库存修改库存关闭时的样式
|
2024-08-30 16:36:42 +08:00 |
|
duan
|
aee738ca00
|
优化上线问题，安全设置等
|
2024-08-30 16:28:05 +08:00 |
|
duan
|
ae6dcc295a
|
修改入参两端的空格
|
2024-08-30 09:16:32 +08:00 |
|
YeMingfei666
|
06e4292de8
|
代课下单修改折扣传参位数
|
2024-08-29 18:22:29 +08:00 |
|
YeMingfei666
|
36b307fbbe
|
代客下单增加折扣
|
2024-08-29 18:10:01 +08:00 |
|
YeMingfei666
|
891ab22903
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf
|
2024-08-29 13:53:41 +08:00 |
|
YeMingfei666
|
5292956f59
|
代客下单增加扫码支付退款弹窗
|
2024-08-29 13:53:27 +08:00 |
|
YeMingfei666
|
5b95ce2d56
|
修改会员支付为余额支付
|
2024-08-29 13:38:42 +08:00 |
|
YeMingfei666
|
d9c9e6ac9c
|
台桌列表和添加台桌
剔除旧的开台中状态
|
2024-08-29 09:29:26 +08:00 |
|
YeMingfei666
|
c887f48035
|
台桌管理-台桌列表修复
修复状态不存在时页面报错导致白屏
|
2024-08-29 09:24:27 +08:00 |
|
YeMingfei666
|
9aaeb7f0d6
|
管理后台系统管理-版本管理修改更新选中当前版本接口
|
2024-08-29 09:10:56 +08:00 |
|
YeMingfei666
|
7d3251f1d6
|
增加管理员版本管理页面
|
2024-08-28 18:30:33 +08:00 |
|
YeMingfei666
|
18b6509b26
|
过滤null商品
|
2024-08-28 18:30:02 +08:00 |
|
duan
|
dfdfac7ca7
|
充值消费字段更改
|
2024-08-27 17:42:25 +08:00 |
|
duan
|
a9ba6579fc
|
Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-08-27 16:38:21 +08:00 |
|
duan
|
7876ed1c11
|
任务id1000083 完成率80%
|
2024-08-27 16:38:11 +08:00 |
|
YeMingfei666
|
83d0c54717
|
修改商品绑定耗材选
择商品和耗材的弹窗设置最大高度
|
2024-08-27 16:22:56 +08:00 |
|
YeMingfei666
|
1516b84c42
|
修复代课下单商品搜索问题
|
2024-08-27 15:56:27 +08:00 |
|
duan
|
a0cad20d31
|
合并代码
|
2024-08-27 15:43:02 +08:00 |
|
YeMingfei666
|
f5b36c5f0e
|
耗材列表所属商品样式修复
|
2024-08-27 15:36:59 +08:00 |
|
YeMingfei666
|
1d1dabf492
|
修复耗材列表所属商品不换行问题
|
2024-08-27 15:22:03 +08:00 |
|
YeMingfei666
|
445a2caab8
|
进销存绑定商品增加
选择商品弹窗关闭重置表格的选中
|
2024-08-27 13:57:06 +08:00 |
|
YeMingfei666
|
f05c49232a
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf
|
2024-08-27 11:13:45 +08:00 |
|
YeMingfei666
|
98aee65db7
|
修改商品绑定耗材提交的id字段
|
2024-08-27 11:13:07 +08:00 |
|
YeMingfei666
|
f66d4655d1
|
修改商品绑定耗材提交的id字段
|
2024-08-27 11:10:51 +08:00 |
|
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
|
c563f646cc
|
Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-08-20 16:58:07 +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 |
|
YeMingfei666
|
5575b4be9d
|
代客下单增加更新规格限制
|
2024-08-20 16:45:13 +08:00 |
GYJ
|
c39792a0f6
|
活动页面增加自定义充值金额开关
|
2024-08-20 10:24:14 +08:00 |
|
YeMingfei666
|
28750b0a2d
|
代课下单增加多规格下架过滤
|
2024-08-20 09:52:22 +08:00 |
|
YeMingfei666
|
bcd5458db3
|
代客下单确认此单将masterid改为改订单的
|
2024-08-19 18:28:57 +08:00 |
|
YeMingfei666
|
0ae2fbe11b
|
代课下单-修改取消挂单
|
2024-08-19 18:03:33 +08:00 |
|
duan
|
c51d5cd064
|
广告功能
|
2024-08-19 17:54:21 +08:00 |
|
YeMingfei666
|
daa8de48b3
|
代课下单增加切换用户时逻辑
1.获取新的取餐码
2.更新用户id
|
2024-08-19 17:37:22 +08:00 |
|
YeMingfei666
|
51e410a4be
|
修改代课下单本地测试环境
|
2024-08-19 17:15:00 +08:00 |
|
YeMingfei666
|
e0be30bd02
|
台桌列表-代课下单禁止修改桌台号
|
2024-08-17 18:02:38 +08:00 |
|
YeMingfei666
|
4977dcb76b
|
增加代客下单功能
|
2024-08-17 17:57:59 +08:00 |
|
duan
|
13df97b949
|
Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-08-17 16:06:06 +08:00 |
|
duan
|
44e15448d9
|
耗材列表盘点
|
2024-08-17 16:05:41 +08:00 |
|
duan
|
21a9548e45
|
添加赠送商品
|
2024-08-16 15:23:14 +08:00 |
|
duan
|
ce546e09b2
|
修改所属商品字段
|
2024-08-16 15:22:29 +08:00 |
|
duan
|
b3a48a68af
|
售卖时间管控
|
2024-08-15 16:04:22 +08:00 |
|
duan
|
611194b587
|
售卖时间管控
|
2024-08-15 15:50:43 +08:00 |
|
duan
|
0bccf5db8a
|
总的统计未携带分类参数
|
2024-08-15 13:47:08 +08:00 |
|
duan
|
3b7dbe50a2
|
将耗材记录加入到耗材列表里
|
2024-08-14 16:02:52 +08:00 |
|
duan
|
1e52030f5e
|
通知中心
|
2024-08-12 15:54:16 +08:00 |