From b3b696f13dbf842c63c498fa652ba47bb5fb7007 Mon Sep 17 00:00:00 2001
From: Gary <3489015381@qq.com>
Date: Thu, 31 Oct 2024 11:50:29 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=87=E6=B8=A1?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E5=8A=A8=E7=94=BB=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/transition/page7/page7.vue | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/pages/transition/page7/page7.vue b/pages/transition/page7/page7.vue
index 03dda92..bedb338 100644
--- a/pages/transition/page7/page7.vue
+++ b/pages/transition/page7/page7.vue
@@ -2,7 +2,6 @@
   <view class="background">
     <!--按钮-->
     <image class="button" @click="goToLoginPage" src="@/static/transition/page7/pictures/button.png"></image>
-
   </view>
 </template>
 
@@ -25,18 +24,30 @@ export default {
   background-position: center;
   height: 100vh;
   display: flex;
-  flex-direction: column; /* 纵向排列 */
-  align-items: center; /* 水平居中 */
-  justify-content: flex-end; /* 使内容向底部对齐 */
-  position: relative; /* 为绝对定位子元素提供相对定位的上下文 */
+  flex-direction: column;
+  align-items: center;
+  justify-content: flex-end;
+  position: relative;
+}
+
+/* 渐变显示动画 */
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
 }
 
 .button {
-  position: absolute; /* 绝对定位 */
+  position: absolute;
   width: 80%;
   height: 12%;
-  bottom: 5%; /* 距离底部 20% 的位置 */
-  left: 50%; /* 水平居中 */
-  transform: translateX(-50%); /* 通过 translateX 使其居中 */
+  bottom: 5%;
+  left: 50%;
+  transform: translateX(-50%);
+  opacity: 0; /* 初始为透明 */
+  animation: fadeIn 2s ease-in forwards; /* 2秒渐变显示 */
 }
 </style>

From e779c4efbca505b965bd2a93adae7516f6cf37e5 Mon Sep 17 00:00:00 2001
From: fzu102201319 <1783982866@qq.com>
Date: Thu, 31 Oct 2024 22:03:34 +0800
Subject: [PATCH 2/3] Update boy_height_end.vue

---
 pages/information/boy_height_end/boy_height_end.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/information/boy_height_end/boy_height_end.vue b/pages/information/boy_height_end/boy_height_end.vue
index d4bfcef..ac1c02e 100644
--- a/pages/information/boy_height_end/boy_height_end.vue
+++ b/pages/information/boy_height_end/boy_height_end.vue
@@ -7,11 +7,11 @@
     <!-- 滚动条 -->
     <image class="roll" @click="go_to_roll()" src="/static/information/boy_height/pictures/roll.png"></image>
     <!-- 按钮 -->
-    <image class="button" @click="go_to_purpose" src="/static/information/boy_height/pictures/button.png"></image>
+    <image class="button" @click="go_to_purpose()" src="/static/information/boy_height/pictures/button.png"></image>
 	<!-- 进度条 -->
 	<image class="progress" src="/static/information/boy_height/pictures/progress.png"></image>
 	<!-- 文本-->
-	<text class="text" @click="goTob_roll">{{height}}</text>
+	<text class="text" @click="go_to_roll()">{{height}}</text>
   </view>
 </template>
 
@@ -101,7 +101,7 @@ export default {
 	font-size: 1.5em; 
 	width: 100%;
 	height: 20%;
-	top: 68%; 
+	top: 69%; 
 	color:#ffffff;
 }
 </style>
\ No newline at end of file

From d53c403d0867bc1924d8636471389eb38d08509a Mon Sep 17 00:00:00 2001
From: fzu102201319 <1783982866@qq.com>
Date: Thu, 31 Oct 2024 22:05:24 +0800
Subject: [PATCH 3/3] Delete
 'pages/information/boy_height_roll/boy_height_roll.vue'

---
 .../boy_height_roll/boy_height_roll.vue       | 94 -------------------
 1 file changed, 94 deletions(-)
 delete mode 100644 pages/information/boy_height_roll/boy_height_roll.vue

diff --git a/pages/information/boy_height_roll/boy_height_roll.vue b/pages/information/boy_height_roll/boy_height_roll.vue
deleted file mode 100644
index ffb0085..0000000
--- a/pages/information/boy_height_roll/boy_height_roll.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<template>
-  <view class="container">
-    <picker-view @change="onPickerChange" class="picker-view">
-      <picker-view-column>
-        <view v-for="(item, index) in options" :key="index" class="item">
-          {{ item }}
-        </view>
-      </picker-view-column>
-    </picker-view>
-
-    <image class="button" @click="go_to_height" src="/static/information/boy_height/pictures/button.png"></image>
-  </view>
-<!-- TODO:修改 -->
-</template>
-
-<script>
-// TODO:修改
-export default {
-  data() {
-    return {
-      options: this.generateHeightOptions(150, 200), 
-      pickerValue: [15], // 默认选中项的索引
-    };
-  },
-  methods: {
-	generateHeightOptions(start, end) {
-		const options = [];
-	    for (let i = start; i <= end; i++) {
-	    options.push(`${i} cm`);
-	    }
-	    return options;
-	},
-    onPickerChange(event) {
-      this.pickerValue = event.detail.value; // 更新选中的索引
-    },
-    navigateTo(page) {
-      uni.navigateTo({
-        url: page
-      });
-    },
-    
-    go_to_height() {
-      const selectedValue = this.options[this.pickerValue[0]]; // 获取选中的值
-      this.navigateTo(`/pages/information/boy_height_end/boy_height_end?height=${selectedValue}`); // 跳转到 boy_height_end，并传递选中值
-    },
-  },
-};
-</script>
-
-<style scoped>
-.container {
-  display: flex;
-  flex-direction: column;
-  align-items: center; /* 水平居中 */
-  justify-content: center; /* 垂直居中 */
-  height: 100vh; /* 使容器充满整个视口 */
-  padding: 20px;
-  background-image: url("/static/information/boy_height/pictures/bkg_roll.png");
-  background-size: cover;
-}
-
-.picker-view {
-  height: 200px; /* 设置 picker-view 的高度 */
-  width: 100%; /* 宽度自适应 */
-}
-
-.item {
-  display: flex;
-  align-items: center; /* 垂直居中每个选项 */
-  justify-content: center; /* 水平居中每个选项 */
-  height: 40px; /* 每个选项的高度 */
-  color: #ffffff;
-}
-
-.button {
-  margin-top: 10px; /* 按钮与选择器之间的间距 */
-  position: absolute;
-  height: 13%;
-  width: 80%;
-  right: 10%; /* 距右边 10% */
-  bottom: 2%; /* 距底部 3.5% */
-}
-</style>
-
-
-
-
-
-
-
-
-
-
-