Commit Graph

464 Commits

Author SHA1 Message Date
魏啾 a979d390a3 Merge branch 'wwz' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-09-20 15:03:50 +08:00
魏啾 ce9799b290 耗材 2024-09-20 15:02:26 +08:00
duan 14395401db 排队 2024-09-20 11:26:51 +08:00
YeMingfei666 69d758ab68 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-09-14 13:37:42 +08:00
YeMingfei666 f83fc9da7e 修复台桌列表页面餐位费与代客下单不一致问题 2024-09-14 13:37:24 +08:00
YeMingfei666 56ad19d992 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-09-14 10:15:49 +08:00
YeMingfei666 7dbaf46d52 修改部分样式避免样式冲突 2024-09-14 10:15:35 +08:00
YeMingfei666 f2fdf03511 修改测试环境配置 2024-09-14 10:15:15 +08:00
YeMingfei666 353ead73f5 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-09-14 09:52:57 +08:00
YeMingfei666 76de94ee7c 台桌状态台桌清理中改为待清台 2024-09-13 16:15:55 +08:00
YeMingfei666 0f39d2cde1 台桌列表增加清台弹窗 2024-09-13 15:59:34 +08:00
YeMingfei666 f767d12f4a 代客下单增加台桌切换
当台桌切换时重新获取取餐码,购物车数据,订单数据,就餐人数
2024-09-13 15:05:59 +08:00
魏啾 b92b439028 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-09-13 11:31:43 +08:00
魏啾 5a51ab4ed5 商品列表第二遍 2024-09-13 11:30:11 +08:00
魏啾 31979af1ea Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-09-13 11:09:39 +08:00
魏啾 5e7f7faa1b 商品列表20240913 2024-09-13 11:09:35 +08:00
YeMingfei666 cf36010926 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-09-13 09:31:56 +08:00
YeMingfei666 61156edf85 代客下单增加支付订单时桌位费展示 2024-09-13 09:29:11 +08:00
gyq d61c0cbb22 店铺配置新增功能 2024-09-13 09:17:18 +08:00
YeMingfei666 f5df624f3e 代客下单增加退菜改购物车商品状态 2024-09-12 17:16:16 +08:00
YeMingfei666 3df43ddbaa 代客下单增加餐位费展示 2024-09-12 16:48:33 +08:00
YeMingfei666 c95c630a75 更新桌台列表页面
代客下单修改部分样式,修复创建订单后未刷新订单问题
2024-09-12 14:08:03 +08:00
gyq 24d6a192b1 1.优化后台样式
2.改版并对接新版数据统计页面
2024-09-12 08:53:44 +08:00
YeMingfei666 6795f2ccd3 代客下单增加退单,选择就餐人数,更改桌台, 修改样式
台桌列表增加改为批量增加
2024-09-11 18:14:40 +08:00
YeMingfei666 e59919c6f1 增加选择台桌和选择人数 2024-09-10 17:42:55 +08:00
YeMingfei666 3cc53ec6e1 处理打印机列表页面报错未定义name 2024-09-06 15:57:27 +08:00
YeMingfei666 a81c8b8352 将oss文件上传返回的http链接改为https链接 2024-09-06 13:59:00 +08:00
YeMingfei666 e6d421dfb1 增加上传文件取消提示 2024-09-06 13:37:14 +08:00
YeMingfei666 10ae05ce75 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-09-06 11:08:54 +08:00
YeMingfei666 5f8cecfa90 增加阿里云切片上传,版本管理文件上传切换为阿里云上传,增加上传进度条 2024-09-06 11:08:43 +08:00
gyq 97530fa0cf Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-09-05 16:19:08 +08:00
gyq f30f6332c9 pro增加预发布接口 2024-09-05 16:18:59 +08:00
YeMingfei666 050b13e2eb 版本管理修复重置按钮 2024-09-05 14:17:19 +08:00
YeMingfei666 d7b5a1329e 版本管理修改下载地址样式 2024-09-05 13:48:12 +08:00
YeMingfei666 fe90fd7fc2 版本管理限制上传exe文件 2024-09-05 13:41:52 +08:00
YeMingfei666 b8a08eea4f 修复版本管理编辑保存报错问题 2024-09-05 13:37:57 +08:00
YeMingfei666 ac11e23df5 封装请求增加取消请求方法 2024-09-05 13:37:22 +08:00
YeMingfei666 5c3028a2d2 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-09-05 11:11:38 +08:00
YeMingfei666 d88276f366 修复版本管理编辑报错 2024-09-05 11:06:13 +08:00
YeMingfei666 2a1422d281 代客下单增加扫码支付 2024-09-05 10:56:38 +08:00
gyq 433fa38c55 优化添加员工折扣比例 2024-09-05 09:47:26 +08:00
gyq 89a4ab2c72 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-09-05 09:42:25 +08:00
YeMingfei666 24a044427b 代客下单更新储值卡为扫码支付 2024-09-05 09:32:50 +08:00
YeMingfei666 178a06f2d7 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-09-04 17:22:56 +08:00
YeMingfei666 37c1c9fa2b 增加扫码支付 2024-09-04 17:22:50 +08:00
duan 1cfec880ca 商品编辑和添加隐藏成本和售出 2024-09-03 16:18:25 +08:00
duan 8ae5c20714 修改商品编辑和添加页面的冲突 2024-09-03 16:04:14 +08:00
duan 299a38f3f9 商品编辑和添加表格隐藏原价和成本价 2024-09-03 16:02:58 +08:00
YeMingfei666 4fc08ca05a Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-09-03 09:24:42 +08:00
YeMingfei666 24db020363 修复商品编辑报错问题 2024-09-03 09:24:31 +08:00