diff --git a/pages.json b/pages.json index 7cea929..39dec93 100644 --- a/pages.json +++ b/pages.json @@ -24,6 +24,7 @@ "navigationStyle": "custom" } }, +<<<<<<< HEAD { "path": "pages/login/account_login/account_login", "style": { @@ -36,6 +37,14 @@ "navigationStyle": "custom" } } +======= + { + "path": "pages/transition/page5/page5", + "style": { + "navigationStyle": "custom" + } + } +>>>>>>> 0732be076c754b7bef85e899635ba6fdff55aa31 ], "uniIdRouter": {}, "tabBar": null diff --git a/pages/transition/page4/page4.vue b/pages/transition/page4/page4.vue index 342846f..8eee3b5 100644 --- a/pages/transition/page4/page4.vue +++ b/pages/transition/page4/page4.vue @@ -1,17 +1,103 @@ + object-fit: contain; /* 保持图片比例 */ + animation: fadeIn 1s ease 2s forwards; /* 2秒后显示 */ + opacity: 0; + top: 50%; /* 根据需要调整位置 */ +} + +/* Button 延迟显示并加缩放特效,放在右下角 */ +.button { + position: absolute; + height: 10vh; + width: 22vw; + animation: fadeInScale 1s ease 2.5s forwards; /* 2.5秒后显示并缩放 */ + opacity: 0; + right: 5%; /* 距右边 5% */ + bottom: 3%; /* 距底部 5% */ +} + +/* 定义 human 上移动画 */ +@keyframes moveUp { + from { + top: 50%; + } + to { + top: 20%; /* 移动到页面顶部 10% */ + } +} + +/* Text 和 Button 的渐入动画 */ +@keyframes fadeIn { + from { + opacity: 0; + } + to { + opacity: 1; + } +} + +/* Button 的缩放渐入动画 */ +@keyframes fadeInScale { + from { + opacity: 0; + transform: scale(0.8); + } + to { + opacity: 1; + transform: scale(1); + } +} + \ No newline at end of file diff --git a/pages/transition/page5/page5.vue b/pages/transition/page5/page5.vue new file mode 100644 index 0000000..02409e3 --- /dev/null +++ b/pages/transition/page5/page5.vue @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/static/transition/.idea/modules.xml b/static/transition/.idea/modules.xml new file mode 100644 index 0000000..c2a930b --- /dev/null +++ b/static/transition/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/static/transition/.idea/transition.iml b/static/transition/.idea/transition.iml new file mode 100644 index 0000000..0c8867d --- /dev/null +++ b/static/transition/.idea/transition.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/static/transition/.idea/vcs.xml b/static/transition/.idea/vcs.xml new file mode 100644 index 0000000..b2bdec2 --- /dev/null +++ b/static/transition/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/static/transition/.idea/workspace.xml b/static/transition/.idea/workspace.xml new file mode 100644 index 0000000..cd0ce38 --- /dev/null +++ b/static/transition/.idea/workspace.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + 1730032420973 + + + + + + + + + \ No newline at end of file diff --git a/static/transition/page4/pictures/Button.png b/static/transition/page4/pictures/Button.png new file mode 100644 index 0000000..149f156 Binary files /dev/null and b/static/transition/page4/pictures/Button.png differ diff --git a/static/transition/page4/pictures/background.png b/static/transition/page4/pictures/background.png new file mode 100644 index 0000000..fccc1e2 Binary files /dev/null and b/static/transition/page4/pictures/background.png differ diff --git a/static/transition/page4/pictures/human.png b/static/transition/page4/pictures/human.png new file mode 100644 index 0000000..4474d47 Binary files /dev/null and b/static/transition/page4/pictures/human.png differ diff --git a/static/transition/page4/pictures/text.png b/static/transition/page4/pictures/text.png new file mode 100644 index 0000000..105797c Binary files /dev/null and b/static/transition/page4/pictures/text.png differ diff --git a/static/transition/page5/pictures/background.png b/static/transition/page5/pictures/background.png new file mode 100644 index 0000000..fccc1e2 Binary files /dev/null and b/static/transition/page5/pictures/background.png differ diff --git a/unpackage/dist/cache/.vite/deps/_metadata.json b/unpackage/dist/cache/.vite/deps/_metadata.json index ff6b6ca..ed3c019 100644 --- a/unpackage/dist/cache/.vite/deps/_metadata.json +++ b/unpackage/dist/cache/.vite/deps/_metadata.json @@ -1,8 +1,8 @@ { - "hash": "239ea83a", - "configHash": "3f4641d2", + "hash": "48f6c93b", + "configHash": "badd50c8", "lockfileHash": "e3b0c442", - "browserHash": "619b4131", + "browserHash": "debd2ea0", "optimized": {}, "chunks": {} } \ No newline at end of file