 zjf
|
153e40bb37
|
Merge remote-tracking branch 'origin/master'
|
2025-09-03 19:22:15 +08:00 |
|
|
zjf
|
2d9d60cd0a
|
共富商城
|
2025-09-03 19:21:55 +08:00 |
|
 dzc
|
d94dcdcac6
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud
|
2025-09-03 10:03:21 +08:00 |
|
|
dzc
|
4a8b77319c
|
feat:硬件扫一扫支付
|
2025-09-03 10:03:17 +08:00 |
|
|
zjf
|
96184b023f
|
Merge remote-tracking branch 'origin/master'
|
2025-09-02 18:31:33 +08:00 |
|
|
zjf
|
855b187ee5
|
共富
|
2025-09-02 18:31:15 +08:00 |
|
|
dzc
|
31ccf613a4
|
feat:扫一扫的退款(没有购物车的退款)
|
2025-09-01 15:25:35 +08:00 |
|
|
dzc
|
25013139ab
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud
|
2025-09-01 10:22:39 +08:00 |
|
|
dzc
|
e2d7044f4e
|
feat:钱包明细
|
2025-09-01 10:22:35 +08:00 |
|
|
zjf
|
3acd23bc7f
|
Merge remote-tracking branch 'origin/master'
|
2025-08-29 17:30:11 +08:00 |
|
|
zjf
|
2837db2d6b
|
在线商城增加商品性质
|
2025-08-29 17:29:54 +08:00 |
|
|
dzc
|
2487ca2431
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud
|
2025-08-28 19:33:07 +08:00 |
|
 weiwei
|
206dbedfd1
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud
|
2025-08-28 19:32:43 +08:00 |
|
|
weiwei
|
6a573364db
|
1
|
2025-08-28 19:32:11 +08:00 |
|
|
dzc
|
925f25e9a6
|
feat:导出失败的问题
|
2025-08-28 19:31:14 +08:00 |
|
|
dzc
|
b765e84642
|
feat:商户权限
|
2025-08-28 19:21:58 +08:00 |
|
|
dzc
|
105679446a
|
feat:退款完成
|
2025-08-28 12:41:55 +08:00 |
|
|
dzc
|
af8e6df1c0
|
feat:退款完成待测试
|
2025-08-27 20:34:11 +08:00 |
|
|
dzc
|
ca11691c03
|
feat:购物车商品级退款
|
2025-08-27 20:15:28 +08:00 |
|
|
dzc
|
8648d8d8a3
|
Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud
|
2025-08-27 15:58:33 +08:00 |
|
|
dzc
|
fd65cf1bf3
|
feat:管理员订单记录分页报错
|
2025-08-27 15:58:28 +08:00 |
|
|
zjf
|
8b4af2d868
|
Merge remote-tracking branch 'origin/master'
|
2025-08-27 15:44:42 +08:00 |
|
|
zjf
|
24880bf95c
|
整理
|
2025-08-27 15:44:26 +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 |
|