qsj
|
5b31d64e38
|
Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into qsj
|
2 years ago |
|
qsj
|
fbe919b21e
|
临时提交
|
2 years ago |
rongweikang
|
65b5e36c5c
|
Merge branch 'rwkdev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev
|
2 years ago |
|
rongweikang
|
2d213c6a05
|
优化
|
2 years ago |
|
rongweikang
|
642b8fd410
|
修改分包
|
2 years ago |
|
qsj
|
b2f8a48528
|
解决冲突
|
2 years ago |
|
qsj
|
af205347e6
|
回看报告
|
2 years ago |
|
rongweikang
|
992f407cb1
|
添加样式
|
2 years ago |
|
rongweikang
|
e6627a19ba
|
Merge branch 'rwkdev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev
|
2 years ago |
|
rongweikang
|
57c2834de2
|
优化
|
2 years ago |
|
qsj
|
cf920fd2c8
|
Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into qsj
|
2 years ago |
|
qsj
|
4362697884
|
修改bug
|
2 years ago |
blak-kong
|
586edb21de
|
合并冲突
|
2 years ago |
|
blak-kong
|
d15b1e53e5
|
gear挡位调节，写到一半
|
2 years ago |
|
qsj
|
e55061722d
|
Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into qsj
|
2 years ago |
|
qsj
|
4c24a11040
|
仪器跳转水分报告
|
2 years ago |
|
rongweikang
|
9a0e253ba0
|
优化
|
2 years ago |
|
blak-kong
|
c28719bbe7
|
准备合并
|
2 years ago |
|
blak-kong
|
d48778d528
|
.
|
2 years ago |
|
qsj
|
030ce764e6
|
Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into qsj
|
2 years ago |
|
qsj
|
a83f8c13ed
|
提交
|
2 years ago |
|
blak-kong
|
c4997697c9
|
.
|
2 years ago |
|
blak-kong
|
39ebb02d60
|
临时提交
|
2 years ago |
|
qsj
|
557fb4226c
|
Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into qsj
|
2 years ago |
|
qsj
|
3a1f88f494
|
水分测试bug
|
2 years ago |
|
rongweikang
|
9e201ad45e
|
Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev
|
2 years ago |
|
rongweikang
|
36d476db9d
|
Merge branch 'rwkdev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev
|
2 years ago |
|
rongweikang
|
62d2afa966
|
修复样式问题
|
2 years ago |
|
blak-kong
|
5075b9285c
|
.
|
2 years ago |
|
blak-kong
|
7823e143db
|
临时提交：模式分配任务
|
2 years ago |
|
blak-kong
|
e846393f5d
|
合并冲突
|
2 years ago |
|
blak-kong
|
ad1fb93e14
|
扫码bug修复
|
2 years ago |
|
rongweikang
|
ab7e221405
|
Merge branch 'dev' of https://gitee.com/yunqiang_technology/flowsomwechat into dev
|
2 years ago |
|
rongweikang
|
07d684ff5f
|
页面跳转
|
2 years ago |
|
qsj
|
db8d3fe6dc
|
解决冲突
|
2 years ago |
|
qsj
|
9dfed2e66d
|
脸部
|
2 years ago |
|
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 |