264 Commits

Author SHA1 Message Date
f0291f4f45 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-16 11:19:47 +08:00
859dbe5970 修改大礼包限购 2024-03-16 11:19:42 +08:00
liu
3915cb2674 Merge remote-tracking branch 'origin/dev' into dev 2024-03-16 11:10:43 +08:00
liu
0cc0ee8ea8 上传对公迁移 2024-03-16 11:10:05 +08:00
mkm
0f877ff6b6 扫码调试 2024-03-16 11:09:23 +08:00
a6775a5eb3 取消店铺简介必填 2024-03-16 10:58:41 +08:00
b1484bb090 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-16 10:29:57 +08:00
3feb3e71db 调整订单核销码生成 2024-03-16 10:29:53 +08:00
liu
33b276c73d 支付add对公转账 2024-03-16 10:11:08 +08:00
mkm
07ebaa4576 更新pc 2024-03-16 09:48:47 +08:00
3b4ffa9eeb 添加定时发放商户补贴券 2024-03-15 18:00:50 +08:00
b2ea8b4a5e 修改订单金额匹配商品 2024-03-15 17:47:03 +08:00
eefde6451a Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-15 17:20:56 +08:00
3cb61a8dd4 修改订单统计查询 2024-03-15 17:20:51 +08:00
liu
defd8b9e51 充值记录 2024-03-15 17:06:01 +08:00
liu
518a047343 Merge remote-tracking branch 'origin/dev' into dev 2024-03-15 17:02:02 +08:00
liu
4c224f31be 押金缴纳代码迁移 2024-03-15 17:01:48 +08:00
98fe150502 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-15 16:59:16 +08:00
8f698e0bcd 修改订单列表查询 2024-03-15 16:59:12 +08:00
liu
3ee31f866a 商家提货付款二维码 2024-03-15 16:55:01 +08:00
liu
a6a7086df0 修改判断 2024-03-15 16:45:11 +08:00
liu
4a13a9e8b8 Merge remote-tracking branch 'origin/dev' into dev 2024-03-15 16:35:03 +08:00
liu
d4ac791275 新增提现密码 2024-03-15 16:34:49 +08:00
c5dc381a83 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-15 16:31:18 +08:00
f6d1a1046e 调整商品列表 2024-03-15 16:31:14 +08:00
liu
55f98ab3b9 Merge remote-tracking branch 'origin/dev' into dev 2024-03-15 15:34:21 +08:00
liu
180b4dd9a4 数量不对修复 2024-03-15 15:34:07 +08:00
e039e3b931 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-15 15:28:04 +08:00
34277ebd8d 修改订单统计查询 2024-03-15 15:27:52 +08:00
liu
bcef85522c Merge remote-tracking branch 'origin/dev' into dev 2024-03-15 15:27:14 +08:00
liu
45cfecee8f 线上调试 2024-03-15 15:26:59 +08:00
5b08a9618b Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-15 15:19:34 +08:00
3638a971f4 商品列表添加标签 2024-03-15 15:19:27 +08:00
liu
865762e767 商户 批发商户或批发零售商户提交申请 2024-03-15 15:10:36 +08:00
liu
10f2dbc871 商户 批发商户或批发零售商户列表 2024-03-15 14:37:32 +08:00
liu
f2a93affe3 Merge remote-tracking branch 'origin/dev' into dev 2024-03-15 14:03:55 +08:00
liu
0c664395bc 后台审核商户更新身份 2024-03-15 14:03:15 +08:00
fab06892d4 购物车添加查询字段 2024-03-15 13:39:15 +08:00
5198b95428 修改购物车查询 2024-03-15 11:52:27 +08:00
b1aea23f76 调整退款订单 2024-03-15 11:22:58 +08:00
92d4f7263a Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-15 11:15:37 +08:00
6bcdc0f09d 修改用户邀请记录 2024-03-15 11:15:27 +08:00
liu
4057040ce6 修改商户限制 2024-03-15 10:56:13 +08:00
liu
9bd328fee8 Merge remote-tracking branch 'origin/dev' into dev 2024-03-15 10:51:01 +08:00
liu
febf033cd8 商户信息获取 2024-03-15 10:50:43 +08:00
b72714fbd0 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-15 10:50:11 +08:00
3636e67937 迁移老商城代码 2024-03-15 10:50:06 +08:00
liu
4480f95d65 商户信息填写提交 2024-03-15 10:43:57 +08:00
liu
fce64220b9 输入金额和商家id获取商品列表 2024-03-15 09:54:21 +08:00
liuchaofu
46b4ae139d limit 2024-03-14 20:10:57 +08:00