diff --git a/Cunkebao/pages.json b/Cunkebao/pages.json index 0e77c8ab..1acf943d 100644 --- a/Cunkebao/pages.json +++ b/Cunkebao/pages.json @@ -21,6 +21,13 @@ "navigationBarTitleText": "我的" } }, + { + "path": "pages/device/index", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "设备管理" + } + }, { "path": "pages/scenarios/index", "style": { diff --git a/Cunkebao/pages/device/index.vue b/Cunkebao/pages/device/index.vue new file mode 100644 index 00000000..bd2f5446 --- /dev/null +++ b/Cunkebao/pages/device/index.vue @@ -0,0 +1,558 @@ + + + + + + \ No newline at end of file diff --git a/Cunkebao/pages/profile/index.vue b/Cunkebao/pages/profile/index.vue index 9e71001e..7f6deeb4 100644 --- a/Cunkebao/pages/profile/index.vue +++ b/Cunkebao/pages/profile/index.vue @@ -4,7 +4,7 @@ 我的 - + @@ -161,14 +161,14 @@ export default { min-height: 90vh; background-color: #f9fafb; position: relative; - padding-top: 50rpx; + padding-top: 46rpx; } .header { display: flex; justify-content: space-between; align-items: center; - padding: 25rpx 30rpx; + padding: 30rpx 30rpx; background-color: #fff; border-bottom: 1px solid #e9e9e9; position: fixed; @@ -178,9 +178,7 @@ export default { z-index: 999; .title { - font-size: 45rpx; - font-weight: bold; - color: #2664ec; + font-size: 40rpx; } .header-icons { @@ -197,7 +195,7 @@ export default { margin: 35rpx; margin-top: 120rpx; background-color: #fff; - border-radius: 16rpx; + border-radius: 35rpx; padding: 50rpx; display: flex; align-items: center; @@ -255,7 +253,7 @@ export default { .menu-list { margin: 35rpx; background-color: #fff; - border-radius: 16rpx; + border-radius: 35rpx; overflow: hidden; box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05); diff --git a/Cunkebao/pages/scenarios/index.vue b/Cunkebao/pages/scenarios/index.vue index aecd8de3..7eb63cce 100644 --- a/Cunkebao/pages/scenarios/index.vue +++ b/Cunkebao/pages/scenarios/index.vue @@ -310,8 +310,6 @@ export default { .title { position: absolute; font-size: 40rpx; - font-weight: bold; - color: #2563EB; float: left; margin-left: 70rpx; } diff --git a/Cunkebao/static/images/icons/filter.svg b/Cunkebao/static/images/icons/filter.svg new file mode 100644 index 00000000..4872a6b3 --- /dev/null +++ b/Cunkebao/static/images/icons/filter.svg @@ -0,0 +1,9 @@ + + + + \ No newline at end of file