1
0
forked from dyf/APP

319 Commits

Author SHA1 Message Date
779017919b 修复从类型跳转至首页时,首页数据按类型筛选 2026-01-12 17:29:49 +08:00
98162ca214 加入6107设备页面、蓝牙配对模式修复首次进入找不到设备的问题 2026-01-12 16:18:27 +08:00
78adc0bfed 首页更新,添加蓝牙电量显示 2026-01-06 16:13:28 +08:00
d08d109fd1 首页优化加蒙板 2025-12-24 17:04:52 +08:00
830288e107 修复首页蓝牙连接断开时更新状态,修复670 SOS报警时红色提示 2025-12-24 14:47:21 +08:00
fce2f2ebcf 首页修改,删除、重命名成功后,前端直接修改数据源 2025-12-24 11:40:36 +08:00
637658a762 优化首页的下拉刷新、数据排序、绑定后刷新 2025-12-24 10:52:28 +08:00
425b7b9cfd 修复6155蓝牙上报数据灯光状态不跟随变化的问题。 2025-12-19 13:37:14 +08:00
bf615de600 Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827 2025-12-19 09:33:24 +08:00
d3bdc0f358 merge upstream 2025-12-17 14:08:08 +08:00
4c48f0efec 日常小bug修复 2025-12-17 09:00:14 +08:00
5fdeb88103 Merge branch 'main' of http://47.107.152.87:3000/dyf/APP 2025-12-15 17:32:50 +08:00
666cbfba6d 7305,充电中,字体颜色修改 2025-12-15 17:32:46 +08:00
8a9a35b2bd 7305要13*13字体 2025-12-15 17:31:43 +08:00
80f0ec15b3 Merge branch 'main' of http://47.107.152.87:3000/dyf/APP 2025-12-15 16:03:22 +08:00
b7b080a976 提交 2025-12-15 16:03:19 +08:00
6fcf9c814b 7305充电状态修复 2025-12-15 16:00:29 +08:00
2cf02932e5 018A UI部分完成了 2025-12-15 10:22:05 +08:00
8ad20ad7fc Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827 2025-12-09 15:23:23 +08:00
5a558f1ed8 修改服务协议和隐私政策,添加注销账号功能 2025-12-09 15:23:07 +08:00
dyf
a6f7d066c7 Merge pull request 'new-20250827' (#26) from liubiao/APP:new-20250827 into main
Reviewed-on: dyf/APP#26
2025-12-03 16:50:58 +08:00
0f49f2fb19 提交210历史记录 2025-12-03 16:45:52 +08:00
6414bf3d7a 4877保存已选的配组 2025-12-03 11:42:05 +08:00
e2d07e984f 修复670灯光问题 2025-12-03 10:20:11 +08:00
cd6d529523 修复一个Uniapp蓝牙的坑,App首页蓝牙状态功能添加 2025-12-02 11:32:56 +08:00
5fec8eff30 102完成真机实测 2025-12-01 16:37:21 +08:00
9ca14b1f32 Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827 2025-12-01 16:25:52 +08:00
d265e8a1ab merge upstream 2025-12-01 16:25:01 +08:00
6a2688caf4 102真机测试完成 2025-12-01 16:24:22 +08:00
07bd22e848 删除多余图标文件 2025-11-29 15:24:47 +08:00
052a7116c5 蓝牙搜索页面修改,添加名称筛选,从设备详情进入时自动带上蓝牙名筛选 2025-11-27 10:53:22 +08:00
d01abf267e 合并主分支版本,修复从设备页去搜索无法响应验证设备的问题 2025-11-27 08:44:42 +08:00
8ccc37cb93 强跟泛光指令修改 2025-11-26 16:06:34 +08:00
ebbac4232a Merge branch 'main' of http://47.107.152.87:3000/dyf/APP 2025-11-26 15:57:54 +08:00
362b752087 6155添加强泛光指令 2025-11-26 15:57:52 +08:00
5c69e32c2d 修复6155使用加号添加设备没有监听的问题 2025-11-26 15:56:55 +08:00
e247acdd5e 6155人员信息合成一个06格式头发送 2025-11-26 11:12:05 +08:00
b01ad9d698 删除测试App的部分文件,修复loading有时不显示的问题 2025-11-25 16:08:45 +08:00
2ba53fcf92 merge upstream 2025-11-24 08:20:45 +08:00
97b6825420 修复6155人员信息第一个字体缺失问题,画布取值加载预热机制 2025-11-22 18:28:43 +08:00
14d6fa7ccb 修改区分图片,动画协议 2025-11-21 18:47:20 +08:00
8270cc77d7 Merge branch 'main' of http://47.107.152.87:3000/dyf/APP into new-20250827
# Conflicts:
#	pages/6155/deviceDetail.vue
2025-11-21 16:30:13 +08:00
ec6deab32a 合并主分支
# Conflicts:
#	pages/210/deviceControl/index.vue
#	pages/650/HBY650.vue
#	pages/common/index/index.vue
#	unpackage/dist/dev/app-plus/static/tabs/device-HL.png
#	unpackage/dist/dev/app-plus/static/tabs/device.png
#	unpackage/dist/dev/app-plus/static/tabs/my-HL.png
#	unpackage/dist/dev/app-plus/static/tabs/my.png
#	utils/BleReceive.js
#	utils/loading.js
2025-11-21 16:27:32 +08:00
1558045882 102主从机告警 2025-11-21 16:22:35 +08:00
27308e0ed1 Merge branch 'main' of http://47.107.152.87:3000/dyf/APP 2025-11-21 16:12:57 +08:00
76d40bc096 修改人员信息时间前后 2025-11-21 16:12:55 +08:00
31b189dd72 关闭压塑保证ios正常6155 2025-11-21 15:59:58 +08:00
fc1fad0579 ios 2025-11-21 14:43:23 +08:00
864dd59b4c Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827
# Conflicts:
#	pages/6155/deviceDetail.vue
2025-11-21 14:21:10 +08:00
4790892a24 merge upstream 2025-11-21 14:18:55 +08:00