diff --git a/pages.json b/pages.json index 0e93d23..b3f0e56 100644 --- a/pages.json +++ b/pages.json @@ -26,19 +26,7 @@ ] }, { - "root": "pages/addDeviceForWiFi", - "pages": [ - { - "path": "distributionNetwork", - "style": { - "navigationBarTitleText": "WiFi配网", - "disableScroll": true - } - } - ] - }, - { - "root": "pages/addDeviceForBluetooth", + "root": "pages/addDevice", "pages": [ { "path": "addLockGuid", @@ -66,6 +54,20 @@ "navigationBarTitleText": "锁地址", "disableScroll": true } + }, + { + "path": "distributionNetwork", + "style": { + "navigationBarTitleText": "WiFi配网", + "disableScroll": true + } + }, + { + "path": "selectDeviceType", + "style": { + "navigationBarTitleText": "选择设备类型", + "disableScroll": true + } } ] }, @@ -132,18 +134,11 @@ "navigationBarTitleText": "有效期", "disableScroll": true } - }, - { - "path": "selectDeviceType", - "style": { - "navigationBarTitleText": "选择设备类型", - "disableScroll": true - } } ] }, { - "root": "pages/featureForBluetooth", + "root": "pages/feature", "pages": [ { "path": "createPassword", @@ -326,11 +321,52 @@ "navigationBarTitleText": "操作记录详情", "disableScroll": true } + }, + { + "path": "createAdmin", + "style": { + "navigationBarTitleText": "创建授权管理员", + "disableScroll": true + } + }, + { + "path": "keyDetail", + "style": { + "disableScroll": true, + "navigationBarTitleText": "钥匙详情" + } + }, + { + "path": "adminDetail", + "style": { + "navigationBarTitleText": "授权管理员详情", + "disableScroll": true + } + }, + { + "path": "adminList", + "style": { + "navigationBarTitleText": "授权管理员", + "disableScroll": true + } + }, + { + "path": "createKey", + "style": { + "navigationBarTitleText": "发送钥匙" + } + }, + { + "path": "keyList", + "style": { + "disableScroll": true, + "navigationBarTitleText": "电子钥匙" + } } ] }, { - "root": "pages/settingForBluetooth", + "root": "pages/setting", "pages": [ { "path": "videoSlot", @@ -521,52 +557,6 @@ } } ] - }, - { - "root": "pages/lockUserManage", - "pages": [ - { - "path": "createAdmin", - "style": { - "navigationBarTitleText": "创建授权管理员", - "disableScroll": true - } - }, - { - "path": "keyDetail", - "style": { - "disableScroll": true, - "navigationBarTitleText": "钥匙详情" - } - }, - { - "path": "adminDetail", - "style": { - "navigationBarTitleText": "授权管理员详情", - "disableScroll": true - } - }, - { - "path": "adminList", - "style": { - "navigationBarTitleText": "授权管理员", - "disableScroll": true - } - }, - { - "path": "createKey", - "style": { - "navigationBarTitleText": "发送钥匙" - } - }, - { - "path": "keyList", - "style": { - "disableScroll": true, - "navigationBarTitleText": "电子钥匙" - } - } - ] } ], "pages": [ @@ -591,10 +581,10 @@ ], "preloadRule": { "pages/main/home": { - "packages": ["pages/others", "pages/addDeviceForBluetooth", "pages/p2p"] + "packages": ["pages/others", "pages/addDevice", "pages/p2p"] }, "pages/main/lockDetail": { - "packages": ["pages/lockUserManage", "pages/featureForBluetooth", "pages/settingForBluetooth"] + "packages": ["pages/feature", "pages/setting"] }, "pages/main/mine": { "packages": ["pages/user"] diff --git a/pages/addDeviceForBluetooth/addLockGuid.vue b/pages/addDevice/addLockGuid.vue similarity index 100% rename from pages/addDeviceForBluetooth/addLockGuid.vue rename to pages/addDevice/addLockGuid.vue diff --git a/pages/addDeviceForBluetooth/bindLock.vue b/pages/addDevice/bindLock.vue similarity index 100% rename from pages/addDeviceForBluetooth/bindLock.vue rename to pages/addDevice/bindLock.vue diff --git a/pages/addDeviceForWiFi/distributionNetwork.vue b/pages/addDevice/distributionNetwork.vue similarity index 99% rename from pages/addDeviceForWiFi/distributionNetwork.vue rename to pages/addDevice/distributionNetwork.vue index 3f81fbc..c0a6c76 100644 --- a/pages/addDeviceForWiFi/distributionNetwork.vue +++ b/pages/addDevice/distributionNetwork.vue @@ -29,7 +29,7 @@ 密码 - - + --> diff --git a/pages/addDeviceForBluetooth/searchDevice.vue b/pages/addDevice/searchDevice.vue similarity index 100% rename from pages/addDeviceForBluetooth/searchDevice.vue rename to pages/addDevice/searchDevice.vue diff --git a/pages/addDeviceForBluetooth/selectAddress.vue b/pages/addDevice/selectAddress.vue similarity index 100% rename from pages/addDeviceForBluetooth/selectAddress.vue rename to pages/addDevice/selectAddress.vue diff --git a/pages/others/selectDeviceType.vue b/pages/addDevice/selectDeviceType.vue similarity index 100% rename from pages/others/selectDeviceType.vue rename to pages/addDevice/selectDeviceType.vue diff --git a/pages/lockUserManage/adminDetail.vue b/pages/feature/adminDetail.vue similarity index 100% rename from pages/lockUserManage/adminDetail.vue rename to pages/feature/adminDetail.vue diff --git a/pages/lockUserManage/adminList.vue b/pages/feature/adminList.vue similarity index 99% rename from pages/lockUserManage/adminList.vue rename to pages/feature/adminList.vue index ccfa4e8..4d7cd40 100644 --- a/pages/lockUserManage/adminList.vue +++ b/pages/feature/adminList.vue @@ -13,9 +13,9 @@ .search { - padding: 32rpx; width: 686rpx !important; + padding: 32rpx; } .button { - display: flex; - align-items: center; position: fixed; bottom: calc(env(safe-area-inset-bottom) + 20rpx); + display: flex; + align-items: center; font-weight: bold; .button-create { - margin-left: 32rpx; width: 686rpx; height: 88rpx; - background-color: #63b8af; + margin-left: 32rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #63b8af; border-radius: 44rpx; } } @@ -344,29 +344,29 @@ .item { display: flex; align-items: center; - background-color: #ffffff; - height: 120rpx; width: 750rpx; + height: 120rpx; + background-color: #ffffff; .item-left { - margin-left: 32rpx; width: 80rpx; height: 80rpx; + margin-left: 32rpx; } .item-right { + width: 574rpx; margin-right: 32rpx; margin-left: 32rpx; - width: 574rpx; .item-right-top { max-width: 400rpx; - font-size: 32rpx; - font-weight: bold; padding-bottom: 6rpx; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: 32rpx; + font-weight: bold; + white-space: nowrap; } .item-right-bottom { @@ -390,9 +390,9 @@ } .empty-list-text { - text-align: center; font-size: 32rpx; color: #999999; + text-align: center; } .status { diff --git a/pages/featureForBluetooth/bindCard.vue b/pages/feature/bindCard.vue similarity index 100% rename from pages/featureForBluetooth/bindCard.vue rename to pages/feature/bindCard.vue diff --git a/pages/featureForBluetooth/bindFace.vue b/pages/feature/bindFace.vue similarity index 100% rename from pages/featureForBluetooth/bindFace.vue rename to pages/feature/bindFace.vue diff --git a/pages/featureForBluetooth/bindFingerprint.vue b/pages/feature/bindFingerprint.vue similarity index 100% rename from pages/featureForBluetooth/bindFingerprint.vue rename to pages/feature/bindFingerprint.vue diff --git a/pages/featureForBluetooth/bindPalmVein.vue b/pages/feature/bindPalmVein.vue similarity index 100% rename from pages/featureForBluetooth/bindPalmVein.vue rename to pages/feature/bindPalmVein.vue diff --git a/pages/featureForBluetooth/bindRemote.vue b/pages/feature/bindRemote.vue similarity index 100% rename from pages/featureForBluetooth/bindRemote.vue rename to pages/feature/bindRemote.vue diff --git a/pages/featureForBluetooth/cardDetail.vue b/pages/feature/cardDetail.vue similarity index 100% rename from pages/featureForBluetooth/cardDetail.vue rename to pages/feature/cardDetail.vue diff --git a/pages/featureForBluetooth/cardList.vue b/pages/feature/cardList.vue similarity index 99% rename from pages/featureForBluetooth/cardList.vue rename to pages/feature/cardList.vue index 09cee70..22c19c7 100644 --- a/pages/featureForBluetooth/cardList.vue +++ b/pages/feature/cardList.vue @@ -13,9 +13,9 @@ .search { - padding: 32rpx; width: 686rpx !important; + padding: 32rpx; } .button { - display: flex; - align-items: center; position: fixed; bottom: calc(env(safe-area-inset-bottom) + 20rpx); + display: flex; + align-items: center; font-weight: bold; .button-reset { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #df282d; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #df282d; border-radius: 44rpx; } .button-create { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #63b8af; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #63b8af; border-radius: 44rpx; } } @@ -410,29 +410,29 @@ .item { display: flex; align-items: center; - background-color: #ffffff; - height: 120rpx; width: 750rpx; + height: 120rpx; + background-color: #ffffff; .item-left { - margin-left: 32rpx; width: 80rpx; height: 80rpx; + margin-left: 32rpx; } .item-right { + width: 574rpx; margin-right: 32rpx; margin-left: 32rpx; - width: 574rpx; .item-right-top { max-width: 400rpx; - font-size: 32rpx; - font-weight: bold; padding-bottom: 6rpx; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: 32rpx; + font-weight: bold; + white-space: nowrap; } .item-right-bottom { @@ -456,9 +456,9 @@ } .empty-list-text { - text-align: center; font-size: 32rpx; color: #999999; + text-align: center; } .status { diff --git a/pages/lockUserManage/createAdmin.vue b/pages/feature/createAdmin.vue similarity index 100% rename from pages/lockUserManage/createAdmin.vue rename to pages/feature/createAdmin.vue diff --git a/pages/featureForBluetooth/createCard.vue b/pages/feature/createCard.vue similarity index 100% rename from pages/featureForBluetooth/createCard.vue rename to pages/feature/createCard.vue diff --git a/pages/featureForBluetooth/createFace.vue b/pages/feature/createFace.vue similarity index 100% rename from pages/featureForBluetooth/createFace.vue rename to pages/feature/createFace.vue diff --git a/pages/featureForBluetooth/createFingerprint.vue b/pages/feature/createFingerprint.vue similarity index 100% rename from pages/featureForBluetooth/createFingerprint.vue rename to pages/feature/createFingerprint.vue diff --git a/pages/lockUserManage/createKey.vue b/pages/feature/createKey.vue similarity index 100% rename from pages/lockUserManage/createKey.vue rename to pages/feature/createKey.vue diff --git a/pages/featureForBluetooth/createPalmVein.vue b/pages/feature/createPalmVein.vue similarity index 100% rename from pages/featureForBluetooth/createPalmVein.vue rename to pages/feature/createPalmVein.vue diff --git a/pages/featureForBluetooth/createPassword.vue b/pages/feature/createPassword.vue similarity index 100% rename from pages/featureForBluetooth/createPassword.vue rename to pages/feature/createPassword.vue diff --git a/pages/featureForBluetooth/createRemote.vue b/pages/feature/createRemote.vue similarity index 100% rename from pages/featureForBluetooth/createRemote.vue rename to pages/feature/createRemote.vue diff --git a/pages/featureForBluetooth/faceDetail.vue b/pages/feature/faceDetail.vue similarity index 100% rename from pages/featureForBluetooth/faceDetail.vue rename to pages/feature/faceDetail.vue diff --git a/pages/featureForBluetooth/faceList.vue b/pages/feature/faceList.vue similarity index 99% rename from pages/featureForBluetooth/faceList.vue rename to pages/feature/faceList.vue index 74152c4..f18c453 100644 --- a/pages/featureForBluetooth/faceList.vue +++ b/pages/feature/faceList.vue @@ -13,9 +13,9 @@ .search { - padding: 32rpx; width: 686rpx !important; + padding: 32rpx; } .button { - display: flex; - align-items: center; position: fixed; bottom: calc(env(safe-area-inset-bottom) + 20rpx); + display: flex; + align-items: center; font-weight: bold; .button-reset { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #df282d; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #df282d; border-radius: 44rpx; } .button-create { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #63b8af; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #63b8af; border-radius: 44rpx; } } @@ -411,29 +411,29 @@ .item { display: flex; align-items: center; - background-color: #ffffff; - height: 120rpx; width: 750rpx; + height: 120rpx; + background-color: #ffffff; .item-left { - margin-left: 32rpx; width: 80rpx; height: 80rpx; + margin-left: 32rpx; } .item-right { + width: 574rpx; margin-right: 32rpx; margin-left: 32rpx; - width: 574rpx; .item-right-top { max-width: 400rpx; - font-size: 32rpx; - font-weight: bold; padding-bottom: 6rpx; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: 32rpx; + font-weight: bold; + white-space: nowrap; } .item-right-bottom { @@ -457,9 +457,9 @@ } .empty-list-text { - text-align: center; font-size: 32rpx; color: #999999; + text-align: center; } .status { diff --git a/pages/featureForBluetooth/fingerprintDetail.vue b/pages/feature/fingerprintDetail.vue similarity index 100% rename from pages/featureForBluetooth/fingerprintDetail.vue rename to pages/feature/fingerprintDetail.vue diff --git a/pages/featureForBluetooth/fingerprintList.vue b/pages/feature/fingerprintList.vue similarity index 99% rename from pages/featureForBluetooth/fingerprintList.vue rename to pages/feature/fingerprintList.vue index 21d1fe6..a6f2e92 100644 --- a/pages/featureForBluetooth/fingerprintList.vue +++ b/pages/feature/fingerprintList.vue @@ -13,9 +13,9 @@ .search { - padding: 32rpx; width: 686rpx !important; + padding: 32rpx; } .button { - display: flex; - align-items: center; position: fixed; bottom: calc(env(safe-area-inset-bottom) + 20rpx); + display: flex; + align-items: center; font-weight: bold; .button-reset { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #df282d; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #df282d; border-radius: 44rpx; } .button-create { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #63b8af; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #63b8af; border-radius: 44rpx; } } @@ -410,29 +410,29 @@ .item { display: flex; align-items: center; - background-color: #ffffff; - height: 120rpx; width: 750rpx; + height: 120rpx; + background-color: #ffffff; .item-left { - margin-left: 32rpx; width: 80rpx; height: 80rpx; + margin-left: 32rpx; } .item-right { + width: 574rpx; margin-right: 32rpx; margin-left: 32rpx; - width: 574rpx; .item-right-top { max-width: 400rpx; - font-size: 32rpx; - font-weight: bold; padding-bottom: 6rpx; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: 32rpx; + font-weight: bold; + white-space: nowrap; } .item-right-bottom { @@ -456,9 +456,9 @@ } .empty-list-text { - text-align: center; font-size: 32rpx; color: #999999; + text-align: center; } .status { diff --git a/pages/lockUserManage/keyDetail.vue b/pages/feature/keyDetail.vue similarity index 100% rename from pages/lockUserManage/keyDetail.vue rename to pages/feature/keyDetail.vue diff --git a/pages/lockUserManage/keyList.vue b/pages/feature/keyList.vue similarity index 99% rename from pages/lockUserManage/keyList.vue rename to pages/feature/keyList.vue index 37da67e..6d6ebbe 100644 --- a/pages/lockUserManage/keyList.vue +++ b/pages/feature/keyList.vue @@ -13,9 +13,9 @@ .search { - margin-top: 32rpx; width: 686rpx !important; + margin-top: 32rpx; margin-left: 32rpx; } .button { - display: flex; - align-items: center; position: fixed; bottom: calc(env(safe-area-inset-bottom) + 48rpx); + display: flex; + align-items: center; font-weight: bold; .button-reset { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #df282d; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #df282d; border-radius: 44rpx; } .button-create { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #63b8af; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #63b8af; border-radius: 44rpx; } } @@ -404,37 +404,37 @@ .key { display: flex; align-items: center; - background-color: #ffffff; - height: 120rpx; width: 750rpx; + height: 120rpx; + background-color: #ffffff; .key-left { - margin-left: 32rpx; width: 80rpx; height: 80rpx; + margin-left: 32rpx; border-radius: 50%; } .key-right { - margin-left: 32rpx; - margin-right: 32rpx; width: 574rpx; + margin-right: 32rpx; + margin-left: 32rpx; .key-right-top { max-width: 400rpx; - font-size: 32rpx; - font-weight: bold; padding-bottom: 6rpx; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: 32rpx; + font-weight: bold; + white-space: nowrap; } .key-admin { - margin-top: 8rpx; - margin-left: 10rpx; width: 25rpx; height: 25rpx; + margin-top: 8rpx; + margin-left: 10rpx; } .key-right-bottom { @@ -465,8 +465,8 @@ } .empty-list-text { - text-align: center; font-size: 32rpx; color: #999999; + text-align: center; } diff --git a/pages/featureForBluetooth/palmVeinDetail.vue b/pages/feature/palmVeinDetail.vue similarity index 100% rename from pages/featureForBluetooth/palmVeinDetail.vue rename to pages/feature/palmVeinDetail.vue diff --git a/pages/featureForBluetooth/palmVeinList.vue b/pages/feature/palmVeinList.vue similarity index 99% rename from pages/featureForBluetooth/palmVeinList.vue rename to pages/feature/palmVeinList.vue index 51e8111..810bf21 100644 --- a/pages/featureForBluetooth/palmVeinList.vue +++ b/pages/feature/palmVeinList.vue @@ -13,9 +13,9 @@ .search { - padding: 32rpx; width: 686rpx !important; + padding: 32rpx; } .button { - display: flex; - align-items: center; position: fixed; bottom: calc(env(safe-area-inset-bottom) + 20rpx); + display: flex; + align-items: center; font-weight: bold; .button-reset { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #df282d; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #df282d; border-radius: 44rpx; } .button-create { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #63b8af; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #63b8af; border-radius: 44rpx; } } @@ -415,29 +415,29 @@ .item { display: flex; align-items: center; - background-color: #ffffff; - height: 120rpx; width: 750rpx; + height: 120rpx; + background-color: #ffffff; .item-left { - margin-left: 32rpx; width: 80rpx; height: 80rpx; + margin-left: 32rpx; } .item-right { + width: 574rpx; margin-right: 32rpx; margin-left: 32rpx; - width: 574rpx; .item-right-top { max-width: 400rpx; - font-size: 32rpx; - font-weight: bold; padding-bottom: 6rpx; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: 32rpx; + font-weight: bold; + white-space: nowrap; } .item-right-bottom { @@ -461,9 +461,9 @@ } .empty-list-text { - text-align: center; font-size: 32rpx; color: #999999; + text-align: center; } .status { diff --git a/pages/featureForBluetooth/passwordDetail.vue b/pages/feature/passwordDetail.vue similarity index 100% rename from pages/featureForBluetooth/passwordDetail.vue rename to pages/feature/passwordDetail.vue diff --git a/pages/featureForBluetooth/passwordList.vue b/pages/feature/passwordList.vue similarity index 99% rename from pages/featureForBluetooth/passwordList.vue rename to pages/feature/passwordList.vue index 09ce4af..dcf8c37 100644 --- a/pages/featureForBluetooth/passwordList.vue +++ b/pages/feature/passwordList.vue @@ -13,9 +13,9 @@ .search { - margin-top: 32rpx; width: 686rpx !important; + margin-top: 32rpx; margin-left: 32rpx; } .button { - display: flex; - align-items: center; position: fixed; bottom: calc(env(safe-area-inset-bottom) + 48rpx); + display: flex; + align-items: center; font-weight: bold; .button-reset { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #df282d; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #df282d; border-radius: 44rpx; } .button-create { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #63b8af; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #63b8af; border-radius: 44rpx; } } @@ -379,29 +379,29 @@ .password { display: flex; align-items: center; - background-color: #ffffff; - height: 120rpx; width: 750rpx; + height: 120rpx; + background-color: #ffffff; .password-left { - margin-left: 32rpx; width: 80rpx; height: 80rpx; + margin-left: 32rpx; } .password-right { + width: 574rpx; margin-right: 32rpx; margin-left: 32rpx; - width: 574rpx; .password-right-top { max-width: 400rpx; - font-size: 32rpx; - font-weight: bold; padding-bottom: 6rpx; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: 32rpx; + font-weight: bold; + white-space: nowrap; } .password-right-bottom { @@ -425,9 +425,9 @@ } .empty-list-text { - text-align: center; font-size: 32rpx; color: #999999; + text-align: center; } .key-status { diff --git a/pages/featureForBluetooth/recordDetail.vue b/pages/feature/recordDetail.vue similarity index 100% rename from pages/featureForBluetooth/recordDetail.vue rename to pages/feature/recordDetail.vue diff --git a/pages/featureForBluetooth/recordList.vue b/pages/feature/recordList.vue similarity index 100% rename from pages/featureForBluetooth/recordList.vue rename to pages/feature/recordList.vue diff --git a/pages/featureForBluetooth/remoteDetail.vue b/pages/feature/remoteDetail.vue similarity index 100% rename from pages/featureForBluetooth/remoteDetail.vue rename to pages/feature/remoteDetail.vue diff --git a/pages/featureForBluetooth/remoteList.vue b/pages/feature/remoteList.vue similarity index 99% rename from pages/featureForBluetooth/remoteList.vue rename to pages/feature/remoteList.vue index 86a9206..3853299 100644 --- a/pages/featureForBluetooth/remoteList.vue +++ b/pages/feature/remoteList.vue @@ -13,9 +13,9 @@ .search { - padding: 32rpx; width: 686rpx !important; + padding: 32rpx; } .button { - display: flex; - align-items: center; position: fixed; bottom: calc(env(safe-area-inset-bottom) + 20rpx); + display: flex; + align-items: center; font-weight: bold; .button-reset { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #df282d; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #df282d; border-radius: 44rpx; } .button-create { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #63b8af; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #63b8af; border-radius: 44rpx; } } @@ -413,29 +413,29 @@ .item { display: flex; align-items: center; - background-color: #ffffff; - height: 120rpx; width: 750rpx; + height: 120rpx; + background-color: #ffffff; .item-left { - margin-left: 32rpx; width: 80rpx; height: 80rpx; + margin-left: 32rpx; } .item-right { + width: 574rpx; margin-right: 32rpx; margin-left: 32rpx; - width: 574rpx; .item-right-top { max-width: 400rpx; - font-size: 32rpx; - font-weight: bold; padding-bottom: 6rpx; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: 32rpx; + font-weight: bold; + white-space: nowrap; } .item-right-bottom { @@ -459,9 +459,9 @@ } .empty-list-text { - text-align: center; font-size: 32rpx; color: #999999; + text-align: center; } .status { diff --git a/pages/featureForBluetooth/typeRecordList.vue b/pages/feature/typeRecordList.vue similarity index 100% rename from pages/featureForBluetooth/typeRecordList.vue rename to pages/feature/typeRecordList.vue diff --git a/pages/main/home.vue b/pages/main/home.vue index 45605ef..c41a2b9 100644 --- a/pages/main/home.vue +++ b/pages/main/home.vue @@ -17,11 +17,11 @@ v-if="!(lockList.length === 0 && lockSearch.searchStr === '' && !focus)" > { console.log(1111113, error) - }0 + } const startVoice = () => { - console.log(1111113, playerRef.value) + const page = getCurrentPages().pop() + const playerRef = page.selectComponent('#playerRef') + console.log(1111113, playerRef) + playerRef.requestFullScreen() // const voiceNode = res[0].node // if (voiceNode) { // voiceNode.startVoice({ diff --git a/pages/settingForBluetooth/autoLock.vue b/pages/setting/autoLock.vue similarity index 100% rename from pages/settingForBluetooth/autoLock.vue rename to pages/setting/autoLock.vue diff --git a/pages/settingForBluetooth/catEye.vue b/pages/setting/catEye.vue similarity index 100% rename from pages/settingForBluetooth/catEye.vue rename to pages/setting/catEye.vue diff --git a/pages/settingForBluetooth/catEyeMode.vue b/pages/setting/catEyeMode.vue similarity index 100% rename from pages/settingForBluetooth/catEyeMode.vue rename to pages/setting/catEyeMode.vue diff --git a/pages/settingForBluetooth/coercionFingerprint.vue b/pages/setting/coercionFingerprint.vue similarity index 99% rename from pages/settingForBluetooth/coercionFingerprint.vue rename to pages/setting/coercionFingerprint.vue index 0e4e950..f264e99 100644 --- a/pages/settingForBluetooth/coercionFingerprint.vue +++ b/pages/setting/coercionFingerprint.vue @@ -13,9 +13,9 @@ .search { - padding: 32rpx; width: 686rpx !important; + padding: 32rpx; } .button { - display: flex; - align-items: center; position: fixed; bottom: calc(env(safe-area-inset-bottom) + 20rpx); + display: flex; + align-items: center; font-weight: bold; .button-reset { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #df282d; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #df282d; border-radius: 44rpx; } .button-create { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #63b8af; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #63b8af; border-radius: 44rpx; } } @@ -274,29 +274,29 @@ .item { display: flex; align-items: center; - background-color: #ffffff; - height: 120rpx; width: 750rpx; + height: 120rpx; + background-color: #ffffff; .item-left { - margin-left: 32rpx; width: 80rpx; height: 80rpx; + margin-left: 32rpx; } .item-right { + width: 574rpx; margin-right: 32rpx; margin-left: 32rpx; - width: 574rpx; .item-right-top { max-width: 400rpx; - font-size: 32rpx; - font-weight: bold; padding-bottom: 6rpx; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: 32rpx; + font-weight: bold; + white-space: nowrap; } .item-right-bottom { @@ -320,9 +320,9 @@ } .empty-list-text { - text-align: center; font-size: 32rpx; color: #999999; + text-align: center; } .status { diff --git a/pages/settingForBluetooth/coercionOpenDoor.vue b/pages/setting/coercionOpenDoor.vue similarity index 100% rename from pages/settingForBluetooth/coercionOpenDoor.vue rename to pages/setting/coercionOpenDoor.vue diff --git a/pages/settingForBluetooth/customCatEye.vue b/pages/setting/customCatEye.vue similarity index 100% rename from pages/settingForBluetooth/customCatEye.vue rename to pages/setting/customCatEye.vue diff --git a/pages/settingForBluetooth/faceSetting.vue b/pages/setting/faceSetting.vue similarity index 100% rename from pages/settingForBluetooth/faceSetting.vue rename to pages/setting/faceSetting.vue diff --git a/pages/settingForBluetooth/lockDate.vue b/pages/setting/lockDate.vue similarity index 100% rename from pages/settingForBluetooth/lockDate.vue rename to pages/setting/lockDate.vue diff --git a/pages/settingForBluetooth/lockInfo.vue b/pages/setting/lockInfo.vue similarity index 100% rename from pages/settingForBluetooth/lockInfo.vue rename to pages/setting/lockInfo.vue diff --git a/pages/settingForBluetooth/lockSound.vue b/pages/setting/lockSound.vue similarity index 100% rename from pages/settingForBluetooth/lockSound.vue rename to pages/setting/lockSound.vue diff --git a/pages/settingForBluetooth/lockUser.vue b/pages/setting/lockUser.vue similarity index 99% rename from pages/settingForBluetooth/lockUser.vue rename to pages/setting/lockUser.vue index 9ad9c32..6e1e683 100644 --- a/pages/settingForBluetooth/lockUser.vue +++ b/pages/setting/lockUser.vue @@ -9,9 +9,9 @@ .search { - padding: 32rpx; width: 686rpx !important; + padding: 32rpx; } .button { - display: flex; - align-items: center; position: fixed; bottom: calc(env(safe-area-inset-bottom) + 20rpx); + display: flex; + align-items: center; font-weight: bold; .button-reset { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #df282d; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #df282d; border-radius: 44rpx; } .button-create { - margin-left: 50rpx; width: 300rpx; height: 88rpx; - background-color: #63b8af; + margin-left: 50rpx; + line-height: 88rpx; color: white; text-align: center; - line-height: 88rpx; + background-color: #63b8af; border-radius: 44rpx; } } @@ -338,29 +338,29 @@ .item { display: flex; align-items: center; - background-color: #ffffff; - height: 120rpx; width: 750rpx; + height: 120rpx; + background-color: #ffffff; .item-left { - margin-left: 32rpx; width: 80rpx; height: 80rpx; + margin-left: 32rpx; } .item-right { + width: 574rpx; margin-right: 32rpx; margin-left: 32rpx; - width: 574rpx; .item-right-top { max-width: 400rpx; - font-size: 32rpx; - font-weight: bold; padding-bottom: 6rpx; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + font-size: 32rpx; + font-weight: bold; + white-space: nowrap; } .item-right-bottom { @@ -384,9 +384,9 @@ } .empty-list-text { - text-align: center; font-size: 32rpx; color: #999999; + text-align: center; } .status { diff --git a/pages/settingForBluetooth/lowElecNotice.vue b/pages/setting/lowElecNotice.vue similarity index 100% rename from pages/settingForBluetooth/lowElecNotice.vue rename to pages/setting/lowElecNotice.vue diff --git a/pages/settingForBluetooth/messageReminder.vue b/pages/setting/messageReminder.vue similarity index 100% rename from pages/settingForBluetooth/messageReminder.vue rename to pages/setting/messageReminder.vue diff --git a/pages/settingForBluetooth/motorTorsion.vue b/pages/setting/motorTorsion.vue similarity index 100% rename from pages/settingForBluetooth/motorTorsion.vue rename to pages/setting/motorTorsion.vue diff --git a/pages/settingForBluetooth/notOpenDoor.vue b/pages/setting/notOpenDoor.vue similarity index 100% rename from pages/settingForBluetooth/notOpenDoor.vue rename to pages/setting/notOpenDoor.vue diff --git a/pages/settingForBluetooth/noticeDetail.vue b/pages/setting/noticeDetail.vue similarity index 100% rename from pages/settingForBluetooth/noticeDetail.vue rename to pages/setting/noticeDetail.vue diff --git a/pages/settingForBluetooth/noticeWay.vue b/pages/setting/noticeWay.vue similarity index 100% rename from pages/settingForBluetooth/noticeWay.vue rename to pages/setting/noticeWay.vue diff --git a/pages/settingForBluetooth/openDirection.vue b/pages/setting/openDirection.vue similarity index 100% rename from pages/settingForBluetooth/openDirection.vue rename to pages/setting/openDirection.vue diff --git a/pages/settingForBluetooth/openDoorNotice.vue b/pages/setting/openDoorNotice.vue similarity index 100% rename from pages/settingForBluetooth/openDoorNotice.vue rename to pages/setting/openDoorNotice.vue diff --git a/pages/settingForBluetooth/passageMode.vue b/pages/setting/passageMode.vue similarity index 100% rename from pages/settingForBluetooth/passageMode.vue rename to pages/setting/passageMode.vue diff --git a/pages/settingForBluetooth/realTimePicture.vue b/pages/setting/realTimePicture.vue similarity index 100% rename from pages/settingForBluetooth/realTimePicture.vue rename to pages/setting/realTimePicture.vue diff --git a/pages/settingForBluetooth/selectGroup.vue b/pages/setting/selectGroup.vue similarity index 100% rename from pages/settingForBluetooth/selectGroup.vue rename to pages/setting/selectGroup.vue diff --git a/pages/settingForBluetooth/setting.vue b/pages/setting/setting.vue similarity index 100% rename from pages/settingForBluetooth/setting.vue rename to pages/setting/setting.vue diff --git a/pages/settingForBluetooth/syncElec.vue b/pages/setting/syncElec.vue similarity index 100% rename from pages/settingForBluetooth/syncElec.vue rename to pages/setting/syncElec.vue diff --git a/pages/settingForBluetooth/updateSetting.vue b/pages/setting/updateSetting.vue similarity index 100% rename from pages/settingForBluetooth/updateSetting.vue rename to pages/setting/updateSetting.vue diff --git a/pages/settingForBluetooth/uploadLockData.vue b/pages/setting/uploadLockData.vue similarity index 100% rename from pages/settingForBluetooth/uploadLockData.vue rename to pages/setting/uploadLockData.vue diff --git a/pages/settingForBluetooth/videoSlot.vue b/pages/setting/videoSlot.vue similarity index 100% rename from pages/settingForBluetooth/videoSlot.vue rename to pages/setting/videoSlot.vue diff --git a/stores/basic.js b/stores/basic.js index 8faa7b9..474f642 100644 --- a/stores/basic.js +++ b/stores/basic.js @@ -49,52 +49,52 @@ const pages = [ }, { name: 'searchDevice', - path: '/pages/addDeviceForBluetooth/searchDevice', + path: '/pages/addDevice/searchDevice', tabBar: false }, { name: 'selectAddress', - path: '/pages/addDeviceForBluetooth/selectAddress', + path: '/pages/addDevice/selectAddress', tabBar: false }, { name: 'bindLock', - path: '/pages/addDeviceForBluetooth/bindLock', + path: '/pages/addDevice/bindLock', tabBar: false }, { name: 'setting', - path: '/pages/settingForBluetooth/setting', + path: '/pages/setting/setting', tabBar: false }, { name: 'keyList', - path: '/pages/lockUserManage/keyList', + path: '/pages/feature/keyList', tabBar: false }, { name: 'createKey', - path: '/pages/lockUserManage/createKey', + path: '/pages/feature/createKey', tabBar: false }, { name: 'passwordList', - path: '/pages/featureForBluetooth/passwordList', + path: '/pages/feature/passwordList', tabBar: false }, { name: 'createPassword', - path: '/pages/featureForBluetooth/createPassword', + path: '/pages/feature/createPassword', tabBar: false }, { name: 'passwordDetail', - path: '/pages/featureForBluetooth/passwordDetail', + path: '/pages/feature/passwordDetail', tabBar: false }, { name: 'keyDetail', - path: '/pages/lockUserManage/keyDetail', + path: '/pages/feature/keyDetail', tabBar: false }, { @@ -109,137 +109,137 @@ const pages = [ }, { name: 'addLockGuid', - path: '/pages/addDeviceForBluetooth/addLockGuid', + path: '/pages/addDevice/addLockGuid', tabBar: false }, { name: 'cardList', - path: '/pages/featureForBluetooth/cardList', + path: '/pages/feature/cardList', tabBar: false }, { name: 'createCard', - path: '/pages/featureForBluetooth/createCard', + path: '/pages/feature/createCard', tabBar: false }, { name: 'cardDetail', - path: '/pages/featureForBluetooth/cardDetail', + path: '/pages/feature/cardDetail', tabBar: false }, { name: 'bindCard', - path: '/pages/featureForBluetooth/bindCard', + path: '/pages/feature/bindCard', tabBar: false }, { name: 'fingerprintList', - path: '/pages/featureForBluetooth/fingerprintList', + path: '/pages/feature/fingerprintList', tabBar: false }, { name: 'createFingerprint', - path: '/pages/featureForBluetooth/createFingerprint', + path: '/pages/feature/createFingerprint', tabBar: false }, { name: 'fingerprintDetail', - path: '/pages/featureForBluetooth/fingerprintDetail', + path: '/pages/feature/fingerprintDetail', tabBar: false }, { name: 'bindFingerprint', - path: '/pages/featureForBluetooth/bindFingerprint', + path: '/pages/feature/bindFingerprint', tabBar: false }, { name: 'faceList', - path: '/pages/featureForBluetooth/faceList', + path: '/pages/feature/faceList', tabBar: false }, { name: 'createFace', - path: '/pages/featureForBluetooth/createFace', + path: '/pages/feature/createFace', tabBar: false }, { name: 'faceDetail', - path: '/pages/featureForBluetooth/faceDetail', + path: '/pages/feature/faceDetail', tabBar: false }, { name: 'bindFace', - path: '/pages/featureForBluetooth/bindFace', + path: '/pages/feature/bindFace', tabBar: false }, { name: 'remoteList', - path: '/pages/featureForBluetooth/remoteList', + path: '/pages/feature/remoteList', tabBar: false }, { name: 'createRemote', - path: '/pages/featureForBluetooth/createRemote', + path: '/pages/feature/createRemote', tabBar: false }, { name: 'remoteDetail', - path: '/pages/featureForBluetooth/remoteDetail', + path: '/pages/feature/remoteDetail', tabBar: false }, { name: 'bindRemote', - path: '/pages/featureForBluetooth/bindRemote', + path: '/pages/feature/bindRemote', tabBar: false }, { name: 'palmVeinList', - path: '/pages/featureForBluetooth/palmVeinList', + path: '/pages/feature/palmVeinList', tabBar: false }, { name: 'createPalmVein', - path: '/pages/featureForBluetooth/createPalmVein', + path: '/pages/feature/createPalmVein', tabBar: false }, { name: 'palmVeinDetail', - path: '/pages/featureForBluetooth/palmVeinDetail', + path: '/pages/feature/palmVeinDetail', tabBar: false }, { name: 'bindPalmVein', - path: '/pages/featureForBluetooth/bindPalmVein', + path: '/pages/feature/bindPalmVein', tabBar: false }, { name: 'createAdmin', - path: '/pages/lockUserManage/createAdmin', + path: '/pages/feature/createAdmin', tabBar: false }, { name: 'adminDetail', - path: '/pages/lockUserManage/adminDetail', + path: '/pages/feature/adminDetail', tabBar: false }, { name: 'adminList', - path: '/pages/lockUserManage/adminList', + path: '/pages/feature/adminList', tabBar: false }, { name: 'recordList', - path: '/pages/featureForBluetooth/recordList', + path: '/pages/feature/recordList', tabBar: false }, { name: 'recordDetail', - path: '/pages/featureForBluetooth/recordDetail', + path: '/pages/feature/recordDetail', tabBar: false }, { name: 'typeRecordList', - path: '/pages/featureForBluetooth/typeRecordList', + path: '/pages/feature/typeRecordList', tabBar: false }, { @@ -254,142 +254,142 @@ const pages = [ }, { name: 'lockInfo', - path: '/pages/settingForBluetooth/lockInfo', + path: '/pages/setting/lockInfo', tabBar: false }, { name: 'syncElec', - path: '/pages/settingForBluetooth/syncElec', + path: '/pages/setting/syncElec', tabBar: false }, { name: 'selectGroup', - path: '/pages/settingForBluetooth/selectGroup', + path: '/pages/setting/selectGroup', tabBar: false }, { name: 'updateSetting', - path: '/pages/settingForBluetooth/updateSetting', + path: '/pages/setting/updateSetting', tabBar: false }, { name: 'lockSound', - path: '/pages/settingForBluetooth/lockSound', + path: '/pages/setting/lockSound', tabBar: false }, { name: 'autoLock', - path: '/pages/settingForBluetooth/autoLock', + path: '/pages/setting/autoLock', tabBar: false }, { name: 'faceSetting', - path: '/pages/settingForBluetooth/faceSetting', + path: '/pages/setting/faceSetting', tabBar: false }, { name: 'lockDate', - path: '/pages/settingForBluetooth/lockDate', + path: '/pages/setting/lockDate', tabBar: false }, { name: 'uploadLockData', - path: '/pages/settingForBluetooth/uploadLockData', + path: '/pages/setting/uploadLockData', tabBar: false }, { name: 'openDirection', - path: '/pages/settingForBluetooth/openDirection', + path: '/pages/setting/openDirection', tabBar: false }, { name: 'motorTorsion', - path: '/pages/settingForBluetooth/motorTorsion', + path: '/pages/setting/motorTorsion', tabBar: false }, { name: 'catEye', - path: '/pages/settingForBluetooth/catEye', + path: '/pages/setting/catEye', tabBar: false }, { name: 'messageReminder', - path: '/pages/settingForBluetooth/messageReminder', + path: '/pages/setting/messageReminder', tabBar: false }, { name: 'openDoorNotice', - path: '/pages/settingForBluetooth/openDoorNotice', + path: '/pages/setting/openDoorNotice', tabBar: false }, { name: 'noticeDetail', - path: '/pages/settingForBluetooth/noticeDetail', + path: '/pages/setting/noticeDetail', tabBar: false }, { name: 'lockUser', - path: '/pages/settingForBluetooth/lockUser', + path: '/pages/setting/lockUser', tabBar: false }, { name: 'noticeWay', - path: '/pages/settingForBluetooth/noticeWay', + path: '/pages/setting/noticeWay', tabBar: false }, { name: 'notOpenDoor', - path: '/pages/settingForBluetooth/notOpenDoor', + path: '/pages/setting/notOpenDoor', tabBar: false }, { name: 'lowElecNotice', - path: '/pages/settingForBluetooth/lowElecNotice', + path: '/pages/setting/lowElecNotice', tabBar: false }, { name: 'coercionOpenDoor', - path: '/pages/settingForBluetooth/coercionOpenDoor', + path: '/pages/setting/coercionOpenDoor', tabBar: false }, { name: 'coercionFingerprint', - path: '/pages/settingForBluetooth/coercionFingerprint', + path: '/pages/setting/coercionFingerprint', tabBar: false }, { name: 'catEyeMode', - path: '/pages/settingForBluetooth/catEyeMode', + path: '/pages/setting/catEyeMode', tabBar: false }, { name: 'customCatEye', - path: '/pages/settingForBluetooth/customCatEye', + path: '/pages/setting/customCatEye', tabBar: false }, { name: 'realTimePicture', - path: '/pages/settingForBluetooth/realTimePicture', + path: '/pages/setting/realTimePicture', tabBar: false }, { name: 'videoSlot', - path: '/pages/settingForBluetooth/videoSlot', + path: '/pages/setting/videoSlot', tabBar: false }, { name: 'passageMode', - path: '/pages/settingForBluetooth/passageMode', + path: '/pages/setting/passageMode', tabBar: false }, { name: 'selectDeviceType', - path: '/pages/others/selectDeviceType', + path: '/pages/addDevice/selectDeviceType', tabBar: false }, { name: 'distributionNetwork', - path: '/pages/addDeviceForWiFi/distributionNetwork', + path: '/pages/addDevice/distributionNetwork', tabBar: false }, {