From df370f084411a0918599763490827cd3c402dcf4 Mon Sep 17 00:00:00 2001
From: limqhz <lmq540344226@163.com>
Date: Fri, 16 Dec 2022 18:42:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=95=E9=83=A8=E5=8D=A0=E4=BD=8D=E7=AC=A6?=
 =?UTF-8?q?=20+=20=E6=8C=89=E9=92=AE=E5=8F=98=E5=A5=BD=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/anniversary/index.wxml       | 1 +
 pages/anniversary/index.wxss       | 3 +++
 pages/login/index.wxml             | 4 ++--
 pages/register/index.js            | 2 +-
 pages/register/ok/index.wxml       | 2 +-
 pages/register/ok/index.wxss       | 3 +++
 pages/register/password/index.js   | 2 +-
 pages/register/password/index.wxml | 6 +++---
 pages/register/password/index.wxss | 3 +++
 pages/task/index.wxml              | 1 +
 pages/task/index.wxss              | 4 +++-
 11 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/pages/anniversary/index.wxml b/pages/anniversary/index.wxml
index 9c8cc72..5d770a2 100644
--- a/pages/anniversary/index.wxml
+++ b/pages/anniversary/index.wxml
@@ -20,6 +20,7 @@
         </view>
         <t-divider content="✿✿✿---■Quinn■---✿✿✿" />
     </view>
+    <view class="block-position"></view>
 </view>
 <t-empty wx:if="{{dataEmpty}}" t-class="empty-cls" icon="info-circle-filled" description="暂无纪念日" />
 <t-fab icon="add" bind:click="handleClick"></t-fab>
diff --git a/pages/anniversary/index.wxss b/pages/anniversary/index.wxss
index 2368c67..b58575e 100644
--- a/pages/anniversary/index.wxss
+++ b/pages/anniversary/index.wxss
@@ -28,3 +28,6 @@ image{
 .countdown {
     margin-top: 5rpx;
 }
+.block-position{
+    height: 50rpx;
+}
diff --git a/pages/login/index.wxml b/pages/login/index.wxml
index d0b18c9..7d6bca6 100644
--- a/pages/login/index.wxml
+++ b/pages/login/index.wxml
@@ -1,6 +1,6 @@
 <view class="inputClass">
-<t-input label="用户名" placeholder="请输入用户名" maxlength="{{10}}" bindchange="inputChange" data-type='userName' clearable />
-<t-input label="输入密码" placeholder="请输入密码" type="password" bindchange="inputChange" data-type='password' clearable />
+<t-input label="用户名" placeholder="请输入用户名" bindchange="inputChange" data-type='userName' clearable />
+<t-input label="密 码" placeholder="请输入密码" type="password" bindchange="inputChange" data-type='password' clearable />
 <t-input placeholder="请输入验证码" bindchange="inputChange" data-type='code' label="验证码">
     <view slot="suffix">
         <image
diff --git a/pages/register/index.js b/pages/register/index.js
index 6ec66f5..747407b 100644
--- a/pages/register/index.js
+++ b/pages/register/index.js
@@ -50,7 +50,7 @@ Page({
 
     checkName() {
         this.closeDialog();
-        wx.navigateTo({url:"/pages/register/password/index?name=" + this.data.checkedName})
+        wx.redirectTo({url:"/pages/register/password/index?name=" + this.data.checkedName})
     },
 
     changeCheckEasy() {
diff --git a/pages/register/ok/index.wxml b/pages/register/ok/index.wxml
index 4992ada..f1679cf 100644
--- a/pages/register/ok/index.wxml
+++ b/pages/register/ok/index.wxml
@@ -8,6 +8,6 @@
 <view class="leaveTop">
     <t-result theme="success" title="成功" description="恭喜{{userName}}注册成功！" />
 </view>
-<view class="leaveTop">
+<view class="leaveTop leave-button">
     <t-button block theme="danger" bind:tap="toLongin">去登录>>></t-button>
 </view>
diff --git a/pages/register/ok/index.wxss b/pages/register/ok/index.wxss
index 441797e..2b10935 100644
--- a/pages/register/ok/index.wxss
+++ b/pages/register/ok/index.wxss
@@ -1,3 +1,6 @@
 .leaveTop{
     margin-top: 88rpx;
 }
+.leave-button{
+    padding: 20rpx;
+}
diff --git a/pages/register/password/index.js b/pages/register/password/index.js
index 98e6dec..7eadab4 100644
--- a/pages/register/password/index.js
+++ b/pages/register/password/index.js
@@ -9,7 +9,7 @@ Page({
     },
 
     toRegister(){
-        wx.navigateTo({url:"/pages/register/ok/index?name=" + this.data.userName})
+        wx.redirectTo({url:"/pages/register/ok/index?name=" + this.data.userName})
     }
 
 });
diff --git a/pages/register/password/index.wxml b/pages/register/password/index.wxml
index 8484fd8..39b6c34 100644
--- a/pages/register/password/index.wxml
+++ b/pages/register/password/index.wxml
@@ -7,9 +7,9 @@
 </view>
 <view class="leaveTop">
     <t-input label="用户名" value="{{userName}}" disabled />
-    <t-input label="输入密码" placeholder="请输入密码" type="password" bindchange="inputChange" data-type='password' clearable />
-    <t-input label="重复输入密码" placeholder="请重复输入密码" type="password" bindchange="inputChange" data-type='rePassword' clearable />
+    <t-input label="设置密码" placeholder="请输入密码" type="password" bindchange="inputChange" data-type='password' clearable />
+    <t-input label="重复设置" placeholder="请重复输入密码" type="password" bindchange="inputChange" data-type='rePassword' clearable />
 </view>
-<view class="leaveTop">
+<view class="leaveTop leave-button">
 <t-button block theme="danger" bind:tap="toRegister">注册</t-button>
 </view>
diff --git a/pages/register/password/index.wxss b/pages/register/password/index.wxss
index 441797e..2b10935 100644
--- a/pages/register/password/index.wxss
+++ b/pages/register/password/index.wxss
@@ -1,3 +1,6 @@
 .leaveTop{
     margin-top: 88rpx;
 }
+.leave-button{
+    padding: 20rpx;
+}
diff --git a/pages/task/index.wxml b/pages/task/index.wxml
index 48b2fea..9565242 100644
--- a/pages/task/index.wxml
+++ b/pages/task/index.wxml
@@ -40,6 +40,7 @@
                         <t-icon wx:if="{{item.notification}}" name="notification"/>
                     </view>
                 </view>
+                <view class="block-position"></view>
             </view>
         </scroll>
     </swiper-item>
diff --git a/pages/task/index.wxss b/pages/task/index.wxss
index 42a6248..55570df 100644
--- a/pages/task/index.wxss
+++ b/pages/task/index.wxss
@@ -47,4 +47,6 @@ checkbox {
 .checkedBox .t-checkbox__content {
     text-decoration:line-through;
 }
-
+.block-position{
+    height: 50rpx;
+}