diff --git a/pages.json b/pages.json index 8281b87..d7448c0 100644 --- a/pages.json +++ b/pages.json @@ -1,101 +1,122 @@ { "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/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": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/information/girl_height/girl_height", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false + "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": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/information/gril_weight/gril_weight", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false + "navigationStyle": "custom" } }, - { - "path": "pages/login/forget_password/forget_password", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - } + { + "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 + // } + // } ], "uniIdRouter": {}, "tabBar": null diff --git a/pages/information/boy_height/boy_height.vue b/pages/information/boy_height/boy_height.vue index 342846f..9d7d5f2 100644 --- a/pages/information/boy_height/boy_height.vue +++ b/pages/information/boy_height/boy_height.vue @@ -1,17 +1,140 @@ diff --git a/pages/information/boy_height2/boy_height2.vue b/pages/information/boy_height2/boy_height2.vue new file mode 100644 index 0000000..e585428 --- /dev/null +++ b/pages/information/boy_height2/boy_height2.vue @@ -0,0 +1,107 @@ + + + + + \ No newline at end of file diff --git a/pages/information/boy_roll/boy_roll.vue b/pages/information/boy_roll/boy_roll.vue new file mode 100644 index 0000000..1382012 --- /dev/null +++ b/pages/information/boy_roll/boy_roll.vue @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + diff --git a/pages/information/boy_roll_w/boy_roll_w.vue b/pages/information/boy_roll_w/boy_roll_w.vue new file mode 100644 index 0000000..3b39006 --- /dev/null +++ b/pages/information/boy_roll_w/boy_roll_w.vue @@ -0,0 +1,81 @@ + + + + + \ No newline at end of file diff --git a/pages/information/boy_weight/boy_weight.vue b/pages/information/boy_weight/boy_weight.vue index 46a28d0..e68dee4 100644 --- a/pages/information/boy_weight/boy_weight.vue +++ b/pages/information/boy_weight/boy_weight.vue @@ -1,17 +1,140 @@ +/* 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/boy_weight2/boy_weight2.vue b/pages/information/boy_weight2/boy_weight2.vue new file mode 100644 index 0000000..849aa26 --- /dev/null +++ b/pages/information/boy_weight2/boy_weight2.vue @@ -0,0 +1,107 @@ + + + + + \ No newline at end of file diff --git a/pages/transition/page3/page3.vue b/pages/transition/page3/page3.vue index 60e1e11..735ab5f 100644 --- a/pages/transition/page3/page3.vue +++ b/pages/transition/page3/page3.vue @@ -8,14 +8,14 @@ - +