 chenJinxu
|
1afe3863ad
|
Merge branch 'develop'
|
pirms 1 gada |
|
chenJinxu
|
0d60c573c0
|
Merge branch 'test' into develop
|
pirms 1 gada |
|
chenJinxu
|
54a5a1c721
|
Merge branch 'feat' into test
|
pirms 1 gada |
|
chenJinxu
|
21be623bd7
|
fix
- 修复 心理监测详情心理组件切换历史检测数据没有发生变化的问题
|
pirms 1 gada |
|
chenJinxu
|
d892b893d0
|
Merge branch 'develop'
|
pirms 1 gada |
|
chenJinxu
|
e4b7aa2b89
|
Merge branch 'test' into develop
|
pirms 1 gada |
|
chenJinxu
|
bdda24d452
|
Merge branch 'feat' into test
|
pirms 1 gada |
|
chenJinxu
|
355b1f7268
|
fix
- 修复 心理监测详情中间组件颜色与接口返回的等级颜色不一致的问题
|
pirms 1 gada |
|
chenJinxu
|
96031c9b4c
|
增加 一个视频播放页面
|
pirms 1 gada |
|
chenJinxu
|
e1e5122762
|
修复 点击心理tabbar时文字异常的问题
|
pirms 1 gada |
|
chenJinxu
|
bf297b1037
|
修复 点击心理tabbar时文字异常的问题
|
pirms 1 gada |
|
chenJinxu
|
5a0c505769
|
修复 点击心理tabbar时文字异常的问题
|
pirms 1 gada |
|
chenJinxu
|
2f57b8edaa
|
Merge branch 'mer-master'
|
pirms 1 gada |
|
chenJinxu
|
20c1a505e3
|
Merge branch 'develop' into mer-master
|
pirms 1 gada |
|
chenJinxu
|
48dc30fe7d
|
修改替换文字的逻辑
|
pirms 1 gada |
|
chenJinxu
|
c928cb715d
|
Merge branch 'test' into develop
|
pirms 1 gada |
|
chenJinxu
|
d68046ea06
|
Merge branch 'feat' into test
|
pirms 1 gada |
|
chenJinxu
|
f7cd11e345
|
修改 替换条件
|
pirms 1 gada |
|
chenJinxu
|
94f2644a4d
|
Merge branch 'feat' into test
|
pirms 1 gada |
|
chenJinxu
|
2cf29f7aa0
|
修复 首页文字加载不一致的问题
|
pirms 1 gada |
|
chenJinxu
|
3d74272390
|
Merge branch 'feat' into test
|
pirms 1 gada |
|
chenJinxu
|
2635203dda
|
update
- ‘抑郁’文字 通过页面传过来的参数 改成‘焦虑’，否则不变
|
pirms 1 gada |
|
chenJinxu
|
68140634d1
|
修改 淘宝镜像地址
|
pirms 1 gada |
|
chenJinxu
|
a736417231
|
update
- ‘焦虑’文字改成‘抑郁’
|
pirms 1 gada |
|
chenJinxu
|
32e53ced84
|
Merge branch 'develop'
|
pirms 1 gada |
|
chenJinxu
|
fcbdd2e7c9
|
Merge branch 'fix' into develop
|
pirms 1 gada |
|
chenJinxu
|
3c25b2f6c6
|
修复 时间戳转换错的问题
|
pirms 1 gada |
|
chenJinxu
|
26f5095a19
|
fix
- c1后台设备功耗查看页面
- 修复 设备状态时间戳转换错误的问题
|
pirms 1 gada |
|
chenJinxu
|
9f189fcbfd
|
Merge branch 'update' into test
|
pirms 1 gada |
|
chenJinxu
|
35b519aa7a
|
修改 抑郁文字为焦虑
|
pirms 1 gada |
|
chenJinxu
|
a2525803b4
|
Merge branch 'fix' into test
|
pirms 1 gada |
|
chenJinxu
|
dcd7fde122
|
fix
- 心理监测详情
- 修复 心理切换按钮导致 ”今天“ 日期参数异常的问题
|
pirms 1 gada |
|
chenJinxu
|
d97816752b
|
Merge branch 'develop'
|
pirms 1 gada |
|
chenJinxu
|
24f981d24f
|
Merge branch 'hot-fix' into develop
|
pirms 1 gada |
|
chenJinxu
|
f22f4bcbfb
|
update
- 心理监测详情，周报
- 修改 legend图例位置
|
pirms 1 gada |
|
chenJinxu
|
921568b5ea
|
Merge branch 'feat' into test
|
pirms 1 gada |
|
chenJinxu
|
ea18f895d8
|
update
- 心理监测详情，周报
- 修改 legend图例位置
|
pirms 1 gada |
|
chenJinxu
|
7c3128397b
|
Merge branch 'develop'
|
pirms 1 gada |
|
chenJinxu
|
4813ada7f1
|
Merge branch 'hot-update' into develop
|
pirms 1 gada |
|
chenJinxu
|
78a58d5f65
|
update
- 心理监测首页
- 修改 标题为心理呵护
- 修改 三个指标文字
|
pirms 1 gada |
|
chenJinxu
|
b4b9f5e0ae
|
Merge branch 'update' into test
|
pirms 1 gada |
|
chenJinxu
|
3a95d16fad
|
update
- 心理监测首页
- 修改 标题为心理呵护
- 修改 三个指标文字
|
pirms 1 gada |
|
chenJinxu
|
c7a028c189
|
Merge branch 'develop'
|
pirms 1 gada |
|
chenJinxu
|
6c9569a22c
|
Merge branch 'fix-load' into develop
|
pirms 1 gada |
|
chenJinxu
|
491e479af9
|
增加 加载失败错误提示
|
pirms 1 gada |
|
chenJinxu
|
6b8b73bd29
|
fix
- 设备设置列表
- 修复 接口未响应完成提示加载完成
|
pirms 1 gada |
|
chenJinxu
|
24120bb3fc
|
Merge branch 'fix-load' into test
|
pirms 1 gada |
|
chenJinxu
|
421ca788c9
|
`2023.12.13`
update
- 设备设置列表
- 优化 全部接口响应完成才加载完成
|
pirms 1 gada |
|
chenJinxu
|
702b82aae7
|
Merge branch 'develop'
|
pirms 1 gada |
|
chenJinxu
|
ff20dcb0fb
|
Merge branch 'fix-load' into develop
|
pirms 1 gada |
