Commit Graph

681 Commits

Author SHA1 Message Date
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
2dbc4620f2 fix: 会员等级输入框样式调整 2025-09-12 17:42:46 +08:00
6cc879f066 fix: 营销中心增加跳转超级会员,超级会员页面选择优惠券调整 2025-09-12 17:09:29 +08:00
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
106d0cb1e7 add: 增加超级会员配置页面 2025-09-10 14:15:23 +08:00
723902ac09 fix: 修复一级菜单问题 2025-09-10 14:11:41 +08:00
gyq
83eaf368ca add: 优化 2025-09-10 14:11:36 +08:00
0499e36a5b fix: 修改路由模式 2025-09-10 14:11:24 +08:00
075c39d2b7 Merge branch 'gyq' of https://newgitea.sxczgkj.cn/czg_team/cashier-web into ymf 2025-09-10 13:50:39 +08:00
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
4d5e53f0d3 docs: 修改正式宝塔链接 2025-09-09 15:24:31 +08:00
30faee9dac add: 多门店代码合并 2025-09-09 15:08:32 +08:00
gyq
8e84185962 add: tetst 2025-09-09 10:26:23 +08:00
316b7fe059 fix: 提交测试 2025-09-09 10:21:46 +08:00
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
863bab3eba fix: 菜单管理增加微信小程序图标,修复部分问题 2025-05-30 18:30:18 +08:00
352795d52f fix: 删除订单管理添加按钮 2025-05-30 18:29:40 +08:00
gyq
9f2322889c feat(admin): 优化管理端台桌信息 2025-05-28 10:36:08 +08:00
2cde04720d fix: 修复商品分组选择商品未回显已选中商品问题以及重置问题 2025-05-06 16:10:39 +08:00
73e20ad617 feat: 代码合并 2025-04-22 10:17:05 +08:00
21eda68ab0 fix: 代码合并冲突解决 2025-04-22 10:16:48 +08:00
f5ff208fd6 fix: 代码合并冲突解决 2025-04-22 10:14:20 +08:00
cfc925e55c fix: 代码合并 2025-04-22 10:14:05 +08:00
258704dea2 feat: 商品列表增加库存开关展示 2025-04-22 10:02:47 +08:00
22b98fd697 fix: 修复扫码支付完成回调无响应问题 2025-04-22 09:49:57 +08:00
duan
593f5693ef fix: 合并代码-修改空格 2025-04-21 15:31:04 +08:00
duan
2993c1375f fix: 合并代码 2025-04-21 15:26:19 +08:00
ddf7045346 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test 2025-04-21 11:05:49 +08:00
65c1aef7bf feat: 增加代课下单商品不在可售时间内判断,增加购物车提示库存不足处理,增加购物车编辑增加参数起售数量 2025-04-21 11:04:24 +08:00
duan
a6bca24c1a fix: 修改时间字段 2025-04-18 18:00:00 +08:00
duan
e9a606c71e fix: 商品列表库存修改,没提交成功不修改表格 2025-04-17 13:41:02 +08:00
2602916201 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test 2025-04-16 17:31:49 +08:00
8a9cca4ee2 feat: 代客下单增加商品编辑时商品不足提示 2025-04-16 17:30:13 +08:00
90d90c55b8 feat: 代客下单商品列表增加库存不足图标,重新排序商品不同状态展示 2025-04-16 17:26:31 +08:00
beade81a68 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test 2025-04-16 09:45:29 +08:00
b9e5713fc1 fix: 商品售罄,不可售,下架图标更新 2025-04-16 09:44:25 +08:00
9b6dd9f0da Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test 2025-04-16 09:38:14 +08:00
d93a8eed25 feat: readme增加本地linux连接相关文档 2025-04-16 09:37:36 +08:00
f4b939433d fix: 代码合并冲突解决 2025-04-16 09:28:58 +08:00
0563e07cdb fix: 修改商品售罄判断增加判断条件(商品开启库存切且库存<=0) 2025-04-15 18:56:17 +08:00
duan
0a73635b78 fix: 合并冲突 2025-04-15 16:29:40 +08:00
duan
2b8746abe4 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web 2025-04-15 14:26:45 +08:00
duan
d675341444 fix: 修改商品分组编辑时间的问题 2025-04-15 14:26:35 +08:00