 chenJinxu
|
a58552e8f3
|
Merge branch 'develop'
|
1 anno fa |
|
chenJinxu
|
2edd3e1edd
|
Merge branch 'fix-dev' into develop
|
1 anno fa |
|
chenJinxu
|
c43c92ac20
|
fix
- c1后台设备功耗查看页面
- 修复 涉水监测开关显示不正确的问题
|
1 anno fa |
|
chenJinxu
|
e2eb85d19f
|
Merge branch 'develop'
|
1 anno fa |
|
chenJinxu
|
5d88591902
|
Merge branch 'develop-rel' into develop
|
1 anno fa |
|
chenJinxu
|
9d470ac9e8
|
设备功耗查看 - 修复 监护角色数据解析错误导致相关页面显示错误的问题
|
1 anno fa |
|
JinxChen
|
778774a8ba
|
merge develop
|
1 anno fa |
|
JinxChen
|
e21058ba5c
|
Merge branch 'test' into develop
|
1 anno fa |
|
JinxChen
|
e78d06d3b8
|
Merge branch 'feat' into test
|
1 anno fa |
|
JinxChen
|
4778322b5e
|
update
- 心理监测详情
- 修改 温馨提示语
- 新增 一个周报/月报页面
|
1 anno fa |
|
JinxChen
|
55d9a1fb52
|
Merge branch 'develop'
|
1 anno fa |
|
JinxChen
|
4bd0a049d1
|
Merge branch 'test' into develop
|
1 anno fa |
|
JinxChen
|
7de5fc2713
|
Merge branch 'feat' into test
|
1 anno fa |
|
JinxChen
|
db8da70b72
|
fix
- 话费查询
- 修复 异步问题导致首次进入页面白屏的问题
|
1 anno fa |
|
JinxChen
|
3c308f86b7
|
merge develop
|
1 anno fa |
|
JinxChen
|
3ef54f844a
|
Merge branch 'test' into develop
|
1 anno fa |
|
JinxChen
|
1438d4d19b
|
Merge branch 'fix' into test
|
1 anno fa |
|
JinxChen
|
7331cb3959
|
fix
- 话费查询
- 修复 token过期时导致获取openId失败的问题
|
1 anno fa |
|
JinxChen
|
a4c7253a65
|
Merge branch 'merge-master'
|
1 anno fa |
|
JinxChen
|
72226c0efa
|
merge develop
|
1 anno fa |
|
JinxChen
|
c46827d8da
|
Merge branch 'test' into develop
|
1 anno fa |
|
JinxChen
|
1c055c3a80
|
Merge branch 'fix' into test
|
1 anno fa |
|
JinxChen
|
77e3d55c9e
|
fix
- c1后台设备功耗查看页面
- 修复 上报周期无数据时显示不全的问题
|
1 anno fa |
|
JinxChen
|
2ce5efa3ec
|
Merge branch 'merge-master'
|
1 anno fa |
|
JinxChen
|
7de38d5297
|
merge develop
|
1 anno fa |
|
JinxChen
|
591e5cf3b2
|
Merge branch 'test' into develop
|
1 anno fa |
|
JinxChen
|
89c3d186f8
|
update
- c1后台设备功耗查看页面
- 修改 数据解析方法
|
1 anno fa |
|
JinxChen
|
242954622a
|
update
- c1后台设备功耗查看页面
- 修改 数据解析方法
|
1 anno fa |
|
JinxChen
|
e55ab81a60
|
Merge branch 'feat-c1' into test
|
1 anno fa |
|
JinxChen
|
71e54f2900
|
修改 功耗查看页面逻辑
|
1 anno fa |
|
JinxChen
|
43a4bc7c8c
|
merge feat-c1
|
1 anno fa |
|
JinxChen
|
05f4547851
|
修改 页面样式
|
1 anno fa |
|
JinxChen
|
0bb26145ec
|
Merge branch 'feat' into test
|
1 anno fa |
|
JinxChen
|
1109581627
|
update
- 问卷调查
- 增加 答题完成返回错误后如果是从随手精灵公众号调过来的用户，则第6题文字变红
|
1 anno fa |
|
JinxChen
|
60833a1fc0
|
feature
- 增加 c1后台设备功耗查看页面
- 增加 cell，echarts和table组件
|
1 anno fa |
|
JinxChen
|
e0f26f118f
|
Merge branch 'feat' into test
|
1 anno fa |
|
JinxChen
|
9a5e43f7e2
|
update
- 问卷调查
- 增加 答题完成返回错误后如果是从随手精灵公众号调过来的用户，则第8 11题文字变红
|
1 anno fa |
|
JinxChen
|
7e43685e3b
|
Merge branch 'feat' into test
|
1 anno fa |
|
JinxChen
|
bb6baa43e6
|
update
- 问卷调查
- 修改 答题完成后返回方法，修复使用浏览器原生返回方法可能会导致页面返回异常
|
1 anno fa |
|
JinxChen
|
0f3b3c84d6
|
Merge branch 'merge-master'
|
1 anno fa |
|
JinxChen
|
d33328a261
|
merge develop
|
1 anno fa |
|
JinxChen
|
2476122859
|
Merge branch 'test' into develop
|
1 anno fa |
|
JinxChen
|
5d284eb42a
|
Merge branch 'feat' into test
|
1 anno fa |
|
JinxChen
|
4904577a95
|
update
- 充值首页
- 修改 页面跳转逻辑
# 有基础套餐时
# 已支付，跳转话费查询页面
# 未支付， 跳转套餐充值页面
# 无基础套餐时
#是零川或者小台风，跳转话费查询页面
#否则跳转错误页面
- 增加 一个物联网卡的错误页面
|
1 anno fa |
|
JinxChen
|
03e45816a7
|
Merge branch 'merge-master'
|
1 anno fa |
|
JinxChen
|
c2e5a59182
|
merge develop
|
1 anno fa |
|
JinxChen
|
190dcf2b43
|
Merge branch 'test' into develop
|
1 anno fa |
|
JinxChen
|
9a44abfe53
|
Merge branch 'feat' into test
|
1 anno fa |
|
JinxChen
|
6e27bc1d5b
|
update
- 增加 建模答题错误提示弹窗
|
1 anno fa |
|
JinxChen
|
7a492bd89c
|
Merge branch 'feat' into test
|
1 anno fa |
