216 Commits

Author SHA1 Message Date
mkm
fecb1a4a04 修复错误4 2023-04-19 17:48:46 +08:00
mkm
e6b97b4b77 修复错误3 2023-04-19 17:43:53 +08:00
mkm
b45eab1e7a 修复错误3 2023-04-19 17:41:57 +08:00
mkm
f4515aa1e2 修复错误3 2023-04-19 15:47:39 +08:00
mkm
aeac9451c5 修复错误2 2023-04-19 15:31:08 +08:00
mkm
2ffc10a8e5 修复错误 2023-04-18 11:55:50 +08:00
mkm
c676680e9a 修复错误 2023-04-18 10:06:38 +08:00
mkm
614950f36c 购物车模块 2023-04-17 22:03:52 +08:00
mkm
cca85a62b4 修复错误 2023-04-17 16:43:25 +08:00
mkm
c3d2ed3244 修复错误 2023-04-17 11:03:22 +08:00
mkm
c7de7e6339 修复错误 2023-04-15 15:39:39 +08:00
mkm
c73f91c477 修复错误 2023-04-15 15:17:43 +08:00
mkm
f76a39494e 修复错误 2023-04-15 15:02:22 +08:00
mkm
312076fab1 修复错误 2023-04-15 14:55:18 +08:00
mkm
8106385072 修复错误 2023-04-15 14:39:11 +08:00
mkm
c2356da553 设置订单 2023-04-15 14:23:28 +08:00
mkm
5d0c1c3590 修复错误 2023-04-15 10:29:00 +08:00
mkm
b15b790655 修复错误 2023-04-15 10:20:31 +08:00
mkm
9771eb8f2a 修复错误 2023-04-14 17:00:04 +08:00
mkm
4da3d95dc1 修复错误 2023-04-14 16:51:09 +08:00
mkm
9384b1a4d1 提交扫码枪信息 2023-04-14 16:31:07 +08:00
mkm
7f35cdc98f Merge remote-tracking branch 'origin/master' 2023-04-06 10:18:02 +08:00
mkm
7a8510fca2 修改商户信息设置问题 2023-04-06 10:16:46 +08:00
彭桃
3e39e88258 1 2023-03-28 14:17:58 +08:00
e1f8361e59 Merge branch 'develop' 2023-03-24 14:16:37 +08:00
176aef31f0 修改普通用户下单,供应链团队获得收益 2023-03-24 14:15:24 +08:00
ff8afb42f9 Merge branch 'develop' 2023-03-24 11:12:58 +08:00
91527042e4 修复商品详情报错 2023-03-24 11:11:41 +08:00
mkm
5763dea881 修复小程序通知消息错误 2023-03-23 15:42:27 +08:00
mkm
3e6bdcb50f Merge remote-tracking branch 'origin/master' 2023-03-23 14:54:51 +08:00
mkm
c1f7a36939 修复小程序通知消息错误 2023-03-23 14:54:36 +08:00
bda4fd4c09 Merge branch 'develop' 2023-03-23 10:40:35 +08:00
7d2d8e2823 开放字段验证 2023-03-23 10:39:24 +08:00
8e0b2b6ae0 Merge branch 'develop'
# Conflicts:
#	app/listener/CommunityAddress.php
2023-03-23 10:00:42 +08:00
c6b415d1db 更新商户入驻时客服电话自动填入 2023-03-23 09:58:58 +08:00
9529eacd82 Merge branch 'develop' of git.excellentkk.cn:mkm/shop-php into develop 2023-03-22 09:51:33 +08:00
d3438ddf09 修复逛逛内容发布中间表 2023-03-22 09:51:30 +08:00
mkm
ec389163d0 is_wsxx判断 2023-03-21 16:29:13 +08:00
mkm
5667533671 is_wsxx判断 2023-03-21 16:23:18 +08:00
mkm
28f4f9db20 is_wsxx判断 2023-03-21 16:21:01 +08:00
mkm
00c898ba58 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	app/common/repositories/wechat/WechatUserRepository.php
#	app/controller/api/Auth.php
2023-03-20 17:25:08 +08:00
mkm
d79a7fdb91 删除nk_user 2023-03-20 17:17:10 +08:00
彭桃
cdd6148f3f 1 2023-03-20 16:59:20 +08:00
ab6b6f9352 Merge branch 'develop' 2023-03-20 14:57:37 +08:00
c373bc035c 完成供应链全部分佣流程 2023-03-20 14:55:36 +08:00
09e98f1599 Merge branch 'develop' 2023-03-18 17:37:28 +08:00
943fbd65f3 供应链佣金分佣,增加区镇等分佣规则 2023-03-18 17:36:19 +08:00
d9b05ce0ee Merge branch 'develop' 2023-03-18 16:39:12 +08:00
7d79a06517 修复用户数据获取、用户注册等接口 2023-03-18 16:37:54 +08:00
f24fed5ea0 Merge branch 'develop' 2023-03-18 14:09:44 +08:00