254 Commits

Author SHA1 Message Date
liu
f04f5b96ff Merge remote-tracking branch 'origin/dev' into dev 2024-03-14 09:27:37 +08:00
liu
ade720215d 更新缺失代码 2024-03-14 09:26:25 +08:00
188957a2a0 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-14 09:16:25 +08:00
d92c4d3804 修改商品列表 2024-03-14 09:16:10 +08:00
mkm
dcaa346295 更新pc 2024-03-13 18:01:24 +08:00
c9b46e3a81 调整商品列表搜索 2024-03-13 17:53:34 +08:00
649f6fbb8e 修改商户列表 2024-03-13 17:15:45 +08:00
56e0af48df 调整商品列表 2024-03-13 17:06:26 +08:00
2950b863a9 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-13 16:30:39 +08:00
6f6e11e296 区分批发和零售订单、购物车数据 2024-03-13 16:30:35 +08:00
liu
9d222a8c87 处理精度溢出 2024-03-13 16:24:31 +08:00
liu
337f3f4bf8 处理传如时间的时间判断 2024-03-13 15:55:31 +08:00
liu
ded87e722b 修改返回数据格式 2024-03-13 15:45:37 +08:00
liu
fa26726a19 Merge remote-tracking branch 'origin/dev' into dev 2024-03-13 15:23:22 +08:00
liu
11628d38d3 修改返回数据格式 2024-03-13 15:23:08 +08:00
881759cc18 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-13 15:03:32 +08:00
4e7d5a76fa 修改用户信息返回 2024-03-13 15:03:28 +08:00
liu
c5dfa55a94 修改路由 2024-03-13 14:38:44 +08:00
liu
5ad0f36535 Merge remote-tracking branch 'origin/dev' into dev 2024-03-13 14:25:03 +08:00
liu
0fb79059ba 设置默认时间限制 2024-03-13 14:24:48 +08:00
e75e8f32b3 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-13 14:06:27 +08:00
7ff348b3db 修改商品价格展示 2024-03-13 14:05:17 +08:00
liu
aef647d6df 商户收支查询明细 2024-03-13 13:58:09 +08:00
liu
27c86f1a8d Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-13 13:52:14 +08:00
c97602e318 添加商品批发价格,调整用户账号合并 2024-03-13 11:43:54 +08:00
liu
507cba099c Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-13 09:23:06 +08:00
liu
f5681d5b74 修改后台审核商户入驻报错 2024-03-12 18:21:06 +08:00
2f93d4bb47 修改订单列表查询 2024-03-12 17:35:06 +08:00
a234de8da6 处理订单支付的错误 2024-03-12 17:10:22 +08:00
376c8128bd 添加协议接口 2024-03-12 16:27:50 +08:00
7bf56d18e2 修改用户详情查询 2024-03-12 16:05:20 +08:00
8df7adef7d 添加路由 2024-03-12 15:53:29 +08:00
91d8fb32d4 调整用户注册 2024-03-12 15:44:04 +08:00
303bb16957 同步老商城代码 2024-03-12 15:27:46 +08:00
mkm
d503989cb0 更新2.3.1 2024-03-12 14:46:37 +08:00
mkm
f0ebabb689 更新 2024-03-12 14:29:03 +08:00
922bd131a6 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-03-12 14:17:40 +08:00
5d512231fb 调整登录接口 2024-03-12 14:17:35 +08:00
liu
1e88ee2d44 修改下支付下单后 2024-03-07 18:04:03 +08:00
f0417a46a1 修改订单财务流水写入 2024-03-07 15:46:39 +08:00
c769fbbd37 添加绑定邀请码 2024-03-02 15:57:33 +08:00
829a250047 调整商品列表搜索 2024-02-28 14:19:08 +08:00
10919fb275 添加生成二维码 2024-02-27 15:06:56 +08:00
8c5a87a337 调整商户商品分类列表查询 2024-02-27 14:54:44 +08:00
31c1a05d9b 修改平台端用户详情查询 2024-02-27 13:45:06 +08:00
af431934f2 调整用户收货地址 2024-02-27 11:53:12 +08:00
dd7176a4fd 添加获取行政区域,用户邀请商户记录 2024-02-27 11:42:17 +08:00
0afaadb797 添加大礼包限购 2024-02-27 09:25:18 +08:00
5b8d5e23ca Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev 2024-02-26 16:49:12 +08:00
8625c0aa0c 调整商品列表查询 2024-02-26 16:48:59 +08:00