diff --git a/src/assets/imgs/show/fresh_air_1.png b/src/assets/imgs/show/fresh_air_1.png new file mode 100644 index 0000000..9924201 Binary files /dev/null and b/src/assets/imgs/show/fresh_air_1.png differ diff --git a/src/assets/imgs/show/fresh_air_2.png b/src/assets/imgs/show/fresh_air_2.png new file mode 100644 index 0000000..94fc74a Binary files /dev/null and b/src/assets/imgs/show/fresh_air_2.png differ diff --git a/src/assets/imgs/show/fresh_air_3.png b/src/assets/imgs/show/fresh_air_3.png new file mode 100644 index 0000000..7febd78 Binary files /dev/null and b/src/assets/imgs/show/fresh_air_3.png differ diff --git a/src/assets/imgs/show/fresh_air_4.png b/src/assets/imgs/show/fresh_air_4.png new file mode 100644 index 0000000..0a06785 Binary files /dev/null and b/src/assets/imgs/show/fresh_air_4.png differ diff --git a/src/assets/imgs/show/icon_close.png b/src/assets/imgs/show/icon_close.png new file mode 100644 index 0000000..1590dc5 Binary files /dev/null and b/src/assets/imgs/show/icon_close.png differ diff --git a/src/assets/imgs/show/icon_open.png b/src/assets/imgs/show/icon_open.png new file mode 100644 index 0000000..95d69a6 Binary files /dev/null and b/src/assets/imgs/show/icon_open.png differ diff --git a/src/assets/imgs/show/whole_setting_+-bg.png b/src/assets/imgs/show/whole_setting_+-bg.png new file mode 100644 index 0000000..06a8770 Binary files /dev/null and b/src/assets/imgs/show/whole_setting_+-bg.png differ diff --git a/src/assets/imgs/show/whole_setting_+gray.png b/src/assets/imgs/show/whole_setting_+gray.png new file mode 100644 index 0000000..022cea9 Binary files /dev/null and b/src/assets/imgs/show/whole_setting_+gray.png differ diff --git a/src/assets/imgs/show/whole_setting_+white.png b/src/assets/imgs/show/whole_setting_+white.png new file mode 100644 index 0000000..6239dc8 Binary files /dev/null and b/src/assets/imgs/show/whole_setting_+white.png differ diff --git a/src/assets/imgs/show/whole_setting_-gray.png b/src/assets/imgs/show/whole_setting_-gray.png new file mode 100644 index 0000000..0f96540 Binary files /dev/null and b/src/assets/imgs/show/whole_setting_-gray.png differ diff --git a/src/assets/imgs/show/whole_setting_-white.png b/src/assets/imgs/show/whole_setting_-white.png new file mode 100644 index 0000000..06c62a5 Binary files /dev/null and b/src/assets/imgs/show/whole_setting_-white.png differ diff --git a/src/assets/imgs/show/whole_setting_bg.png b/src/assets/imgs/show/whole_setting_bg.png new file mode 100644 index 0000000..d639290 Binary files /dev/null and b/src/assets/imgs/show/whole_setting_bg.png differ diff --git a/src/assets/imgs/show/whole_setting_logo.png b/src/assets/imgs/show/whole_setting_logo.png new file mode 100644 index 0000000..3c0a022 Binary files /dev/null and b/src/assets/imgs/show/whole_setting_logo.png differ diff --git a/src/assets/imgs/show/whole_setting_what.png b/src/assets/imgs/show/whole_setting_what.png new file mode 100644 index 0000000..9309b05 Binary files /dev/null and b/src/assets/imgs/show/whole_setting_what.png differ diff --git a/src/router.ts b/src/router.ts index d5edc2d..74969dc 100644 --- a/src/router.ts +++ b/src/router.ts @@ -126,6 +126,24 @@ const projectRoutes = [ path: "/freshAir", component: () => import("@/view/device-detail/fresh-air.vue") }, + { + //全屋设定 + name: "wholeSetting", + path: "/wholeSetting", + component: () => import("@/view/device-detail/whole-setting.vue") + }, + { + //全屋设定介绍 + name: "wholeSettingWhat", + path: "/wholeSettingWhat", + component: () => import("@/view/device-detail/whole-setting-what.vue") + }, + { + //全屋全感范围设定 + name: "wholeSettingRange", + path: "/wholeSettingRange", + component: () => import("@/view/device-detail/whole-setting-range.vue") + }, // 非哈希路由暂不启用 { name: "notFound", diff --git a/src/styles/framework/base/flexbox.scss b/src/styles/framework/base/flexbox.scss index 8b8a764..87ec54b 100644 --- a/src/styles/framework/base/flexbox.scss +++ b/src/styles/framework/base/flexbox.scss @@ -290,6 +290,13 @@ Flex, Grow, & Shrink 待确定 left: 24px; } + .zhp-horizontal-cetter { + left: 50%; + transform: translateX(-50%); + position: absolute; + align-items: center; + } + .bottom-s-c { left: 24px; right: 24px; @@ -448,7 +455,9 @@ Flex, Grow, & Shrink 待确定 .margin-left-20 { margin-left: 20px; } - + .margin-left-24 { + margin-left: 24px; + } .margin-left-30 { margin-left: 30px; } @@ -456,7 +465,9 @@ Flex, Grow, & Shrink 待确定 .margin-left-42 { margin-left: 42px; } - + .margin-top-24 { + margin-top: 24px; + } .margin-top-30 { margin-top: 30px; } diff --git a/src/view/device-detail/fresh-air.vue b/src/view/device-detail/fresh-air.vue index e0032c3..9394649 100644 --- a/src/view/device-detail/fresh-air.vue +++ b/src/view/device-detail/fresh-air.vue @@ -1,15 +1,22 @@ @@ -30,6 +37,30 @@ import router from "@/router"; position: absolute; left: 24px; } + .freshImg1 { + position: absolute; + left: 72px; + width: 32px; + height: 32px; + } + .freshImg2 { + position: absolute; + left: 112px; + width: 32px; + height: 32px; + } + .freshImg3 { + position: absolute; + left: 152px; + width: 78px; + height: 32px; + } + .freshImg4 { + position: absolute; + right: 24px; + width: 186px; + height: 38px; + } .show-img { width: 100vw; } diff --git a/src/view/device-detail/whole-setting-range.vue b/src/view/device-detail/whole-setting-range.vue new file mode 100644 index 0000000..1cf8baa --- /dev/null +++ b/src/view/device-detail/whole-setting-range.vue @@ -0,0 +1,76 @@ + + + + + diff --git a/src/view/device-detail/whole-setting-what.vue b/src/view/device-detail/whole-setting-what.vue new file mode 100644 index 0000000..b9c4a29 --- /dev/null +++ b/src/view/device-detail/whole-setting-what.vue @@ -0,0 +1,38 @@ + + + + + diff --git a/src/view/device-detail/whole-setting.vue b/src/view/device-detail/whole-setting.vue new file mode 100644 index 0000000..1137a5b --- /dev/null +++ b/src/view/device-detail/whole-setting.vue @@ -0,0 +1,366 @@ + + + + diff --git a/src/view/tabs/home-screen.vue b/src/view/tabs/home-screen.vue index 741d8e5..16b20c1 100644 --- a/src/view/tabs/home-screen.vue +++ b/src/view/tabs/home-screen.vue @@ -1,37 +1,37 @@ diff --git a/src/view/timing/timing-add.vue b/src/view/timing/timing-add.vue index 53d15f7..a16b014 100644 --- a/src/view/timing/timing-add.vue +++ b/src/view/timing/timing-add.vue @@ -199,7 +199,6 @@ const onSaveClick = () => { bottom: 30px; position: absolute; left: 50%; - -webkit-transform: translateX(-50%); transform: translateX(-50%); display: flex; align-items: center; diff --git a/src/view/timing/timing-select-time.vue b/src/view/timing/timing-select-time.vue index 0207268..38cc8e4 100644 --- a/src/view/timing/timing-select-time.vue +++ b/src/view/timing/timing-select-time.vue @@ -1,6 +1,16 @@