liubiao/APP
1
0
Fork 0
forked from dyf/APP
Code Pull Requests Activity

解决版本冲突

Browse Source
This commit is contained in:
liub
2025-08-18 08:49:46 +08:00
parent 535f4728ea 823c54aed7
commit 76329756c9
8 changed files with 2195 additions and 1949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

415
pages.json
View File

@ -1,197 +1,222 @@
{
"pages": [
{
"path": "pages/common/login/index",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/common/index/index",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/common/user/index",
"style": {
"navigationBarTitleText": "我的"
}
},
{
"path": "pages/common/scan/scan",
"style": {
"navigationBarTitleText": "扫描"
}
},
{
"path": "pages/common/qrcode/qrcode",
"style": {
"navigationBarTitleText": "扫描到的设备"
}
},
{
"path": "pages/common/send/index",
"style": {
"navigationBarTitleText": "发送信息"
}
},
{
"path": "pages/common/userAgreement/index",
"style": {
"navigationBarTitleText": "用户协议"
}
},
{
"path": "pages/common/privacyAgreement/index",
"style": {
"navigationBarTitleText": "隐私协议"
}
},
{
"path": "pages/common/aboutUs/index",
"style": {
"navigationBarTitleText": "关于我们"
}
},
{
"path": "pages/6170/deviceControl/index",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/common/operationVideo/index",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/common/addvideo/index",
"style": {
"navigationStyle": "custom"
}
},
// 操作说明
{
"path": "pages/common/operatingInstruct/index",
"style": {
"navigationStyle": "custom"
}
},
// 产品说明
{
"path": "pages/common/productDes/index",
"style": {
"navigationStyle": "custom"
}
},
{
"path" : "pages/common/addBLE/addEquip",
"style" :
{
"navigationBarTitleText" : "添加设备"
}
},
{
"path" : "pages/common/addBLE/LinkBle",
"style" :
{
"navigationBarTitleText" : "扫描到的设备"
}
},
{
"path" : "pages/6155/deviceDetail",
"style" :
{
"navigationBarTitleText" : "HBY 6155"
}
},
{
"path" : "pages/6155/ImgCrop",
"style" :
{
"navigationBarTitleText" : "图像裁剪",
"navigationStyle": "custom",
"fullscreen": true
}
},
{
"path" : "pages/650/HBY650",
"style" :
{
"navigationBarTitleText" : "HBY650"
}
},
{
"path": "pages/common/map/index",
"style": {
"navigationBarTitleText": "地图"
}
},
{
"path": "pages/common/allType/index",
"style": {
"navigationBarTitleText": "所有类型"
}
},
{
"path": "pages/6170/allShare/index",
"style": {
"navigationBarTitleText": "所有分享"
}
},
{
"path": "pages/6170/share/index",
"style": {
"navigationBarTitleText": "分享"
}
},
{
"path": "pages/6170/shareDevices/index",
"style": {
"navigationBarTitleText": "分享设备"
}
},
{
"path": "pages/6170/shareManagement/index",
"style": {
"navigationBarTitleText": "分享管理"
}
}
],
"tabBar": {
"color": "#fff",
"selectedColor": "#BBE600",
"backgroundColor": "#202020",
"list": [{
"pagePath": "pages/common/index/index",
"text": "我的设备",
"iconPath": "/static/tabs/device.png",
"selectedIconPath": "/static/tabs/device-HL.png"
},
{
"pagePath": "pages/common/user/index",
"text": "我的",
"iconPath": "/static/tabs/my.png",
"selectedIconPath": "/static/tabs/my-HL.png"
}
]
},
"globalStyle": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#121212",
"backgroundColor": "#121212"
},
"uniIdRouter": {}
"pages": [
{
"path": "pages/common/login/index",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/common/index/index",
"style": {
"navigationStyle": "custom",
"enablePullDownRefresh": true
}
},
{
"path": "pages/common/user/index",
"style": {
"navigationBarTitleText": "我的"
}
},
{
"path": "pages/common/scan/scan",
"style": {
"navigationBarTitleText": "扫描"
}
},
{
"path": "pages/common/qrcode/qrcode",
"style": {
"navigationBarTitleText": "扫描到的设备"
}
},
{
"path": "pages/common/send/index",
"style": {
"navigationBarTitleText": "发送信息",
"enablePullDownRefresh": true
}
},
{
"path": "pages/common/userAgreement/index",
"style": {
"navigationBarTitleText": "用户协议"
}
},
{
"path": "pages/common/privacyAgreement/index",
"style": {
"navigationBarTitleText": "隐私协议"
}
},
{
"path": "pages/common/aboutUs/index",
"style": {
"navigationBarTitleText": "关于我们"
}
},
{
"path": "pages/6170/deviceControl/index",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/6170/callPolice/index",
"style": {
"navigationBarTitleText": "报警"
}
},
{
"path": "pages/210/deviceControl/index",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/common/operationVideo/index",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/common/addvideo/index",
"style": {
"navigationStyle": "custom"
}
},
// 操作说明
{
"path": "pages/common/operatingInstruct/index",
"style": {
"navigationStyle": "custom"
}
},
// 产品说明
{
"path": "pages/common/productDes/index",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "pages/common/addBLE/addEquip",
"style": {
"navigationBarTitleText": "添加设备"
}
},
{
"path": "pages/common/addBLE/LinkBle",
"style": {
"navigationBarTitleText": "扫描到的设备"
}
},
{
"path": "pages/6155/deviceDetail",
"style": {
"navigationBarTitleText": "HBY 6155"
}
},
{
"path": "pages/6155/ImgCrop",
"style": {
"navigationBarTitleText": "图像裁剪",
"navigationStyle": "custom",
"fullscreen": true
}
},
{
"path": "pages/650/HBY650",
"style": {
"navigationBarTitleText": "HBY650"
}
},
{
"path": "pages/common/map/index",
"style": {
"navigationBarTitleText": "地图"
}
},
{
"path": "pages/common/allType/index",
"style": {
"navigationBarTitleText": "所有类型"
}
},
{
"path": "pages/6170/allShare/index",
"style": {
"navigationBarTitleText": "所有分享"
}
},
{
"path": "pages/6170/share/index",
"style": {
"navigationBarTitleText": "分享"
}
},
{
"path": "pages/6170/shareDevices/index",
"style": {
"navigationBarTitleText": "分享设备"
}
},
{
"path": "pages/6170/shareManagement/index",
"style": {
"navigationBarTitleText": "分享管理"
}
},
{
"path": "pages/210/onlineDevice/index",
"style": {
"navigationBarTitleText": "联机设备"
}
},
{
"path": "pages/210/addDevice/index",
"style": {
"navigationBarTitleText": "添加联机设备"
}
},
{
"path": "pages/210/historyRecords/index",
"style": {
"navigationBarTitleText": "历史记录"
}
},
{
"path": "pages/210/call/index",
"style": {
"navigationBarTitleText": "呼叫"
}
}
],
"tabBar": {
"color": "#fff",
"selectedColor": "#BBE600",
"backgroundColor": "#202020",
"list": [
{
"pagePath": "pages/common/index/index",
"text": "我的设备",
"iconPath": "/static/tabs/device.png",
"selectedIconPath": "/static/tabs/device-HL.png"
},
{
"pagePath": "pages/common/user/index",
"text": "我的",
"iconPath": "/static/tabs/my.png",
"selectedIconPath": "/static/tabs/my-HL.png"
}
]
},
"globalStyle": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#121212",
"backgroundColor": "#121212"
},
"uniIdRouter": {}
}