90 Commits

Author SHA1 Message Date
xiezhijun
a1cb4861ea Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-02-27 16:55:46 +08:00
xiezhijun
5de80fd57f 健康评估报告 2021-02-27 16:55:31 +08:00
德仔
02a67be4fe !77 食谱展示界面开发
Merge pull request !77 from 德仔/develop
2021-02-26 20:16:12 +08:00
huangdeliang
9e87e1c9e8 食谱展示界面开发 2021-02-26 20:14:35 +08:00
xiezhijun
204529f52e 订单相关优化 2021-02-25 17:30:51 +08:00
xiezhijun
4df7ab0665 进粉统计优化 2021-02-24 23:51:21 +08:00
huangdeliang
d90ff968af 修改 2021-02-24 18:59:18 +08:00
huangdeliang
12607455a0 Merge branch 'xzj' of gitee.com:darlk/ShengTangManage into develop 2021-02-24 18:22:27 +08:00
huangdeliang
31088215b5 修改样式,修改逻辑 2021-02-24 18:20:45 +08:00
xiezhijun
bd70cd6566 订单新增优化 2021-02-24 18:19:27 +08:00
xiezhijun
66957edce0 外食计算优化,异步更新热量加上延迟 2021-02-24 10:52:56 +08:00
huangdeliang
13727e8d39 Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop 2021-02-24 08:55:57 +08:00
huangdeliang
62e2d22d24 修改订单,添加假删字段 2021-02-24 08:55:33 +08:00
xiezhijun
20b7697ddc 外食计算 2021-02-23 18:53:29 +08:00
xiezhijun
9de0e2bffc Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-02-23 15:36:23 +08:00
xiezhijun
c1a937adf4 外食计算优化,添加详情功能 2021-02-23 15:35:50 +08:00
huangdeliang
81ce32847a 修复错误 2021-02-22 19:59:14 +08:00
德仔
5c5709d606 Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop 2021-02-22 19:49:36 +08:00
huangdeliang
3f620ed894 生成食谱接口对接 2021-02-22 19:36:01 +08:00
xiezhijun
473ccef008 外食计算器优化,营养成分以及热量比例数据计算 2021-02-22 19:30:33 +08:00
huangdeliang
a7ca979d06 菜品增删查改对接 2021-02-20 19:46:13 +08:00
xiezhijun
3f3fcda862 外食计算器功能优化修改 2021-02-20 19:38:17 +08:00
xiezhijun
20371f9469 外食计算器 2021-02-19 19:14:26 +08:00
xiezhijun
3c42485f52 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-02-19 09:33:00 +08:00
huangdeliang
5f4b1ec33f Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop 2021-02-09 14:17:37 +08:00
huangdeliang
1775b657a7 修复菜品修改问题 2021-02-09 14:10:47 +08:00
德仔
ab630fd612 !60 修复通俗重量
Merge pull request !60 from 德仔/develop
2021-02-09 10:27:08 +08:00
huangdeliang
afb7465281 修复通俗重量 2021-02-09 10:25:34 +08:00
xiezhijun
9a2e9bde62 订单类型改版 2021-02-06 18:34:57 +08:00
德仔
615286a1ae Merge branch 'master' of gitee.com:darlk/ShengTangManage into xzj 2021-02-04 21:16:35 +08:00
xiezhijun
0283eb0a1d 微信导粉统计 2021-02-04 20:12:46 +08:00
huangdeliang
a9cde613d9 修改通俗计量方式 2021-02-03 17:28:45 +08:00
xiezhijun
b89225bc6a 客户健康信息修改 2021-02-02 20:29:53 +08:00
xiezhijun
e3d8a9fa12 客户档案的合同添加、复制健康调查链接 2021-02-01 19:13:41 +08:00
xiezhijun
418ab6b3a5 Merge branches 'develop' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj 2021-02-01 10:10:05 +08:00
huangdeliang
200e222aed 修改测试公众号 2021-02-01 09:15:52 +08:00
xiezhijun
9470aa6b5e 客户档案的体征、合同展示 2021-01-30 19:26:56 +08:00
huangdeliang
3c7e7a0f00 修复健康评估弹窗 2021-01-29 13:56:53 +08:00
huangdeliang
a9b52b6b94 Merge branch 'master' of gitee.com:darlk/ShengTangManage 2021-01-29 09:20:53 +08:00
xiezhijun
ffa2544215 亚健康合同 2021-01-28 20:20:10 +08:00
huangdeliang
e1d9d96244 优化代码 2021-01-28 19:38:51 +08:00
huangdeliang
c4458be248 Merge branch 'master' of gitee.com:darlk/ShengTangManage 2021-01-28 15:54:24 +08:00
huangdeliang
dad428d90c 暂存 2021-01-28 15:14:38 +08:00
xiezhijun
badf491694 客户体征相关 2021-01-27 18:54:05 +08:00
xiezhijun
9c899e344e 客户健康优化修改 2021-01-26 20:42:59 +08:00
xiezhijun
e53ac00fbd 客户健康修改 2021-01-25 21:31:51 +08:00
xiezhijun
bc63f7bbf4 客户体征优化、客户健康修改 2021-01-25 16:13:32 +08:00
xiezhijun
ace8a536cf Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-01-23 22:11:58 +08:00
xiezhijun
c4fe017d4d 客户健康页面、表逻辑 2021-01-23 22:11:39 +08:00
huangdeliang
25de0afa3f 增加主食按钮 2021-01-23 22:03:09 +08:00