Commit Graph

551 Commits

Author SHA1 Message Date
YeMingfei666 4934f20446 fix: 修改订单计算逻辑 2025-09-19 18:32:44 +08:00
YeMingfei666 f76dff67d4 fix: 修改订单计算逻辑 2025-09-19 18:32:25 +08:00
YeMingfei666 37f1079b1f Merge branch 'gyq' of https://newgitea.sxczgkj.cn/czg_team/cashier-web into ymf 2025-09-17 09:19:42 +08:00
gyq 350a314feb Merge branch 'ymf' of https://newgitea.sxczgkj.cn/czg_team/cashier-web into gyq 2025-09-17 09:19:33 +08:00
YeMingfei666 c11eb1a0a1 Merge branch 'gyq' of https://newgitea.sxczgkj.cn/czg_team/cashier-web into ymf 2025-09-17 09:19:32 +08:00
gyq 20927c459b add: 修复券bug 2025-09-17 09:19:12 +08:00
YeMingfei666 171c81eea6 add: 增加新客立减和计算公式测试 2025-09-17 09:19:12 +08:00
YeMingfei666 a66de31f1b fix: 删除无用文件 2025-09-16 13:57:35 +08:00
YeMingfei666 573d46b50d add: 增加新客立减 2025-09-16 13:57:07 +08:00
YeMingfei666 a62d4af819 docs: 文档更新 2025-09-16 10:01:22 +08:00
YeMingfei666 01b415ecdf docs: 文档更新 2025-09-16 10:00:43 +08:00
YeMingfei666 93475151a1 docs: 文档优化 2025-09-16 09:59:04 +08:00
YeMingfei666 c5dc871d9c docs: 文档更新 2025-09-16 09:55:07 +08:00
YeMingfei666 07146b89c1 add: 用户列表增加优惠券列表 2025-09-16 09:49:26 +08:00
YeMingfei666 82dcba273e docs: 文档优化 2025-09-16 09:47:22 +08:00
YeMingfei666 7942f76dc7 Merge branch 'gyq' of https://newgitea.sxczgkj.cn/czg_team/cashier-web into ymf 2025-09-15 10:06:26 +08:00
YeMingfei666 8714b04565 add: 增加ysk-utils工具包 2025-09-15 10:05:12 +08:00
YeMingfei666 642e0a552e docs: 文档更新增加ysk工具包文档 2025-09-15 10:04:42 +08:00
YeMingfei666 794c0ec25b fix: 修复条件开通回显问题 2025-09-15 10:03:38 +08:00
YeMingfei666 9d3ae6272d add: 更新优惠券相关接口 2025-09-15 10:03:16 +08:00
gyq 23f0e549fa Merge branch 'ymf' of https://newgitea.sxczgkj.cn/czg_team/cashier-web into gyq 2025-09-15 09:21:33 +08:00
gyq 9bdd9188be add: 1.新增各类优惠券
2.新增已领取详情弹窗
3.新增已关联弹窗
2025-09-15 09:19:07 +08:00
YeMingfei666 2dbc4620f2 fix: 会员等级输入框样式调整 2025-09-12 17:42:46 +08:00
YeMingfei666 6cc879f066 fix: 营销中心增加跳转超级会员,超级会员页面选择优惠券调整 2025-09-12 17:09:29 +08:00
YeMingfei666 d950aef4e5 add: 增加超级会员页面,修复未绑定美团的检查登录报错而未成功跳转首页问题 2025-09-12 13:23:27 +08:00
gyq ea4230a9e8 add: 1 2025-09-11 10:08:09 +08:00
gyq 1004defd02 add: 优化 2025-09-10 14:26:23 +08:00
gyq 2710f276e3 Merge branch 'ymf' of https://newgitea.sxczgkj.cn/czg_team/cashier-web into gyq 2025-09-10 14:15:38 +08:00
YeMingfei666 106d0cb1e7 add: 增加超级会员配置页面 2025-09-10 14:15:23 +08:00
YeMingfei666 723902ac09 fix: 修复一级菜单问题 2025-09-10 14:11:41 +08:00
gyq 83eaf368ca add: 优化 2025-09-10 14:11:36 +08:00
YeMingfei666 0499e36a5b fix: 修改路由模式 2025-09-10 14:11:24 +08:00
YeMingfei666 075c39d2b7 Merge branch 'gyq' of https://newgitea.sxczgkj.cn/czg_team/cashier-web into ymf 2025-09-10 13:50:39 +08:00
YeMingfei666 06cd932eda fix: 修复一级菜单问题 2025-09-10 13:49:41 +08:00
gyq 2ddddeed3c add: 新增营销中心新版列表页面 2025-09-10 13:38:16 +08:00
gyq 557ca477d9 Merge branch 'ymf' of https://newgitea.sxczgkj.cn/czg_team/cashier-web into gyq 2025-09-09 18:12:29 +08:00
YeMingfei666 4d5e53f0d3 docs: 修改正式宝塔链接 2025-09-09 15:24:31 +08:00
YeMingfei666 30faee9dac add: 多门店代码合并 2025-09-09 15:08:32 +08:00
gyq 8e84185962 add: tetst 2025-09-09 10:26:23 +08:00
YeMingfei666 316b7fe059 fix: 提交测试 2025-09-09 10:21:46 +08:00
YeMingfei666 f602a7778d fix: 角色管理修改 2025-09-09 10:20:11 +08:00
gyq ceaf5fd2d5 Merge branch 'ymf' of e.coding.net:g-cphe0354/cashier/cashier-web into gyq 2025-07-01 09:59:30 +08:00
YeMingfei666 863bab3eba fix: 菜单管理增加微信小程序图标,修复部分问题 2025-05-30 18:30:18 +08:00
YeMingfei666 352795d52f fix: 删除订单管理添加按钮 2025-05-30 18:29:40 +08:00
gyq 9f2322889c feat(admin): 优化管理端台桌信息 2025-05-28 10:36:08 +08:00
YeMingfei666 2cde04720d fix: 修复商品分组选择商品未回显已选中商品问题以及重置问题 2025-05-06 16:10:39 +08:00
YeMingfei666 73e20ad617 feat: 代码合并 2025-04-22 10:17:05 +08:00
YeMingfei666 21eda68ab0 fix: 代码合并冲突解决 2025-04-22 10:16:48 +08:00
YeMingfei666 f5ff208fd6 fix: 代码合并冲突解决 2025-04-22 10:14:20 +08:00
YeMingfei666 cfc925e55c fix: 代码合并 2025-04-22 10:14:05 +08:00