From a629d49cce8504483b60e4c886e8eb0a0b25483a Mon Sep 17 00:00:00 2001 From: Gary <3489015381@qq.com> Date: Thu, 31 Oct 2024 10:40:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E8=A3=85=E7=BB=84=E4=BB=B6tarbar?= =?UTF-8?q?=EF=BC=8C=E5=AE=8C=E6=88=90=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80?= =?UTF-8?q?=20TODO=EF=BC=9A=E8=BA=AB=E9=AB=98=E4=BD=93=E9=87=8D=E5=A1=AB?= =?UTF-8?q?=E5=86=99=E9=83=A8=E5=88=86=E7=95=8C=E9=9D=A2=E8=BF=98=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E9=97=AE=E9=A2=98=20TODO=EF=BC=9A=E5=BF=98=E8=AE=B0?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=99=BB=E5=BD=95=E9=83=A8=E5=88=86=E8=BF=98?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/watcherTasks.xml | 25 ++ App.vue | 51 +++- components/tarbar/tarbar.vue | 141 +++++++++ .../tarbar_community/tarbar_community.vue | 153 ++++++++++ components/tarbar_home/tarbar_home.vue | 145 +++++++++ .../tarbar_puppy_chat/tarbar_puppy_chat.vue | 148 +++++++++ components/tarbar_user/tarbar_user.vue | 152 ++++++++++ pages.json | 274 +++++++++-------- pages/homepages/community/community.vue | 3 +- .../{main/main.vue => home/home.vue} | 3 +- pages/homepages/puppy_chat/puppy_chat.vue | 3 +- .../self_information.vue => user/user.vue} | 3 +- .../boy_height_end.vue} | 18 +- .../boy_height_roll.vue} | 12 +- .../boy_height_start.vue} | 20 +- .../boy_weight_end.vue} | 10 +- .../boy_weight_roll.vue} | 10 +- .../boy_weight_start.vue} | 10 +- pages/information/girl_height/girl_height.vue | 282 ++++++++---------- .../girl_weight.vue} | 0 pages/information/purpose/purpose.vue | 102 +++++++ pages/information/sex/sex.vue | 42 ++- pages/transition/page2/page2.vue | 1 + static/Group.png | Bin 37206 -> 0 bytes static/Group1.png | Bin 95631 -> 0 bytes .../components/tarbar/pictures/assistant.png | Bin 0 -> 10618 bytes .../tarbar/pictures/assistant_picked_up.png | Bin 0 -> 60738 bytes static/components/tarbar/pictures/bar.png | Bin 0 -> 5385 bytes .../components/tarbar/pictures/community.png | Bin 0 -> 9948 bytes .../tarbar/pictures/community_pick_up.png | Bin 0 -> 60020 bytes static/components/tarbar/pictures/home.png | Bin 0 -> 7512 bytes .../tarbar/pictures/home_picked_up.png | Bin 0 -> 58054 bytes static/components/tarbar/pictures/user.png | Bin 0 -> 9122 bytes .../tarbar/pictures/user_picked_up.png | Bin 0 -> 60808 bytes static/homepages/main/main.vue | 17 -- .../girl_height/pictures/background.png | Bin 0 -> 235933 bytes .../girl_height/pictures/button.png | Bin 0 -> 215886 bytes .../girl_height/pictures/height_text.png | Bin 0 -> 9618 bytes .../girl_height/pictures/human.png | Bin 0 -> 95789 bytes .../pictures/img.png | Bin .../information/gril_weight/pictures/img.png | Bin 23575 -> 0 bytes .../purpose/pictures/background.png | Bin 0 -> 90997 bytes .../information/purpose/pictures/button.png | Bin 0 -> 233615 bytes static/information/purpose/pictures/dot1.png | Bin 0 -> 1799 bytes static/information/purpose/pictures/dot2.png | Bin 0 -> 14604 bytes static/information/purpose/pictures/dot3.png | Bin 0 -> 15115 bytes static/information/purpose/pictures/dot4.png | Bin 0 -> 15237 bytes static/information/purpose/pictures/dot5.png | Bin 0 -> 14580 bytes .../information/purpose/pictures/picture1.png | Bin 0 -> 301872 bytes .../information/purpose/pictures/picture2.png | Bin 0 -> 374512 bytes .../information/purpose/pictures/picture3.png | Bin 0 -> 359116 bytes .../information/purpose/pictures/picture4.png | Bin 0 -> 464257 bytes .../information/purpose/pictures/picture5.png | Bin 0 -> 376624 bytes static/information/sex/css/sex.css | 36 ++- .../information/sex/pictures/background.png | Bin 321292 -> 256125 bytes static/information/sex/pictures/human.png | Bin 0 -> 74411 bytes static/pro.png | Bin 20408 -> 0 bytes static/pros.png | Bin 17093 -> 0 bytes static/transition/.idea/modules.xml | 8 - static/transition/.idea/transition.iml | 12 - static/transition/.idea/vcs.xml | 6 - static/transition/.idea/workspace.xml | 57 ---- .../dist/cache/.vite/deps/_metadata.json | 6 +- 63 files changed, 1303 insertions(+), 447 deletions(-) create mode 100644 .idea/watcherTasks.xml create mode 100644 components/tarbar/tarbar.vue create mode 100644 components/tarbar_community/tarbar_community.vue create mode 100644 components/tarbar_home/tarbar_home.vue create mode 100644 components/tarbar_puppy_chat/tarbar_puppy_chat.vue create mode 100644 components/tarbar_user/tarbar_user.vue rename pages/homepages/{main/main.vue => home/home.vue} (67%) rename pages/homepages/{self_information/self_information.vue => user/user.vue} (67%) rename pages/information/{boy_height2/boy_height2.vue => boy_height_end/boy_height_end.vue} (80%) rename pages/information/{boy_roll/boy_roll.vue => boy_height_roll/boy_height_roll.vue} (86%) rename pages/information/{boy_height/boy_height.vue => boy_height_start/boy_height_start.vue} (82%) rename pages/information/{boy_weight2/boy_weight2.vue => boy_weight_end/boy_weight_end.vue} (90%) rename pages/information/{boy_roll_w/boy_roll_w.vue => boy_weight_roll/boy_weight_roll.vue} (84%) rename pages/information/{boy_weight/boy_weight.vue => boy_weight_start/boy_weight_start.vue} (92%) rename pages/information/{gril_weight/gril_weight.vue => girl_weight/girl_weight.vue} (100%) create mode 100644 pages/information/purpose/purpose.vue delete mode 100644 static/Group.png delete mode 100644 static/Group1.png create mode 100644 static/components/tarbar/pictures/assistant.png create mode 100644 static/components/tarbar/pictures/assistant_picked_up.png create mode 100644 static/components/tarbar/pictures/bar.png create mode 100644 static/components/tarbar/pictures/community.png create mode 100644 static/components/tarbar/pictures/community_pick_up.png create mode 100644 static/components/tarbar/pictures/home.png create mode 100644 static/components/tarbar/pictures/home_picked_up.png create mode 100644 static/components/tarbar/pictures/user.png create mode 100644 static/components/tarbar/pictures/user_picked_up.png delete mode 100644 static/homepages/main/main.vue create mode 100644 static/information/girl_height/pictures/background.png create mode 100644 static/information/girl_height/pictures/button.png create mode 100644 static/information/girl_height/pictures/height_text.png create mode 100644 static/information/girl_height/pictures/human.png rename static/information/{girl_height => girl_weight}/pictures/img.png (100%) delete mode 100644 static/information/gril_weight/pictures/img.png create mode 100644 static/information/purpose/pictures/background.png create mode 100644 static/information/purpose/pictures/button.png create mode 100644 static/information/purpose/pictures/dot1.png create mode 100644 static/information/purpose/pictures/dot2.png create mode 100644 static/information/purpose/pictures/dot3.png create mode 100644 static/information/purpose/pictures/dot4.png create mode 100644 static/information/purpose/pictures/dot5.png create mode 100644 static/information/purpose/pictures/picture1.png create mode 100644 static/information/purpose/pictures/picture2.png create mode 100644 static/information/purpose/pictures/picture3.png create mode 100644 static/information/purpose/pictures/picture4.png create mode 100644 static/information/purpose/pictures/picture5.png create mode 100644 static/information/sex/pictures/human.png delete mode 100644 static/pro.png delete mode 100644 static/pros.png delete mode 100644 static/transition/.idea/modules.xml delete mode 100644 static/transition/.idea/transition.iml delete mode 100644 static/transition/.idea/vcs.xml delete mode 100644 static/transition/.idea/workspace.xml diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml new file mode 100644 index 0000000..c70980f --- /dev/null +++ b/.idea/watcherTasks.xml @@ -0,0 +1,25 @@ + + + + + + + + \ No newline at end of file diff --git a/App.vue b/App.vue index dc6dc62..4ef4d1e 100644 --- a/App.vue +++ b/App.vue @@ -1,22 +1,41 @@ + + + diff --git a/components/tarbar/tarbar.vue b/components/tarbar/tarbar.vue new file mode 100644 index 0000000..3280b4e --- /dev/null +++ b/components/tarbar/tarbar.vue @@ -0,0 +1,141 @@ + + + + + + diff --git a/components/tarbar_community/tarbar_community.vue b/components/tarbar_community/tarbar_community.vue new file mode 100644 index 0000000..e051ea0 --- /dev/null +++ b/components/tarbar_community/tarbar_community.vue @@ -0,0 +1,153 @@ + + + + + + diff --git a/components/tarbar_home/tarbar_home.vue b/components/tarbar_home/tarbar_home.vue new file mode 100644 index 0000000..f39988c --- /dev/null +++ b/components/tarbar_home/tarbar_home.vue @@ -0,0 +1,145 @@ + + + + + + diff --git a/components/tarbar_puppy_chat/tarbar_puppy_chat.vue b/components/tarbar_puppy_chat/tarbar_puppy_chat.vue new file mode 100644 index 0000000..8355d6f --- /dev/null +++ b/components/tarbar_puppy_chat/tarbar_puppy_chat.vue @@ -0,0 +1,148 @@ + + + + + + diff --git a/components/tarbar_user/tarbar_user.vue b/components/tarbar_user/tarbar_user.vue new file mode 100644 index 0000000..27853d3 --- /dev/null +++ b/components/tarbar_user/tarbar_user.vue @@ -0,0 +1,152 @@ + + + + + + + + + diff --git a/pages.json b/pages.json index d7448c0..1eabbcb 100644 --- a/pages.json +++ b/pages.json @@ -1,122 +1,162 @@ { "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/information/sex/sex", - // "style": { - // "navigationBarTitleText": "", - // "enablePullDownRefresh": false - // } - // }, - { - "path": "pages/information/boy_height/boy_height", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/information/boy_height2/boy_height2", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/information/boy_roll/boy_roll", - "style": { - "navigationStyle": "custom" - } - }, - // { - // "path": "pages/information/girl_height/girl_height", - // "style": { - // "navigationStyle": "custom" - // } - // }, - { - "path": "pages/information/boy_weight/boy_weight", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/information/boy_weight2/boy_weight2", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/information/boy_roll_w/boy_roll_w", - "style": { - "navigationStyle": "custom" - } - } - // { - // "path": "pages/information/gril_weight/gril_weight", - // "style": { - // "navigationBarTitleText": "", - // "enablePullDownRefresh": false - // } - // }, - // { - // "path": "pages/login/forget_password/forget_password", - // "style": { - // "navigationBarTitleText": "", - // "enablePullDownRefresh": false - // } - // } + /* { + "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/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/girl_height", + "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" + } + } + /*---------------------------------------------------------------个人信息界面----------------------------------------------------*/ ], "uniIdRouter": {}, "tabBar": null diff --git a/pages/homepages/community/community.vue b/pages/homepages/community/community.vue index 342846f..81d353e 100644 --- a/pages/homepages/community/community.vue +++ b/pages/homepages/community/community.vue @@ -1,6 +1,7 @@ diff --git a/pages/homepages/main/main.vue b/pages/homepages/home/home.vue similarity index 67% rename from pages/homepages/main/main.vue rename to pages/homepages/home/home.vue index bffab1b..13eaf52 100644 --- a/pages/homepages/main/main.vue +++ b/pages/homepages/home/home.vue @@ -1,6 +1,7 @@ diff --git a/pages/homepages/puppy_chat/puppy_chat.vue b/pages/homepages/puppy_chat/puppy_chat.vue index 342846f..caa91d0 100644 --- a/pages/homepages/puppy_chat/puppy_chat.vue +++ b/pages/homepages/puppy_chat/puppy_chat.vue @@ -1,6 +1,7 @@ diff --git a/pages/homepages/self_information/self_information.vue b/pages/homepages/user/user.vue similarity index 67% rename from pages/homepages/self_information/self_information.vue rename to pages/homepages/user/user.vue index 342846f..980e300 100644 --- a/pages/homepages/self_information/self_information.vue +++ b/pages/homepages/user/user.vue @@ -1,6 +1,7 @@ diff --git a/pages/information/boy_height2/boy_height2.vue b/pages/information/boy_height_end/boy_height_end.vue similarity index 80% rename from pages/information/boy_height2/boy_height2.vue rename to pages/information/boy_height_end/boy_height_end.vue index e585428..d4bfcef 100644 --- a/pages/information/boy_height2/boy_height2.vue +++ b/pages/information/boy_height_end/boy_height_end.vue @@ -5,9 +5,9 @@ - + - + @@ -32,12 +32,12 @@ export default { }); }, - goTob_weight() { - this.navigateTo('/pages/information/boy_weight/boy_weight'); + go_to_purpose() { + this.navigateTo('/pages/information/purpose/purpose'); }, - goTob_roll() { - this.navigateTo('/pages/information/boy_roll/boy_roll'); + go_to_roll() { + this.navigateTo('/pages/information/boy_height_roll/boy_height_roll'); }, } } @@ -57,7 +57,7 @@ export default { position: relative; } -/* Human 动画,从页面中部向上移动 */ + .human { position: absolute; width: 100%; @@ -88,8 +88,8 @@ export default { /* Button 延迟显示并加缩放特效,放在下方 */ .button { position: absolute; - height: 13vh; - width: 45vh; + height: 13%; + width: 80%; opacity: 1; right: 10%; /* 距右边 10% */ bottom: 2%; /* 距底部 3.5% */ diff --git a/pages/information/boy_roll/boy_roll.vue b/pages/information/boy_height_roll/boy_height_roll.vue similarity index 86% rename from pages/information/boy_roll/boy_roll.vue rename to pages/information/boy_height_roll/boy_height_roll.vue index 1382012..ffb0085 100644 --- a/pages/information/boy_roll/boy_roll.vue +++ b/pages/information/boy_height_roll/boy_height_roll.vue @@ -8,11 +8,13 @@ - + + - \ No newline at end of file + diff --git a/pages/information/gril_weight/gril_weight.vue b/pages/information/girl_weight/girl_weight.vue similarity index 100% rename from pages/information/gril_weight/gril_weight.vue rename to pages/information/girl_weight/girl_weight.vue diff --git a/pages/information/purpose/purpose.vue b/pages/information/purpose/purpose.vue new file mode 100644 index 0000000..838f1bf --- /dev/null +++ b/pages/information/purpose/purpose.vue @@ -0,0 +1,102 @@ + + + + + diff --git a/pages/information/sex/sex.vue b/pages/information/sex/sex.vue index f12330a..2245b10 100644 --- a/pages/information/sex/sex.vue +++ b/pages/information/sex/sex.vue @@ -1,18 +1,25 @@