1314 Commits

Author SHA1 Message Date
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
huangdeliang
d7368a2e0e 添加图片导出时设置目标天数 2021-06-01 14:59:05 +08:00
德仔
c46ed33273 !267 管理后台前端搭建
Merge pull request !267 from 德仔/develop
2021-05-31 19:44:45 +08:00
huangdeliang
d86bdedf79 修复测试数据 2021-05-31 19:39:30 +08:00
德仔
5fa207749f !266 合同修改,去掉5.10条事项
Merge pull request !266 from 德仔/xzj
2021-05-31 19:35:34 +08:00
huangdeliang
0e08a1fef8 管理后台前端搭建 2021-05-31 19:34:04 +08:00
xiezhijun
783fd6fe3b 合同修改,去掉5.10条事项 2021-05-31 18:34:29 +08:00
德仔
dc661d6d0d !265 调整界面
Merge pull request !265 from 德仔/develop
2021-05-31 10:53:33 +08:00
huangdeliang
7e3311ad64 调整界面 2021-05-31 10:52:30 +08:00
德仔
16b299e589 !264 食谱计划添加发送按钮
Merge pull request !264 from 德仔/develop
2021-05-29 16:24:16 +08:00
huangdeliang
b31aafc6e4 食谱计划添加发送按钮 2021-05-29 16:21:11 +08:00
德仔
87e38a5366 !263 体验单也需要生成食谱计划
Merge pull request !263 from 德仔/develop
2021-05-29 11:42:03 +08:00
huangdeliang
455cc51f17 体验单也需要生成食谱计划 2021-05-29 11:38:59 +08:00
德仔
21d3cdc60d !262 修复翻页
Merge pull request !262 from 德仔/develop
2021-05-29 10:48:56 +08:00
huangdeliang
8d7417f77e 修复翻页 2021-05-29 10:48:05 +08:00
德仔
d70b7164fe !261 提成优化,加上替换订单
Merge pull request !261 from 德仔/xzj
2021-05-29 09:28:25 +08:00
xiezhijun
d48cecc923 提成优化,加上替换订单 2021-05-28 18:32:20 +08:00
xiezhijun
0122c35553 提成优化,需要加上更换订单提成详情 2021-05-28 00:46:21 +08:00
xiezhijun
e333cb007e 提成明细需要加上替换的订单 2021-05-27 20:03:43 +08:00
huangdeliang
836f328c09 Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop 2021-05-27 17:48:57 +08:00
xiezhijun
01fd29f2ec Merge branch 'develop' of https://gitee.com/darlk/ShengTangManage into xzj 2021-05-27 16:40:17 +08:00
huangdeliang
e5def38565 暂存 2021-05-27 16:35:09 +08:00
德仔
4c7c70c623 !260 建客户档案时根据直播记录匹配营养师
Merge pull request !260 from 德仔/xzj
2021-05-27 09:18:36 +08:00
xiezhijun
cf766cb817 建客户档案时根据直播记录匹配营养师 2021-05-26 19:06:14 +08:00
huangdeliang
57dd7c3043 暂存 2021-05-26 18:11:12 +08:00
德仔
b249035da0 !259 修复接口
Merge pull request !259 from 德仔/develop
2021-05-25 10:28:08 +08:00
huangdeliang
2e6df9e862 修复接口 2021-05-25 10:26:39 +08:00
huangdeliang
14e3f4b88b 修复接口 2021-05-25 10:26:13 +08:00
huangdeliang
4137d96cee Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop 2021-05-25 10:20:33 +08:00
huangdeliang
ee4f3c29d5 接口开发完成 2021-05-25 10:15:55 +08:00
德仔
fe1691970d !258 导粉记录优化,采购计划SQL优化,后续建立索引
Merge pull request !258 from 德仔/xzj
2021-05-25 09:33:10 +08:00
xiezhijun
c82d5b25e5 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-05-24 16:45:47 +08:00
xiezhijun
ddd4b3763c 导粉记录优化,采购计划SQL优化,后续建立索引 2021-05-24 16:41:11 +08:00
德仔
869a5743b4 !257 优化推送模板
Merge pull request !257 from 德仔/develop
2021-05-24 11:20:51 +08:00
huangdeliang
416189781f 优化推送模板 2021-05-24 11:18:19 +08:00
huangdeliang
44786bb6bc 修改推送备注默认值 2021-05-22 10:10:04 +08:00
德仔
e5202f2992 !256 导粉记录页面以及接口修改
Merge pull request !256 from 德仔/xzj
2021-05-21 19:21:22 +08:00
xiezhijun
167cb3fda0 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-05-21 18:59:52 +08:00
xiezhijun
f913774025 导粉记录页面以及接口修改 2021-05-21 18:59:26 +08:00
德仔
fdf44c3624 !255 优化食谱计划详情全查询
Merge pull request !255 from 德仔/develop
2021-05-21 11:58:02 +08:00
huangdeliang
0b973ab796 优化食谱计划详情全查询 2021-05-21 11:56:15 +08:00
huangdeliang
562180c7d4 修复customerId为空时错误 2021-05-21 09:34:26 +08:00
xiezhijun
17df1db9e2 导粉记录 2021-05-20 18:59:03 +08:00
xiezhijun
574c8b424e 导粉统计,更新客户手机号时更新下微信用户对应的客户ID 2021-05-19 19:18:18 +08:00
xiezhijun
7cac34799c Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-05-19 18:42:52 +08:00
德仔
02a3e487f7 !254 修复食谱展示
Merge pull request !254 from 德仔/develop
2021-05-19 18:02:39 +08:00