diff --git a/pages.json b/pages.json index 4eab202..a3a5d87 100644 --- a/pages.json +++ b/pages.json @@ -1,120 +1,120 @@ { - "pages": [ - // { - // "path": "pages/transition/page1/page1", - // "style": { - // "navigationStyle": "custom" - // } - // }, - // { - // "path": "pages/transition/page2/page2", - // "style": { - // "navigationStyle": "custom" - // } - // }, - // { - // "path": "pages/transition/page3/page3", - // "style": { - // "navigationStyle": "custom" - // } - // }, - // { - // "path": "pages/transition/page4/page4", - // "style": { - // "navigationStyle": "custom" - // } - // }, - // { - // "path": "pages/transition/page5/page5", - // "style": { - // "navigationStyle": "custom" - // } - // }, - // { - // "path": "pages/transition/page6/page6", - // "style": { - // "navigationStyle": "custom" - // } - // }, - // { - // "path": "pages/transition/page7/page7", - // "style": { - // "navigationStyle": "custom" - // } - // }, - // /*-----------------------------------------------------------------------动画过渡界面-------------------------------------------*/ + "pages": [ + { + "path": "pages/transition/page1/page1", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/transition/page2/page2", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/transition/page3/page3", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/transition/page4/page4", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/transition/page5/page5", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/transition/page6/page6", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/transition/page7/page7", + "style": { + "navigationStyle": "custom" + } + }, + /*-----------------------------------------------------------------------动画过渡界面-------------------------------------------*/ - // { - // "path": "pages/login/account_login/account_login", - // "style": { - // "navigationStyle": "custom" - // } - // }, - // { - // "path": "pages/login/register/register", - // "style": { - // "navigationStyle": "custom" - // } - // }, - // { - // "path": "pages/login/forget_password/forget_password", - // "style": { - // "navigationStyle": "custom" - // } - // }, - // { - // "path": "pages/login/change_password/change_password", - // "style": { - // "navigationStyle": "custom" - // } - // }, - // /*-----------------------------------------------------------------------登录注册界面-------------------------------------------*/ + { + "path": "pages/login/account_login/account_login", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/login/register/register", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/login/forget_password/forget_password", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/login/change_password/change_password", + "style": { + "navigationStyle": "custom" + } + }, + /*-----------------------------------------------------------------------登录注册界面-------------------------------------------*/ - // { - // "path": "pages/information/sex/sex", - // "style": { - // "navigationStyle": "custom" - // } - // }, - // { - // "path": "pages/information/boy_height_start/boy_height_start", - // "style": { - // "navigationStyle": "custom" - // } - // }, - // { - // "path": "pages/information/boy_height_roll/boy_height_roll", - // "style": { - // "navigationStyle": "custom" - // } - // }, - // { - // "path": "pages/information/boy_height_end/boy_height_end", - // "style": { - // "navigationStyle": "custom" - // } - // }, - // /*------------------------------------------------男生填写身高------------------------------------------------------------*/ - // { - // "path": "pages/information/boy_weight_start/boy_weight_start", - // "style": { - // "navigationStyle": "custom" - // } - // }, - // { - // "path": "pages/information/boy_weight_roll/boy_weight_roll", - // "style": { - // "navigationStyle": "custom" - // } - // }, - // { - // "path": "pages/information/boy_weight_end/boy_weight_end", - // "style": { - // "navigationStyle": "custom" - // } - // }, + { + "path": "pages/information/sex/sex", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/information/boy_height_start/boy_height_start", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/information/boy_height_roll/boy_height_roll", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/information/boy_height_end/boy_height_end", + "style": { + "navigationStyle": "custom" + } + }, + /*------------------------------------------------男生填写身高------------------------------------------------------------*/ + { + "path": "pages/information/boy_weight_start/boy_weight_start", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/information/boy_weight_roll/boy_weight_roll", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/information/boy_weight_end/boy_weight_end", + "style": { + "navigationStyle": "custom" + } + }, /*---------------------------------------男生填写体重--------------------------------------------------------------*/ { "path": "pages/information/girl_height_start/girl_height_start", @@ -122,101 +122,80 @@ "navigationStyle": "custom" } }, - { - "path": "pages/information/girl_height_end/girl_height_end", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/information/girl_height_roll/girl_height_roll", - "style": { - "navigationStyle": "custom" - } - } - // { - // "path": "pages/information/girl_weight/girl_weight", - // "style": { - // "navigationStyle": "custom" - // } - // }, - // { - // "path": "pages/information/purpose/purpose", - // "style": { - // "navigationStyle": "custom" - // } - // }, - // /*---------------------------------------------------------------信息填写界面----------------------------------------------------*/ - // { - // "path": "pages/homepages/home/home", - // "style": { - // "navigationStyle": "custom" - // } - // }, - // /*--------------------------------------------------------------主界面----------------------------------------------------------*/ - // { - // "path": "pages/homepages/puppy_chat/puppy_chat", - // "style": { - // "navigationStyle": "custom" - // } - // }, - // /*-------------------------------------------------------------聊天界面--------------------------------------------------------*/ - // { - // "path": "pages/homepages/community/community", - // "style": { - // "navigationStyle": "custom" - // } - // }, - // /*-------------------------------------------------------------社区界面------------------------------------------------------*/ - // { - // "path": "pages/homepages/user/user", - // "style": { - // "navigationStyle": "custom" - // } - // } - // /*---------------------------------------------------------------个人信息界面----------------------------------------------------*/, - // { - // "path": "pages/girl_height_start/girl_height_start", - // "style": { - // "navigationBarTitleText": "", - // "enablePullDownRefresh": false - // } - // }, - // { - // "path": "pages/girl_height_roll/girl_height_roll", - // "style": { - // "navigationBarTitleText": "", - // "enablePullDownRefresh": false - // } - // }, - // { - // "path": "pages/information/girl_height_end/girl_height_end", - // "style": { - // "navigationBarTitleText": "", - // "enablePullDownRefresh": false - // } - // }, - // { - // "path": "pages/information/girl_weight_start/girl_weight_start", - // "style": { - // "navigationBarTitleText": "", - // "enablePullDownRefresh": false - // } - // }, - // { - // "path": "pages/information/girl_weight_roll/girl_weight_roll", - // "style": { - // "navigationBarTitleText": "", - // "enablePullDownRefresh": false - // } - // }, - // { - // "path": "pages/information/girl_wieght_end/girl_wieght_end", - // "style": { - // "navigationBarTitleText": "", - // "enablePullDownRefresh": false - // } - // } + { + "path": "pages/information/girl_height_roll/girl_height_roll", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/information/girl_height_end/girl_height_end", + "style": { + "navigationStyle": "custom" + } + }, + /*--------------------------------------女生填写身高------------------------------------------------------------------*/ + { + "path": "pages/information/girl_weight_start/girl_weight_start", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/information/girl_weight_roll/girl_weight_roll", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/information/girl_weight_end/girl_weight_end", + "style": { + "navigationStyle": "custom" + } + }, + /*----------------------------------------女生填写体重------------------------------------------------------------------*/ + { + "path": "pages/information/purpose/purpose", + "style": { + "navigationStyle": "custom" + } + }, + /*---------------------------------------------------------------信息填写界面----------------------------------------------------*/ + { + "path": "pages/homepages/home/home", + "style": { + "navigationStyle": "custom" + } + }, + /*--------------------------------------------------------------主界面----------------------------------------------------------*/ + { + "path": "pages/homepages/puppy_chat/puppy_chat", + "style": { + "navigationStyle": "custom" + } + }, + /*-------------------------------------------------------------聊天界面--------------------------------------------------------*/ + { + "path": "pages/homepages/community/community", + "style": { + "navigationStyle": "custom" + } + }, + /*-------------------------------------------------------------社区界面------------------------------------------------------*/ + { + "path": "pages/homepages/user/user", + "style": { + "navigationStyle": "custom" + } + }, + /*---------------------------------------------------------------个人信息界面----------------------------------------------------*/ + { + "path": "pages/transition/page8/page8", + "style": { + "navigationStyle": "custom" + } + } + /*------------------------------------------------------------------进入主页的过渡界面--------------------------------------------*/ ], "uniIdRouter": {}, "tabBar": null diff --git a/pages/information/girl_weight_end/girl_weight_end.vue b/pages/information/girl_weight_end/girl_weight_end.vue new file mode 100644 index 0000000..0f768bb --- /dev/null +++ b/pages/information/girl_weight_end/girl_weight_end.vue @@ -0,0 +1,107 @@ + + + + + \ No newline at end of file diff --git a/pages/information/girl_weight_roll/girl_weight_roll.vue b/pages/information/girl_weight_roll/girl_weight_roll.vue index 342846f..36b8c37 100644 --- a/pages/information/girl_weight_roll/girl_weight_roll.vue +++ b/pages/information/girl_weight_roll/girl_weight_roll.vue @@ -1,17 +1,87 @@ - +.picker_view_box { + height: 42.8vh; /* 设置 picker-view 的高度 */ + width: 80%; /* 宽度自适应 */ +} + +.item { + line-height: 2rem; + display: flex; + align-items: center; + justify-content: center; + font-size: 1.5rem; + height: 3rem; + color: #ffffff; +} + +.button { + margin-top: 10px; /* 按钮与选择器之间的间距 */ + position: absolute; + height: 13%; + width: 80%; + right: 10%; /* 距右边 10% */ + bottom: 2%; /* 距底部 3.5% */ +} + \ No newline at end of file diff --git a/pages/information/girl_weight_start/girl_weight_start.vue b/pages/information/girl_weight_start/girl_weight_start.vue index 342846f..7ca827f 100644 --- a/pages/information/girl_weight_start/girl_weight_start.vue +++ b/pages/information/girl_weight_start/girl_weight_start.vue @@ -1,17 +1,142 @@ +/* Human 动画,从页面中部向上移动 */ +.human { + position: absolute; + width: 100%; + height: 90%; + top:10%; + object-fit: contain; /* 保持图片比例 */ + animation: moveUp 2s ease forwards; + top: 30%; /* 起始位置 */ + transform: translateY(-50%); /* 垂直居中 */ +} + +.progress{ + position: absolute; + width: 77%; + height: 7%; + object-fit: contain; /* 保持图片比例 */ + animation: fadeIn 1s ease 2s forwards; /* 2秒后显示 */ + opacity: 0; + top: 2%; /* 根据需要调整位置 */ +} + +/* Text 延迟显示 */ +.roll { + position: absolute; + width: 77%; + height: 20%; + object-fit: contain; /* 保持图片比例 */ + animation: fadeIn 1s ease 2s forwards; /* 2秒后显示 */ + opacity: 0; + top: 55%; /* 根据需要调整位置 */ +} + +/* Button 延迟显示并加缩放特效,放在下方 */ +.button { + position: absolute; + height: 13%; + width: 80%; + animation: fadeInScale 1s ease 2.5s forwards; /* 2.5秒后显示并缩放 */ + opacity: 0; + right: 10%; /* 距右边 10% */ + bottom: 2%; /* 距底部 3.5% */ +} + +.text{ + position: absolute; + font-size: 1.5em; + text-align: center; + width: 100%; + height: 20%; + top: 69%; + animation: fadeIn 1s ease 2s forwards; /* 2秒后显示 */ + opacity: 0; + color:#ffffff; +} + +/* 定义 human 上移动画 */ +@keyframes moveUp { + from { + top: 70%; + } + to { + top: 35%; /* 移动到页面顶部 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/information/girl_wieght_end/girl_wieght_end.vue b/pages/information/girl_wieght_end/girl_wieght_end.vue deleted file mode 100644 index 342846f..0000000 --- a/pages/information/girl_wieght_end/girl_wieght_end.vue +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/pages/information/purpose/purpose.vue b/pages/information/purpose/purpose.vue index 838f1bf..65a4dd3 100644 --- a/pages/information/purpose/purpose.vue +++ b/pages/information/purpose/purpose.vue @@ -45,7 +45,7 @@ export default { methods: { click() { uni.navigateTo({ - url: '/pages/homepages/home/home', // 使用 navigateTo + url: '/pages/transition/page8/page8', // 跳转到进入主页前的过渡界面 }); }, onSwiperChange(e) { diff --git a/pages/information/sex/sex.vue b/pages/information/sex/sex.vue index 2245b10..a090957 100644 --- a/pages/information/sex/sex.vue +++ b/pages/information/sex/sex.vue @@ -67,7 +67,7 @@ export default { goToNextPage() { const targetPage = this.isBoySelected ? "/pages/information/boy_weight_start/boy_weight_start" - : "/pages/information/girl_weight/girl_weight"; + : "/pages/information/girl_weight_start/girl_weight_start"; uni.navigateTo({ url: targetPage, }); diff --git a/pages/transition/page8/page8.vue b/pages/transition/page8/page8.vue new file mode 100644 index 0000000..44f633f --- /dev/null +++ b/pages/transition/page8/page8.vue @@ -0,0 +1,52 @@ + + + + + diff --git a/static/information/girl_height/pictures/roll.png b/static/information/girl_height/pictures/roll.png index 253e4fd..3a429ed 100644 Binary files a/static/information/girl_height/pictures/roll.png and b/static/information/girl_height/pictures/roll.png differ diff --git a/static/information/girl_weight/pictures/bkg_roll.png b/static/information/girl_weight/pictures/bkg_roll.png new file mode 100644 index 0000000..cc5f7a5 Binary files /dev/null and b/static/information/girl_weight/pictures/bkg_roll.png differ diff --git a/static/information/girl_weight/pictures/button.png b/static/information/girl_weight/pictures/button.png new file mode 100644 index 0000000..cb196c4 Binary files /dev/null and b/static/information/girl_weight/pictures/button.png differ diff --git a/static/information/girl_weight/pictures/button_roll.png b/static/information/girl_weight/pictures/button_roll.png new file mode 100644 index 0000000..85257ce Binary files /dev/null and b/static/information/girl_weight/pictures/button_roll.png differ diff --git a/static/information/girl_weight/pictures/human.png b/static/information/girl_weight/pictures/human.png new file mode 100644 index 0000000..7f91660 Binary files /dev/null and b/static/information/girl_weight/pictures/human.png differ diff --git a/static/information/girl_weight/pictures/progress.png b/static/information/girl_weight/pictures/progress.png new file mode 100644 index 0000000..f07a6b1 Binary files /dev/null and b/static/information/girl_weight/pictures/progress.png differ diff --git a/static/information/girl_weight/pictures/roll.png b/static/information/girl_weight/pictures/roll.png new file mode 100644 index 0000000..d9a3a56 Binary files /dev/null and b/static/information/girl_weight/pictures/roll.png differ diff --git a/static/transition/page8/pictures/background.png b/static/transition/page8/pictures/background.png new file mode 100644 index 0000000..b94fbf2 Binary files /dev/null and b/static/transition/page8/pictures/background.png differ diff --git a/static/transition/page8/pictures/button.png b/static/transition/page8/pictures/button.png new file mode 100644 index 0000000..fb3aa07 Binary files /dev/null and b/static/transition/page8/pictures/button.png differ diff --git a/unpackage/dist/cache/.vite/deps/_metadata.json b/unpackage/dist/cache/.vite/deps/_metadata.json index ed3c019..27774d0 100644 --- a/unpackage/dist/cache/.vite/deps/_metadata.json +++ b/unpackage/dist/cache/.vite/deps/_metadata.json @@ -1,8 +1,8 @@ { - "hash": "48f6c93b", - "configHash": "badd50c8", + "hash": "3dcffc29", + "configHash": "cc60d382", "lockfileHash": "e3b0c442", - "browserHash": "debd2ea0", + "browserHash": "e601f541", "optimized": {}, "chunks": {} } \ No newline at end of file