Commit Graph
1302 Commits
Author SHA1 Message Date
weiwei b35b718fa2 Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud 2025-09-08 18:02:09 +08:00
weiwei 9969094ee8 fix:修复共富商城商户图片上传不回显 2025-09-08 18:01:59 +08:00
zjf 766b1f0fc3 Merge remote-tracking branch 'origin/master' 2025-09-08 17:31:40 +08:00
zjf 1239ac9bd3 金额 2025-09-08 17:31:26 +08:00
weiwei d3cf827aaa fix:修复充值时选择发票下拉列表项过少 2025-09-08 17:22:44 +08:00
zjf c046422fb9 上架 2025-09-08 16:20:08 +08:00
zjf 20dc9d7f91 共富商城 2025-09-08 15:52:46 +08:00
zjf cf514a5b1c 共富商城 2025-09-05 19:32:23 +08:00
zjf 22ebd0927d 共富商城 2025-09-04 19:58:06 +08:00
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