blak-kong
|
6e83ce5f16
|
Merge branch 'lzwdev' into dev
|
2 years ago |
|
blak-kong
|
dba48d95ad
|
准备合并
|
2 years ago |
rongweikang
|
2f0ce40830
|
对接水分测试报告
|
2 years ago |
|
rongweikang
|
17d0439e3f
|
优化
|
2 years ago |
qsj
|
9411acf843
|
解决冲突
|
2 years ago |
|
qsj
|
677deec92b
|
修改
|
2 years ago |
|
blak-kong
|
e7738a8d58
|
.
|
2 years ago |
|
qsj
|
8dad09f77d
|
Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into qsj
|
2 years ago |
|
qsj
|
80e901bf0a
|
对接护理记录
|
2 years ago |
|
blak-kong
|
786d8d8a37
|
合并分支
|
2 years ago |
|
blak-kong
|
9363bb5f99
|
准备合并
|
2 years ago |
|
rongweikang
|
475862c926
|
优化
|
2 years ago |
|
blak-kong
|
6f952823a4
|
fix:仪器管理、仪器介绍样式修复
|
2 years ago |
|
blak-kong
|
fdf863b105
|
add:目录分包
|
2 years ago |
|
blak-kong
|
27779daff9
|
Merge branch 'dev' into lzwdev
|
2 years ago |
|
rongweikang
|
5f44514b2d
|
Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev
|
2 years ago |
|
blak-kong
|
6b6f060150
|
.
|
2 years ago |
|
rongweikang
|
3bac8ffbed
|
分包
|
2 years ago |
|
qsj
|
a403ebadeb
|
Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into qsj
|
2 years ago |
|
qsj
|
ac6bd1e29f
|
修改bug
|
2 years ago |
|
blak-kong
|
226f20392f
|
临时提交给别的前端测试
|
2 years ago |
|
blak-kong
|
dd2a627f8a
|
fix:设备蓝牙连接增加限制，wl200切换模式增加限制
|
2 years ago |
|
rongweikang
|
79c1eed90c
|
Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into rwkdev
|
2 years ago |
|
rongweikang
|
5fb64bc55c
|
优化
|
2 years ago |
|
rongweikang
|
4f8b3953d2
|
添加echats组件
|
2 years ago |
|
blak-kong
|
a9cdfaa602
|
合并冲突
|
2 years ago |
|
blak-kong
|
1e5da4f48f
|
临时提交
|
2 years ago |
|
qsj
|
2cb4156bc1
|
获取视频时间，图表样式层级过高
|
2 years ago |
|
qsj
|
a757928cf6
|
Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into qsj
|
2 years ago |
|
qsj
|
c341252195
|
echarts图表样式修改
|
2 years ago |
|
blak-kong
|
6305f2c66a
|
Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev
|
2 years ago |
|
blak-kong
|
5677dc4dda
|
拿到每秒数据
|
2 years ago |
|
qsj
|
9c38818d91
|
'视频关闭启动,关闭声音'
|
2 years ago |
|
qsj
|
5c348080c4
|
Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev
|
2 years ago |
|
qsj
|
e8bd41ad75
|
调节器的封装
|
2 years ago |
|
blak-kong
|
66b9630072
|
Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev
|
2 years ago |
|
blak-kong
|
b5131fb9ba
|
Merge branch 'lzwdev' into dev
|
2 years ago |
|
qsj
|
16936e7429
|
封装仪器护理脸部1
|
2 years ago |
|
blak-kong
|
79dba2b6a1
|
临时提交
|
2 years ago |
|
qsj
|
3310ce54d4
|
解决冲突
|
2 years ago |
|
qsj
|
755d87a7cb
|
添加图片
|
2 years ago |
|
rongweikang
|
99cdfc9d39
|
优化
|
2 years ago |
|
rongweikang
|
99e964313e
|
添加水分测试页
|
2 years ago |
|
rongweikang
|
09b8bdb39b
|
封装组件
|
2 years ago |
|
qsj
|
8e7a2e5eb0
|
Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into qsj
|
2 years ago |
|
qsj
|
c31d291cf6
|
封装脸部护理跳转框
|
2 years ago |
|
blak-kong
|
db13a386bb
|
Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev
|
2 years ago |
|
blak-kong
|
819d2d0cdc
|
临时提交
|
2 years ago |
|
blak-kong
|
7f029b26c4
|
fix:允许开发者工具直接跳转
|
2 years ago |
|
blak-kong
|
43f8ed43ea
|
add:fr200蓝牙连接兼容;fix:绑定仪器时缓存数据key值修改
|
2 years ago |
|
qsj
|
21875f2c5e
|
Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into qsj
|
2 years ago |
|
qsj
|
1d1cb0210b
|
回看报告不显示打卡
|
2 years ago |
|
blak-kong
|
8ebb6bb667
|
Merge branch 'dev' into lzwdev
|
2 years ago |
|
qsj
|
b846139769
|
Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into qsj
|
2 years ago |
|
qsj
|
199b12a88b
|
前往打卡图片拉长bug修改
|
2 years ago |
|
blak-kong
|
caa8c853dd
|
注释掉前端用的测试按钮
|
2 years ago |
|
blak-kong
|
497027c311
|
fix:修复首页日历快速点击bug和底部tabbar清空历史跳转bug
|
2 years ago |
|
blak-kong
|
a064005161
|
Merge branch 'dev' into lzwdev
|
2 years ago |
|
blak-kong
|
4a13467886
|
护理记录tongbu
|
2 years ago |
|
qsj
|
6f361b1912
|
解决冲突
|
2 years ago |
|
qsj
|
b39a8ceda4
|
修改Bug
|
2 years ago |
|
qsj
|
4a60d24263
|
初次护理弹窗配置视频时无法播放，且若没有配置视频时，应该不显示弹窗才对
|
2 years ago |
|
qsj
|
737904ce25
|
弹窗不显示序列号
|
2 years ago |
|
blak-kong
|
f3b3654d65
|
merge:合并冲突
|
2 years ago |
|
blak-kong
|
40f33ed5a6
|
临时提交，准备合并
|
2 years ago |
|
qsj
|
8221a2bfe3
|
修改样式
|
2 years ago |
|
blak-kong
|
474dfe2637
|
fix:小程序内扫码绑定弹窗失效问题
|
2 years ago |
|
qsj
|
b0f96cce8f
|
修改护理打卡图片上传拉大
|
2 years ago |
|
blak-kong
|
9d594fb0c2
|
Merge branch 'dev' into lzwdev
|
2 years ago |
|
blak-kong
|
487903cf43
|
.
|
2 years ago |
|
qsj
|
1f4f7d3ab8
|
添加用户使用仪器记录
|
2 years ago |
|
qsj
|
4e0c52b3b9
|
提交更新
|
2 years ago |
|
qsj
|
b4c4d1669c
|
Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into qsj
|
2 years ago |
|
qsj
|
3ee4341aaa
|
bug修改bug
|
2 years ago |
|
blak-kong
|
67070731fa
|
临时提交
|
2 years ago |
|
blak-kong
|
df99d57457
|
fix:修复切换模式bug，自动启动倒计时
|
2 years ago |
|
blak-kong
|
2b2a8dca58
|
delete:删除无用的iot旧目录，后面使用分包功能下的iot
|
2 years ago |
|
blak-kong
|
c4bccbc11c
|
iot拆分子包
|
2 years ago |
|
blak-kong
|
84674a42ba
|
Merge branch 'rwkdev' into lzwdev
|
2 years ago |
|
blak-kong
|
3d25574f55
|
Merge branch 'rwkdev' of https://gitee.com/yunqiang_technology/flowsomwechat into rwkdev
|
2 years ago |
|
blak-kong
|
f56016f818
|
.
|
2 years ago |
|
rongweikang
|
fbafa2ee7c
|
优化
|
2 years ago |
|
rongweikang
|
dd4a1ca9ae
|
添加水分测试页
|
2 years ago |
|
rongweikang
|
7318f56515
|
添加图片
|
2 years ago |
|
blak-kong
|
70c94239fd
|
fix:蓝牙bug修复
|
2 years ago |
|
blak-kong
|
ce09d36d6b
|
处理冲突
|
2 years ago |
|
blak-kong
|
4a7354064e
|
Merge branch 'dev' into rwkdev
|
2 years ago |
|
blak-kong
|
a5febd1d6a
|
.
|
2 years ago |
|
blak-kong
|
49d63dc8eb
|
fix:兼容WE100/WE200逻辑
|
2 years ago |
|
qsj
|
f9f825b5d4
|
修改打卡输入框bug
|
2 years ago |
|
blak-kong
|
075021a38e
|
fix:临时提交，bug修复
|
2 years ago |
|
blak-kong
|
625d36d025
|
.
|
2 years ago |
|
blak-kong
|
8d3e804844
|
fix:bug修复，临时提交用于同步
|
2 years ago |
|
blak-kong
|
ff44a435fe
|
fix:继续修复扫码相关流程bug
|
2 years ago |
|
blak-kong
|
40e3c12e0a
|
.
|
2 years ago |
|
blak-kong
|
75413856f7
|
fix:bug修复
|
2 years ago |
|
blak-kong
|
64302d397e
|
fix:bug修复，仪器断开和重连bug修复
|
2 years ago |
|
rongweikang
|
a58c896e60
|
Merge branch 'lzwdev' of https://gitee.com/yunqiang_technology/flowsomwechat into rwkdev
|
2 years ago |
|
blak-kong
|
bc9b6bc487
|
fix给自动重新登录加上2秒延迟定时器
|
2 years ago |
|
rongweikang
|
6cba4cc658
|
Merge branch 'lzwdev' of https://gitee.com/yunqiang_technology/flowsomwechat into rwkdev
|
2 years ago |