huangdeliang
|
73b36a1a8b
|
合并代码
|
2021-01-28 15:59:56 +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 |
|
德仔
|
0479cfe4ae
|
!48 客户体征相关
Merge pull request !48 from 德仔/xzj
|
2021-01-28 09:29:37 +08:00 |
|
xiezhijun
|
badf491694
|
客户体征相关
|
2021-01-27 18:54:05 +08:00 |
|
德仔
|
4b2de6accd
|
!47 客户健康优化修改
Merge pull request !47 from 德仔/xzj
|
2021-01-26 21:02:54 +08:00 |
|
xiezhijun
|
9c899e344e
|
客户健康优化修改
|
2021-01-26 20:42:59 +08:00 |
|
德仔
|
84ef819fe3
|
!46 客户健康修改
Merge pull request !46 from 德仔/xzj
|
2021-01-26 08:35:49 +08:00 |
|
xiezhijun
|
e53ac00fbd
|
客户健康修改
|
2021-01-25 21:31:51 +08:00 |
|
xiezhijun
|
bc63f7bbf4
|
客户体征优化、客户健康修改
|
2021-01-25 16:13:32 +08:00 |
|
xiezhijun
|
789f835f72
|
Merge branch 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-01-25 10:03:51 +08:00 |
|
xiezhijun
|
ca989a6336
|
客户健康页面优化
|
2021-01-25 00:22:56 +08:00 |
|
xiezhijun
|
d0d4352eaf
|
Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-01-24 09:24:16 +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 |
|
德仔
|
74a0329552
|
!45 健康评估调查表页面
Merge pull request !45 from 德仔/xzj
|
2021-01-23 10:32:25 +08:00 |
|
xiezhijun
|
a4745063d3
|
Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-01-22 19:16:41 +08:00 |
|
xiezhijun
|
b828bcd3bb
|
健康评估调查表页面
|
2021-01-22 19:16:07 +08:00 |
|
huangdeliang
|
41d09f0d57
|
Merge remote-tracking branch 'origin/master'
|
2021-01-22 10:00:28 +08:00 |
|
huangdeliang
|
7a1aac82c9
|
修复菜品修改报错
|
2021-01-22 10:00:21 +08:00 |
|
德仔
|
a98def60b7
|
!44 浏览文件提成改为保留三位小数四舍五入，订单页面修改，增加服务天数
Merge pull request !44 from 德仔/xzj
|
2021-01-22 07:22:33 +08:00 |
|
xiezhijun
|
0306734c9c
|
Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj
|
2021-01-21 20:46:24 +08:00 |
|
xiezhijun
|
34a0790af2
|
提成改为保留三位小数四舍五入，订单页面修改，增加服务天数
|
2021-01-21 20:39:19 +08:00 |
|
德仔
|
84eeb735b3
|
!43 浏览文件食谱计划页面弹窗样式优化、按天提成列表增加一列
Merge pull request !43 from 德仔/xzj
|
2021-01-20 21:57:30 +08:00 |
|
huangdeliang
|
f99f84ce07
|
调整名称
|
2021-01-20 21:55:10 +08:00 |
|
xiezhijun
|
8d725bed34
|
食谱计划页面弹窗样式优化、按天提成列表增加一列
|
2021-01-20 18:41:14 +08:00 |
|
huangdeliang
|
8c4dea035e
|
更换图标
|
2021-01-20 09:44:00 +08:00 |
|
德仔
|
243bffffee
|
!42 食谱计划优化、按天计算提成优化、图片logo修改
Merge pull request !42 from 德仔/xzj
|
2021-01-20 08:39:42 +08:00 |
|
xiezhijun
|
160dc5abfd
|
食谱计划优化、按天计算提成优化、图片logo修改
|
2021-01-19 17:35:30 +08:00 |
|
huangdeliang
|
53bc0d22fd
|
增加userId获取方法
|
2021-01-19 12:15:24 +08:00 |
|
huangdeliang
|
b7b94de40e
|
菜品类型多选
|
2021-01-19 12:00:41 +08:00 |
|
huangdeliang
|
01f0da5893
|
Merge remote-tracking branch 'origin/master'
|
2021-01-19 11:53:04 +08:00 |
|
huangdeliang
|
20f82629b1
|
菜品类型多选
|
2021-01-19 11:52:57 +08:00 |
|
德仔
|
9dff784e46
|
!41 食谱计划页面、逻辑优化
Merge pull request !41 from 德仔/xzj
|
2021-01-18 21:42:37 +08:00 |
|
xiezhijun
|
5588aa2e4c
|
食谱计划页面、逻辑优化
|
2021-01-18 19:12:55 +08:00 |
|
huangdeliang
|
2be6c3c97f
|
修复忌口，推荐错乱
|
2021-01-18 10:29:49 +08:00 |
|
huangdeliang
|
4a9374641e
|
完善修改逻辑
|
2021-01-16 18:01:23 +08:00 |
|
huangdeliang
|
d05d067eaf
|
Merge remote-tracking branch 'origin/master'
|
2021-01-15 23:15:16 +08:00 |
|
huangdeliang
|
a9a6aeeaa1
|
修改界面
|
2021-01-15 23:15:09 +08:00 |
|
德仔
|
a988fa1696
|
!40 订单新增时选择收款账号默认选择策划运营；添加修改订单时更新服务到期时间
Merge pull request !40 from 德仔/xzj
|
2021-01-15 22:52:14 +08:00 |
|
xiezhijun
|
072b0a1f36
|
订单新增时选择收款账号默认选择策划运营；添加修改订单时更新服务到期时间
|
2021-01-15 18:43:47 +08:00 |
|
德仔
|
0dffa51796
|
!39 浏览文件暂停记录优化，改成弹窗，证件验证方法优化
Merge pull request !39 from 德仔/xzj
|
2021-01-15 00:06:12 +08:00 |
|
xiezhijun
|
c705665b45
|
暂停记录优化，改成弹窗，证件验证方法优化
|
2021-01-14 17:40:19 +08:00 |
|
德仔
|
e5ea298686
|
!38 合同护照开放
Merge pull request !38 from 德仔/xzj
|
2021-01-14 14:23:25 +08:00 |
|
xiezhijun
|
0857197c65
|
修改合同页面的证件验证方法
|
2021-01-14 14:20:26 +08:00 |
|
德仔
|
64e4ba6f91
|
!37 提成加上合计、Excel导出，打卡记录加上姓名、营养师，体征调查加上备注项
Merge pull request !37 from 德仔/xzj
|
2021-01-13 19:39:47 +08:00 |
|
xiezhijun
|
cf56395dab
|
提成加上合计、Excel导出;打卡记录加上姓名、营养师;体征调查加上备注项
|
2021-01-13 18:39:17 +08:00 |
|
德仔
|
c07fddf510
|
!36 提成优化修改、订单列表增加进粉字段、调理项目
Merge pull request !36 from 德仔/xzj
|
2021-01-13 09:07:50 +08:00 |
|
xiezhijun
|
355dff1ede
|
提成优化修改、订单列表增加进粉字段、调理项目
|
2021-01-12 18:35:06 +08:00 |
|