|
|
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 |
|
|
|
f2e5e7c1f3
|
Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827
|
2025-11-17 15:31:14 +08:00 |
|
|
|
cb9ed0b1da
|
添加102
|
2025-11-14 17:28:20 +08:00 |
|
|
|
dadad6ed19
|
添加token过期，跳转到登录页
|
2025-11-12 09:51:35 +08:00 |
|
|
|
968d7a613d
|
6075页面功能开发
|
2025-11-08 10:33:00 +08:00 |
|
|
|
497cce1e45
|
670 SOS转到服务端进行
|
2025-09-24 11:34:15 +08:00 |
|
|
|
2adc73cdab
|
尝试解决主分支冲突
|
2025-09-24 08:35:34 +08:00 |
|
|
|
ff5e363ccc
|
Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827
|
2025-09-19 08:25:37 +08:00 |
|
|
|
cb44810c6b
|
670加入机器状态、设备详情加接口请求
|
2025-09-18 17:31:40 +08:00 |
|
|
|
9be161d8aa
|
注销账户功能页面开发
|
2025-09-18 16:46:32 +08:00 |
|
|
|
4123e7a869
|
Merge branch 'main' of http://47.107.152.87:3000/dyf/APP
|
2025-09-18 14:20:11 +08:00 |
|
|
|
5116ae4ff7
|
注销账号，账号安全页面功能开发
|
2025-09-18 14:20:08 +08:00 |
|
|
|
404e42a7d8
|
Merge branch 'liubiao-new-20250827'
# Conflicts:
# pages.json
|
2025-09-18 11:48:39 +08:00 |
|
|
|
d8f281a891
|
新增注册，找回密码功能页面
|
2025-09-17 16:05:50 +08:00 |
|
|
|
6331190f0d
|
增加蓝牙设备人员信息登记上传
|
2025-09-16 14:51:23 +08:00 |
|
|
|
9846fe2315
|
添加报警功能
|
2025-08-28 14:05:06 +08:00 |
|
|
|
c2aa8bfa2f
|
移植6155、650、670
|
2025-08-27 11:06:49 +08:00 |
|
|
|
cd912b861e
|
670完成
|
2025-08-27 09:08:59 +08:00 |
|
|
|
dfb6f29683
|
670完成
|
2025-08-26 15:42:26 +08:00 |
|
|
|
e56bbfe674
|
优化设备控制，提交后，实时获取设备返回状态信息
|
2025-08-14 13:46:57 +08:00 |
|
|
|
47a9dace85
|
Merge branch 'main' of http://47.107.152.87:3000/dyf/APP
# Conflicts:
# pages.json
# unpackage/dist/dev/app-plus/app-config-service.js
# unpackage/dist/dev/app-plus/app-service.js
# unpackage/dist/dev/app-plus/app-view.js
# unpackage/dist/dev/app-plus/manifest.json
# utils/request.js
|
2025-08-11 15:21:37 +08:00 |
|
|
|
3ab58ac29e
|
修复6170测试中出现的bug
|
2025-08-08 17:34:46 +08:00 |
|
|
|
6c5a702ff9
|
地图打点动态数据加载，
|
2025-08-05 19:02:04 +08:00 |
|
|
|
c7d7149d2f
|
关闭灯光
|
2025-07-31 14:03:28 +08:00 |
|
|
|
e5e2aca0c4
|
Merge branch 'main' of http://47.107.152.87:3000/liubiao/APP
# Conflicts:
# .gitignore
# pages/common/index/index.vue
# unpackage/dist/dev/app-plus/app-config-service.js
# unpackage/dist/dev/app-plus/app-service.js
# unpackage/dist/dev/app-plus/app-view.js
# unpackage/dist/dev/app-plus/manifest.json
# utils/request.js
|
2025-07-29 09:40:01 +08:00 |
|
|
|
3c0bf2f770
|
添加蓝牙通讯握手
|
2025-07-29 09:34:15 +08:00 |
|
|
|
864f7f58a0
|
分享设备相关的功能
|
2025-07-22 17:47:38 +08:00 |
|
|
|
1663ae75e4
|
6170分享设备页面功能开发
|
2025-07-19 10:22:48 +08:00 |
|
|
|
56f05e7eec
|
解绑传参方式修改，隐私协议，用户协议，跳转相对应路径
|
2025-07-14 16:10:57 +08:00 |
|
|
|
89464f3696
|
6155前端功能完成
|
2025-07-14 09:46:58 +08:00 |
|
|
|
cc0ad19e2d
|
6155部分功能
|
2025-07-11 16:11:40 +08:00 |
|
|
|
82fd1574c8
|
设备列表，设备绑定，删除，修改设备名
|
2025-07-09 13:41:42 +08:00 |
|
|
|
e69ff064d5
|
app网络请求封装修改
|
2025-07-07 18:59:34 +08:00 |
|
|
|
1128114e73
|
网络请求，封装简化注释
|
2025-07-07 11:27:24 +08:00 |
|
