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 @@