 huangdeliang
|
ffe1c18202
|
Merge branch 'develop' of gitee.com:darlk/ShengTangManage
|
2021-06-09 19:14:32 +08:00 |
|
|
huangdeliang
|
e99ebfadb7
|
短信验证
|
2021-06-09 19:12:48 +08:00 |
|
 德仔
|
ebbf04ddb1
|
!284 菜品拷贝功能、食谱计划列表优化，移除订单联查，改为客户档案联查
Merge pull request !284 from 德仔/xzj
|
2021-06-09 19:11:50 +08:00 |
|
 xiezhijun
|
0773a39bdc
|
Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-06-09 18:32:54 +08:00 |
|
|
xiezhijun
|
2175bcd77c
|
菜品拷贝功能、食谱计划列表优化，移除订单联查，改为客户档案联查
|
2021-06-09 18:32:39 +08:00 |
|
|
德仔
|
fb860aaafe
|
!283 导粉进粉通过率统计，食谱计划生成优化
Merge pull request !283 from 德仔/xzj
|
2021-06-08 20:23:15 +08:00 |
|
|
xiezhijun
|
06a7323a65
|
Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-06-08 18:52:27 +08:00 |
|
|
xiezhijun
|
0115dfa36f
|
导粉进粉通过率统计，食谱计划生成优化
|
2021-06-08 18:52:13 +08:00 |
|
|
德仔
|
57942a652f
|
!282 调整客户消息展示
Merge pull request !282 from 德仔/develop
|
2021-06-08 18:27:15 +08:00 |
|
|
huangdeliang
|
02e5110d2c
|
调整客户消息展示
|
2021-06-08 18:26:00 +08:00 |
|
|
德仔
|
ae605581fd
|
!281 优化订单查询
Merge pull request !281 from 德仔/xzj
|
2021-06-07 19:44:22 +08:00 |
|
|
德仔
|
ddab13bc79
|
!280 添加食谱计划页面
Merge pull request !280 from 德仔/develop
|
2021-06-07 19:43:36 +08:00 |
|
|
huangdeliang
|
c57defc800
|
添加食谱计划页面
|
2021-06-07 19:18:19 +08:00 |
|
|
xiezhijun
|
bedd258c04
|
优化订单查询
|
2021-06-07 19:17:41 +08:00 |
|
|
xiezhijun
|
90de040738
|
Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-06-07 19:11:56 +08:00 |
|
|
xiezhijun
|
669bbfbf23
|
导粉记录，订单条件筛选，食谱计划生成优化
|
2021-06-07 19:11:44 +08:00 |
|
|
德仔
|
20a3168a12
|
!279 加上小程序获取视频分类的接口
Merge pull request !279 from 德仔/xzj
|
2021-06-05 18:34:21 +08:00 |
|
|
xiezhijun
|
06d62ea4a0
|
Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-06-05 18:18:20 +08:00 |
|
|
xiezhijun
|
ec68617f50
|
加上小程序获取视频分类的接口
|
2021-06-05 18:18:00 +08:00 |
|
|
德仔
|
b32c2637dc
|
!278 管理者视觉
Merge pull request !278 from 德仔/develop
|
2021-06-05 15:44:11 +08:00 |
|
|
huangdeliang
|
f6d1151db2
|
管理者视觉
|
2021-06-05 15:42:24 +08:00 |
|
|
huangdeliang
|
e452f5a904
|
管理者视觉
|
2021-06-05 15:38:10 +08:00 |
|
|
德仔
|
486f2d4f86
|
!277 调整界面
Merge pull request !277 from 德仔/develop
|
2021-06-05 15:08:37 +08:00 |
|
|
huangdeliang
|
ea422f63f9
|
调整界面
|
2021-06-05 15:05:32 +08:00 |
|
|
德仔
|
1f0b60311c
|
!276 进粉统计导出修复
Merge pull request !276 from 德仔/develop
|
2021-06-04 11:58:47 +08:00 |
|
|
huangdeliang
|
422431c77d
|
进粉统计导出修复
|
2021-06-04 11:57:17 +08:00 |
|
|
德仔
|
486d215c1f
|
!275 先关掉自启逻辑
Merge pull request !275 from 德仔/develop
|
2021-06-03 18:48:21 +08:00 |
|
|
huangdeliang
|
8a9a55ff8e
|
先关掉自启逻辑
|
2021-06-03 18:47:17 +08:00 |
|
|
德仔
|
3844894249
|
!274 调整逻辑
Merge pull request !274 from 德仔/develop
|
2021-06-03 18:32:37 +08:00 |
|
|
huangdeliang
|
672ca49a55
|
调整逻辑
|
2021-06-03 18:31:22 +08:00 |
|
|
德仔
|
d106fc89c0
|
!273 接入客户信息
Merge pull request !273 from 德仔/develop
|
2021-06-03 17:45:58 +08:00 |
|
|
huangdeliang
|
d495f47304
|
接入客户信息
|
2021-06-03 17:37:59 +08:00 |
|
|
huangdeliang
|
f682efe758
|
退出关闭ws
|
2021-06-03 14:26:02 +08:00 |
|
|
huangdeliang
|
13cb91cd92
|
调整
|
2021-06-03 14:10:24 +08:00 |
|
|
德仔
|
a2cfdfcfea
|
!272 调整ws连接时机
Merge pull request !272 from 德仔/develop
|
2021-06-03 11:26:06 +08:00 |
|
|
huangdeliang
|
6238dffef0
|
Merge branch 'develop' of gitee.com:darlk/ShengTangManage into develop
|
2021-06-03 11:24:37 +08:00 |
|
|
huangdeliang
|
a3ea4edcf4
|
调整ws连接时机
|
2021-06-03 11:24:29 +08:00 |
|
|
德仔
|
30b152a231
|
!271 完善交互
Merge pull request !271 from 德仔/develop
|
2021-06-03 10:50:36 +08:00 |
|
|
德仔
|
f2d4dc6c79
|
Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop
|
2021-06-03 10:50:24 +08:00 |
|
|
huangdeliang
|
ea8276e6a0
|
完善交互
|
2021-06-03 10:36:21 +08:00 |
|
|
德仔
|
b4c7fb50e3
|
!270 售中提成计算，售前推送提成计算，优化修改客户手机号时更改绑定对应的微信用户逻辑
Merge pull request !270 from 德仔/xzj
|
2021-06-03 09:28:42 +08:00 |
|
|
xiezhijun
|
c43ca57dd4
|
Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-06-02 18:19:26 +08:00 |
|
|
xiezhijun
|
0d7f9478fa
|
售中提成计算，售前推送提成计算，优化修改客户手机号时更改绑定对应的微信用户逻辑
|
2021-06-02 18:19:01 +08:00 |
|
|
huangdeliang
|
953d188f50
|
修改端口
|
2021-06-02 14:13:03 +08:00 |
|
|
huangdeliang
|
a4252af6ed
|
修复ws
|
2021-06-02 14:11:15 +08:00 |
|
|
huangdeliang
|
cfe970bd45
|
开发ws链接
|
2021-06-02 14:06:21 +08:00 |
|
|
德仔
|
bd7474871d
|
!269 加上售中下单逻辑，修改账号渠道，进粉统计的渠道和下单时保持一致
Merge pull request !269 from 德仔/xzj
|
2021-06-01 21:03:31 +08:00 |
|
|
xiezhijun
|
7cb4122891
|
Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-06-01 19:25:03 +08:00 |
|
|
xiezhijun
|
77a8668b5d
|
加上售中下单逻辑，修改账号渠道，进粉统计的渠道和下单时保持一致
|
2021-06-01 19:24:40 +08:00 |
|
|
德仔
|
7d36193da2
|
!268 添加图片导出时设置目标天数
Merge pull request !268 from 德仔/develop
|
2021-06-01 15:01:57 +08:00 |
|