diff --git a/package.json b/package.json index 4ced819..196822c 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ "vue": "^3.2.37", "vue-cropper": "^0.5.8", "vue-i18n": "^9.2.2", + "vue3-count-to": "^1.1.2", "vuedraggable": "^2.24.3", "vuex": "^4.1.0" }, diff --git a/src/assets/imgs/home-screen/approach.mp4 b/src/assets/imgs/home-screen/approach.mp4 new file mode 100644 index 0000000..b984550 Binary files /dev/null and b/src/assets/imgs/home-screen/approach.mp4 differ diff --git a/src/assets/imgs/home-screen/exit.mp4 b/src/assets/imgs/home-screen/exit.mp4 new file mode 100644 index 0000000..683d008 Binary files /dev/null and b/src/assets/imgs/home-screen/exit.mp4 differ diff --git a/src/assets/imgs/home-screen/power_on_loop.mp4 b/src/assets/imgs/home-screen/power_on_loop.mp4 new file mode 100644 index 0000000..5f48fba Binary files /dev/null and b/src/assets/imgs/home-screen/power_on_loop.mp4 differ diff --git a/src/assets/imgs/home-screen/shutdown_loop.mp4 b/src/assets/imgs/home-screen/shutdown_loop.mp4 new file mode 100644 index 0000000..28cb1d0 Binary files /dev/null and b/src/assets/imgs/home-screen/shutdown_loop.mp4 differ diff --git a/src/view/device-detail/device-detail.vue b/src/view/device-detail/device-detail.vue index 8b462f7..3bb86c9 100644 --- a/src/view/device-detail/device-detail.vue +++ b/src/view/device-detail/device-detail.vue @@ -1,5 +1,5 @@ @@ -70,6 +77,7 @@ import NormalMode from './mode/normal.vue'; import SmartMode from './mode/smart.vue'; import { $commonService } from "@/services/framework/dependency-injection-service"; import { SmartModeEnum } from './mode/enmu/smart-mode'; +import { ImgUrl } from './mode/img-url'; const getImgSrc = $commonService.$imgService.getImgSrc; const router = useRouter(); @@ -156,7 +164,6 @@ onMounted(() => { } cleanlinessReminder.value.style.color = `rgb(${cleanlinessReminderColor})`; cleanlinessReminder.value.style.backgroundColor = `rgba(${cleanlinessReminderColor}, .2)`; - } }) diff --git a/src/view/device-detail/mode/img-url.ts b/src/view/device-detail/mode/img-url.ts new file mode 100644 index 0000000..a48f53c --- /dev/null +++ b/src/view/device-detail/mode/img-url.ts @@ -0,0 +1,13 @@ +export const ImgUrl = [ + "/assets/imgs/device-detail/normal-mode/normal_bg_cold@2x.png", + "/assets/imgs/device-detail/normal-mode/normal_bg_hot@2x.png", + "/assets/imgs/device-detail/normal-mode/normal_bg_shutdown@2x.png", + "/assets/imgs/device-detail/normal-mode/normal_bg_wet@2x.png", + "/assets/imgs/device-detail/normal-mode/normal_bg_wind@2x.png", + "/assets/imgs/device-detail/smart-mode/smart_bg_cold@2x.png", + "/assets/imgs/device-detail/smart-mode/smart_bg_comfort@2x.png", + "/assets/imgs/device-detail/smart-mode/smart_bg_cool@2x.png", + "/assets/imgs/device-detail/smart-mode/smart_bg_hot@2x.png", + "/assets/imgs/device-detail/smart-mode/smart_bg_shutdown@2x.png", + "/assets/imgs/device-detail/smart-mode/smart_bg_warm@2x.png", +] \ No newline at end of file diff --git a/src/view/tabs/device-control.vue b/src/view/tabs/device-control.vue index f56fb5c..e2438d1 100644 --- a/src/view/tabs/device-control.vue +++ b/src/view/tabs/device-control.vue @@ -155,6 +155,7 @@ const goToDetail = (item: any) => { router.push("/freshAir"); break; default: + console.log('点击'); router.push({ path: '/device-detail', query: { @@ -164,8 +165,7 @@ const goToDetail = (item: any) => { deviceType: item.deviceType, smartMode: item.smartMode, } - }) - break; + }); } } diff --git a/src/view/tabs/home-screen.vue b/src/view/tabs/home-screen.vue index 16b20c1..cf320fe 100644 --- a/src/view/tabs/home-screen.vue +++ b/src/view/tabs/home-screen.vue @@ -1,43 +1,91 @@ diff --git a/src/view/tabs/tabs.vue b/src/view/tabs/tabs.vue index 810b1c0..481feaf 100644 --- a/src/view/tabs/tabs.vue +++ b/src/view/tabs/tabs.vue @@ -84,6 +84,7 @@ const initSwiper = () => { effect: "fade", //轮播图切换效果的类型 resistanceRatio: 0, initialSlide: 1, //默认第二页 + noSwipingClass: 'disabled-scroll' }); }; @@ -139,7 +140,6 @@ const pullUp = () => { width: 100vw; height: 100vh; position: relative; - -webkit-overflow-scrolling: touch; .swiper-pagination ::v-deep .swiper-pagination-bullet { width: 40px !important;