|
|
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 |
|
|
|
5763dea881
|
修复小程序通知消息错误
|
2023-03-23 15:42:27 +08:00 |
|
|
|
3e6bdcb50f
|
Merge remote-tracking branch 'origin/master'
|
2023-03-23 14:54:51 +08:00 |
|
|
|
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 |
|
|
|
ec389163d0
|
is_wsxx判断
|
2023-03-21 16:29:13 +08:00 |
|
|
|
5667533671
|
is_wsxx判断
|
2023-03-21 16:23:18 +08:00 |
|
|
|
28f4f9db20
|
is_wsxx判断
|
2023-03-21 16:21:01 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
12cfc15482
|
修复订单列表，待评价显示数量
|
2023-03-18 14:08:40 +08:00 |
|
|
|
69f8fb1cdd
|
Merge branch 'develop'
|
2023-03-18 09:28:04 +08:00 |
|
|
|
76dada9dbf
|
增加商户入驻商户类型验证
|
2023-03-18 09:26:52 +08:00 |
|
|
|
d50a62ace2
|
Merge branch 'develop'
|
2023-03-17 18:03:24 +08:00 |
|
|
|
c6eebb4c1d
|
修复微信昵称、头像
|
2023-03-17 18:02:22 +08:00 |
|
|
|
e07d6b87f5
|
修复微信头像昵称
|
2023-03-17 17:59:33 +08:00 |
|
|
|
1dcdbcf0fb
|
Merge branch 'develop'
|
2023-03-17 16:51:14 +08:00 |
|
|
|
ef7f2622c1
|
修改订单数量显示
|
2023-03-17 16:49:37 +08:00 |
|
|
|
bd97777b66
|
Merge branch 'develop'
|
2023-03-17 15:51:48 +08:00 |
|
|
|
236b78e60d
|
修改获取小组采购所有订单
|
2023-03-17 15:50:46 +08:00 |
|
|
|
ae3c6ca2f9
|
Merge branch 'develop'
|
2023-03-17 11:43:16 +08:00 |
|
|
|
4276a74af2
|
获取订单核销码兼容
|
2023-03-17 11:42:11 +08:00 |
|
|
|
32228411cb
|
Merge branch 'develop'
|
2023-03-17 11:32:11 +08:00 |
|
|
|
0afc6f5b87
|
优化小组采购商品获取
|
2023-03-17 11:31:05 +08:00 |
|
|
|
27b6775d63
|
Merge branch 'develop'
|
2023-03-17 09:55:34 +08:00 |
|
|
|
47f53e660e
|
修复分佣逻辑
|
2023-03-17 09:54:11 +08:00 |
|
|
|
461e4e8977
|
Merge commit 'da14495e044ba2dd252beb864196f9dbc0105a93'
|
2023-03-17 09:38:01 +08:00 |
|
|
|
9448f5a2b6
|
Merge branch 'develop' of git.excellentkk.cn:mkm/shop-php into develop
|
2023-03-17 09:36:52 +08:00 |
|
|
|
da14495e04
|
修复佣金供应链团队ID
|
2023-03-17 09:35:41 +08:00 |
|
|
|
53b867bffc
|
Merge branch 'develop'
|
2023-03-16 14:43:17 +08:00 |
|
|
|
71669f1ff4
|
更新小组采购分佣队列任务
|
2023-03-16 14:41:22 +08:00 |
|
|
|
f94305c479
|
Merge branch 'develop'
|
2023-03-16 12:04:24 +08:00 |
|
|
|
6f8ab98bf5
|
修复小组采购，购物车内容状态没更新
|
2023-03-16 12:03:10 +08:00 |
|
彭桃
|
c7336b3387
|
1
|
2023-03-16 10:59:49 +08:00 |
|
|
|
a20f000909
|
Merge branch 'develop'
|
2023-03-16 10:57:29 +08:00 |
|
