 dzc
|
fd65cf1bf3
|
feat:管理员订单记录分页报错
|
2025-08-27 15:58:28 +08:00 |
|
|
dzc
|
ac657b4698
|
商品退款,单个退款
|
2025-08-27 10:25:36 +08:00 |
|
|
dzc
|
361de88372
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud
|
2025-08-26 19:40:22 +08:00 |
|
|
dzc
|
d66e3cc2d8
|
feat:车牌申请
|
2025-08-26 19:40:18 +08:00 |
|
 weiwei
|
26a948b075
|
fix:线上点餐字段修改
|
2025-08-26 16:35:32 +08:00 |
|
|
dzc
|
d99ffbdd2f
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud
|
2025-08-26 10:31:58 +08:00 |
|
|
dzc
|
bcdeac390a
|
11
|
2025-08-26 10:31:54 +08:00 |
|
 zjf
|
14f8c93e2c
|
Merge remote-tracking branch 'origin/master'
|
2025-08-25 22:43:17 +08:00 |
|
|
zjf
|
ad89129ed2
|
1
|
2025-08-25 22:42:47 +08:00 |
|
|
weiwei
|
e98c4b5825
|
fix:验证码校验提示文字修改
|
2025-08-25 11:01:22 +08:00 |
|
|
zjf
|
afb18fcd6d
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/views/supermarketerp/supermarketSpu/components/package-unit.vue
|
2025-08-25 10:54:18 +08:00 |
|
|
zjf
|
c96d92b5dd
|
切算法验证码
|
2025-08-25 10:52:55 +08:00 |
|
|
weiwei
|
58e6f48738
|
chore:修改
|
2025-08-22 17:34:32 +08:00 |
|
|
weiwei
|
b1f182a173
|
feat:每日菜品样式
|
2025-08-21 19:02:12 +08:00 |
|
|
weiwei
|
a68829e953
|
|
2025-08-21 18:39:34 +08:00 |
|
|
zjf
|
7b9ab4ecd0
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud
# Conflicts:
# src/views/supermarketerp/supermarketSpu/components/package-unit.vue
|
2025-08-21 17:46:54 +08:00 |
|
|
zjf
|
54273cdc9a
|
1
|
2025-08-21 17:45:53 +08:00 |
|
|
weiwei
|
09ed9cd1a6
|
fix:修改冲突
|
2025-08-21 17:43:28 +08:00 |
|
|
zjf
|
341c6ed83d
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud
# Conflicts:
# src/views/supermarketerp/supermarketSpu/components/package-unit.vue
|
2025-08-21 17:36:14 +08:00 |
|
|
zjf
|
017cba3a05
|
库存商品修改
|
2025-08-21 17:34:18 +08:00 |
|
|
weiwei
|
867cabdee8
|
fix:修复商品未添加口味时id读取错误
|
2025-08-21 17:29:06 +08:00 |
|
|
weiwei
|
6517d33d1c
|
feat:口味字段和校验修改
|
2025-08-20 18:14:35 +08:00 |
|
|
weiwei
|
ff3a47dcab
|
feat:口味不能重复校验
|
2025-08-20 15:36:08 +08:00 |
|
|
weiwei
|
f39279bf8a
|
feat:库存商品不同口味的库存
|
2025-08-20 11:11:34 +08:00 |
|
|
weiwei
|
2a82e97cfe
|
feat:库存商品口味
|
2025-08-19 16:46:03 +08:00 |
|
|
zjf
|
e82a191e37
|
1.other.ts增加application/octet-stream白名单，增加口味模块代码
|
2025-08-19 12:44:37 +08:00 |
|
|
dzc
|
2b8a1f0755
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud
|
2025-08-15 17:28:01 +08:00 |
|
|
dzc
|
6c3af87b7b
|
fix:超市购物卡支付、选择钱包、称重商品小数精度不够的问题
|
2025-08-15 17:27:57 +08:00 |
|
|
weiwei
|
766bdea32a
|
fix:相关漏洞修复
|
2025-08-15 15:55:02 +08:00 |
|
|
weiwei
|
0e66d461a7
|
fix:入库的实际进价根据数量和总金额变动
|
2025-08-15 11:17:06 +08:00 |
|
|
weiwei
|
ed6e3e61e6
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud
|
2025-08-14 17:26:34 +08:00 |
|
|
weiwei
|
52aa57bf6f
|
fix:入库出库表尾合计；导入每日菜品成功刷新分类
|
2025-08-14 17:26:22 +08:00 |
|
|
zjf
|
6225984dd0
|
Merge remote-tracking branch 'origin/master'
|
2025-08-14 12:16:33 +08:00 |
|
|
zjf
|
8775059d5d
|
餐桌
|
2025-08-14 12:05:10 +08:00 |
|
|
dzc
|
6d68dcc8ef
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud
|
2025-08-14 10:31:56 +08:00 |
|
|
dzc
|
dd0d6a21cf
|
feat:用户部门
|
2025-08-14 10:31:52 +08:00 |
|
|
weiwei
|
075b4f41bb
|
feat: 入库商品选择弹窗显示规格
|
2025-08-14 09:59:50 +08:00 |
|
|
weiwei
|
62102ce2f2
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud
|
2025-08-14 09:24:39 +08:00 |
|
|
weiwei
|
26f520ff7c
|
fix: 接口路径修改
|
2025-08-14 09:24:24 +08:00 |
|
|
dzc
|
3026bc8eee
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud
|
2025-08-13 11:46:26 +08:00 |
|
|
dzc
|
3df6a10126
|
feat:订单页面调整
|
2025-08-13 11:46:22 +08:00 |
|
|
weiwei
|
6516b0490b
|
fix: 样式修改
|
2025-08-13 11:30:06 +08:00 |
|
|
weiwei
|
8a99b52922
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud
|
2025-08-12 21:47:06 +08:00 |
|
|
weiwei
|
2f078911c9
|
fix: 优化菜单管理
|
2025-08-12 21:46:42 +08:00 |
|
|
zjf
|
e6460e1fda
|
Merge remote-tracking branch 'origin/master'
|
2025-08-12 20:38:10 +08:00 |
|
|
zjf
|
67d72f9d35
|
综合服务
|
2025-08-12 20:37:54 +08:00 |
|
|
weiwei
|
5c7b2c7081
|
fix: 表格分页勾选
|
2025-08-12 19:01:19 +08:00 |
|
|
weiwei
|
1d5413b5e5
|
feat: 线上菜品分类的餐段类型
|
2025-08-12 17:45:02 +08:00 |
|
|
weiwei
|
01fb67fa1b
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud
|
2025-08-12 16:59:35 +08:00 |
|
|
weiwei
|
fcf7609a66
|
feat: 线上预订菜品支持从每日菜品导入
|
2025-08-12 16:57:55 +08:00 |
|