Commit Graph

233 Commits

Author SHA1 Message Date
YeMingfei666 d310638697 fix: 优化美团核销时,未绑定店铺增加弹窗是否去绑定 2025-03-15 13:51:21 +08:00
YeMingfei666 410dbb5fcf fix: 修改数量弹窗第一次显示数量为0 2025-03-15 13:41:18 +08:00
YeMingfei666 7cd9db724c fix: 修改用户列表昵称太长时超出省略 2025-03-15 13:28:31 +08:00
YeMingfei666 cf81e2fd72 fix: 修复耗材添加失败,修复用户列表展示头像问题 2025-03-15 11:49:45 +08:00
YeMingfei666 4adb1bf713 fix: 修复会员编辑时生日数据格式问题 2025-03-15 11:37:27 +08:00
YeMingfei666 45f516eace fix: 修复代客下单购物车删除时收到消息未删除问题 2025-03-15 11:34:06 +08:00
YeMingfei666 72fddad3eb feat: 增加数量编辑弹窗,修复数量输入键盘问题增加限制最多两位小数,增加socket重连次数上限弹窗 2025-03-15 10:27:21 +08:00
YeMingfei666 7b7dcefd5f fix: 代客下单称重商品增加起售数量判断 2025-03-14 18:30:41 +08:00
YeMingfei666 3c182c8e2f fix: 修复订单详情退款按钮显示判断 2025-03-14 17:17:21 +08:00
YeMingfei666 088826881b fix: 修复代客下单左边购物车点击立即支付显示订单生成问题 2025-03-14 17:11:07 +08:00
YeMingfei666 05ce745e58 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf 2025-03-14 17:01:55 +08:00
YeMingfei666 a6cc1656f8 feat: 订单详情增加直接退款 2025-03-14 17:01:45 +08:00
duan 5fe06e834b feat: 商品统计 2025-03-14 16:00:04 +08:00
YeMingfei666 9cdd9434cf fix: 修复剩余挂账余额字段问题 2025-03-14 14:54:09 +08:00
YeMingfei666 c02c9797ea fix: 修复订阅通知全部取消后数据返回为null导致无法勾选 2025-03-14 14:38:39 +08:00
YeMingfei666 389d5542ff fix: 修复运行时订阅通知类型列表警告 2025-03-14 14:25:14 +08:00
YeMingfei666 57ea2842c1 fix: 去除银行卡支付和刷卡支付方式,通知中心增加订阅消息编辑,修复店铺信息页面运行时为数字类型接受字符串数字警告 2025-03-14 14:14:05 +08:00
YeMingfei666 70c35b4a1f fix: 修改部分组件名称,避免打包时出现文件同名警告 2025-03-14 11:22:08 +08:00
YeMingfei666 b54985f150 fix: 修改支付方式是否生效文字改为是否显示,优化支付方式快捷修改和弹窗提醒 2025-03-14 11:07:00 +08:00
YeMingfei666 c371df05ce fix: 代客下单优化购物车以及优惠价格展示,修复后付费去结账未生成订单问题 2025-03-14 10:47:19 +08:00
YeMingfei666 814ca603d7 fix: socket连接代码优化,耗材增加具体统计弹窗 2025-03-14 10:25:49 +08:00
YeMingfei666 7e9a9d1767 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf 2025-03-13 18:31:49 +08:00
YeMingfei666 a3f8c8c012 fix: 代客下单增加转台功能,修复临时菜价格展示问题,增加就餐类型切换为打包时,加菜默认为打包 2025-03-13 18:31:36 +08:00
duan 0c1b74a06e feat: 修改耗材筛选问题 2025-03-13 16:31:25 +08:00
duan d8b20f1963 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into dwb 2025-03-13 15:33:01 +08:00
YeMingfei666 dc5dc45893 fix: 耗材列表增加统计 2025-03-13 10:19:57 +08:00
YeMingfei666 9295b58587 fix: 挂账管理列表页面增加还款按钮限制 2025-03-13 09:35:23 +08:00
YeMingfei666 dd1e3a61c7 fix: 代客下单只要是后付费无台桌也可加菜 2025-03-12 17:48:36 +08:00
duan 47def973b4 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into dwb 2025-03-12 17:25:23 +08:00
YeMingfei666 0e4050c3e5 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web 2025-03-12 17:23:17 +08:00
YeMingfei666 d396309cfe fix: css代码优化去除警告 2025-03-12 17:22:57 +08:00
duan aeb4268a56 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into dwb 2025-03-12 17:22:02 +08:00
duan 4b8f1e30a4 feat: 添加会员二维码 2025-03-12 17:21:36 +08:00
YeMingfei666 d0e4cabd07 fix: 商品列表去除不用代码,增加额外传参,退出登录清除用户信息,数据统计增加新增会员数字段 2025-03-12 17:14:38 +08:00
YeMingfei666 7d0f2a6042 fix: 修改数据统计页面,修改日志展示剔除url展示,台桌列表页面增加下载店铺码 2025-03-12 16:40:48 +08:00
YeMingfei666 6ba5c1b536 fix: 代客下单购物车栏目微信支付宝,现金快捷支付功能修复 2025-03-12 15:22:51 +08:00
duan df4ffc30d4 Merge branch 'dwb' of https://e.coding.net/g-cphe0354/cashier/cashier-web 2025-03-12 15:21:01 +08:00
duan b5088c1497 feat: 修改添加分组选择商品默认勾选 2025-03-12 15:20:22 +08:00
YeMingfei666 39bc49029a fix: 数据统计,销售统计,桌台统计更新,404页面跳转更新,三方配置更新 2025-03-12 15:05:43 +08:00
YeMingfei666 c7084f4c34 fix: 订单管理页面增加退菜功能,修复代客下单清空后无法正常添加商品 2025-03-12 10:44:10 +08:00
YeMingfei666 ace23e89ee fix: 更新路由为后台配置,修改admim文件名称为admin 2025-03-12 09:05:28 +08:00
YeMingfei666 6735d8dedb Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web 2025-03-11 18:09:08 +08:00
YeMingfei666 f60a985c2a fix: 代客下单更新,角色管理更新 2025-03-11 18:08:48 +08:00
duan db12b59981 Merge branch 'dwb' of https://e.coding.net/g-cphe0354/cashier/cashier-web 2025-03-11 16:42:50 +08:00
duan ce27f3920d feat: 活动bug修改 2025-03-11 16:42:27 +08:00
YeMingfei666 37d6d62785 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf 2025-03-11 16:17:01 +08:00
YeMingfei666 14af62538f fix: 挂账管理更新,耗材盘点更新,代客下单更新 2025-03-11 16:13:22 +08:00
duan 061f4372b6 feat: 修改商品列表的筛选 2025-03-11 15:37:14 +08:00
YeMingfei666 0fa409ecc5 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf 2025-03-11 11:36:34 +08:00
YeMingfei666 6264708ee5 feat: 分享设置接口接入 2025-03-11 11:36:17 +08:00
YeMingfei666 4e956987d5 fix: 代客下单可选套餐确定无法点击,优惠价格计算 2025-03-11 11:30:02 +08:00
duan e70154f9bd feat: 修改编辑商品后的跳转 2025-03-11 11:22:07 +08:00
duan e7517d3b4c Merge branch 'dwb' of https://e.coding.net/g-cphe0354/cashier/cashier-web 2025-03-11 10:43:02 +08:00
duan deec807c98 feat: 修改商品分类排序功能 2025-03-11 10:42:37 +08:00
YeMingfei666 8bec7f1f6c Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf 2025-03-10 18:34:00 +08:00
YeMingfei666 89fe9b7639 fix: 挂账管理更新,邀请列表更新,店铺配置更新 2025-03-10 18:33:42 +08:00
Tankaikai d710241ff0 配合后端修正baseURL 2025-03-10 16:49:16 +08:00
duan f13f042ea0 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into dwb 2025-03-10 16:49:07 +08:00
duan a7e775f5e7 feat: 修改商品上架字段 2025-03-10 16:36:11 +08:00
Tankaikai 9ff72bc8d5 配合后端修正baseURL 2025-03-10 14:28:12 +08:00
YeMingfei666 34068cf8dd fix: 修改交班部分文件名称,修改部分深度作用样式 2025-03-10 14:11:34 +08:00
duan 62862afc25 feat: 修改活动添加 2025-03-10 13:53:09 +08:00
YeMingfei666 8026fcb98c Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf 2025-03-10 13:30:45 +08:00
YeMingfei666 f936328a66 feat: 增加数据统计,销量统计,桌台统计 2025-03-10 13:30:34 +08:00
duan fd824ab7d7 feat: 活动管理 2025-03-08 18:27:28 +08:00
YeMingfei666 cec6ea62df feat: 增加美团抖音扫码核销 2025-03-07 19:29:10 +08:00
YeMingfei666 63a4ed9e73 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web 2025-03-07 18:56:18 +08:00
YeMingfei666 739f4a1062 fix: 重写耗材模块 2025-03-07 18:53:31 +08:00
duan 0bd38e29c5 feat: 解决上架问题 2025-03-07 18:30:30 +08:00
YeMingfei666 73057865da feat: 订单列表页面详情弹窗关闭时刷新列表 2025-03-07 11:07:00 +08:00
YeMingfei666 8e52613f08 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web 2025-03-07 10:40:56 +08:00
YeMingfei666 d7ab9c3627 feat: 代客下单修改退款退菜 2025-03-07 10:40:25 +08:00
YeMingfei666 ef358f33bb fix: 订单管理退款修改,台桌跳转代客下单页面 2025-03-06 19:32:13 +08:00
duan 723dee6adb feat: 隐藏存酒搜索 2025-03-06 18:30:51 +08:00
YeMingfei666 d6eb27186f fix: 店铺装修刷新后tab被重置问题 2025-03-06 11:35:59 +08:00
YeMingfei666 2972e4b610 fix: 店铺装修更新后切换tab分类数据还是旧数据 2025-03-06 11:31:11 +08:00
YeMingfei666 6a2b6ba9e0 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf 2025-03-06 11:27:31 +08:00
YeMingfei666 dda4db24e0 feat: 代客下单优惠券更新,挂账更新 2025-03-06 11:27:01 +08:00
duan 26ca040010 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into dwb 2025-03-06 10:10:41 +08:00
duan a8a8a58cad feat: 商品上架优化 2025-03-06 10:09:55 +08:00
YeMingfei666 ed9a3335c8 feat: 代客下单修改,订单列表详情退款修改 2025-03-05 13:39:06 +08:00
YeMingfei666 a7b7c1cd7e Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web 2025-03-04 18:05:49 +08:00
YeMingfei666 833676f545 feat: 代客下单更新 2025-03-04 18:05:21 +08:00
duan 8838df65fb feat: 存酒模块 2025-03-04 17:30:42 +08:00
YeMingfei666 cff5363260 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web 2025-03-04 10:35:42 +08:00
YeMingfei666 bd59f05d26 feat: 代客下单更新,修复店铺列表编辑展示问题 2025-03-04 10:34:19 +08:00
duan 9e256c664f feat: 修改单位字段 2025-03-03 17:12:22 +08:00
duan 250317f1ca feat: 修改按钮颜色,商品添加输入售价其他为0则回填 2025-03-03 15:09:26 +08:00
duan 6bf6ee4749 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into dwb 2025-03-01 14:31:35 +08:00
duan 3f02f0e6c8 feat: 商品列表-单规格删除skulist 2025-03-01 13:43:01 +08:00
YeMingfei666 b71ca19c0d fix: 代码合并 2025-03-01 11:38:36 +08:00
YeMingfei666 1c0887869e fix: 订单管理页面调整增加退款功能,代客下单调整 2025-03-01 11:36:47 +08:00
duan 467bfaa2eb feat: 广告模块,交班记录80%,等用户完成 2025-03-01 11:12:29 +08:00
duan ad52c6bbf9 feat: 修改多次绑定on事件 2025-02-28 18:14:29 +08:00
duan 03062abfe7 feat: 积分模块完成 2025-02-28 18:01:53 +08:00
duan f611d507bc feat: 修改单规格添加时候的skuid取值 2025-02-28 15:29:17 +08:00
duan d4b5164f79 feat: 耗材分组 2025-02-27 18:07:41 +08:00
duan b140b6c662 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into dwb 2025-02-27 16:30:32 +08:00
duan 6cd651d545 feat: 结款记录 2025-02-27 16:30:20 +08:00
YeMingfei666 bad3c20724 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web 2025-02-27 16:28:46 +08:00