From 9b8ab81603154091408f421534d46e5ca91b729a Mon Sep 17 00:00:00 2001
From: "453530270@qq.com" <aa123456>
Date: Mon, 18 Dec 2023 14:05:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E5=86=8C=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/components/main.vue |  7 +++--
 pages/reg/reg.vue               | 53 +++++++++++++++++----------------
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/pages/login/components/main.vue b/pages/login/components/main.vue
index 120dacb..7fc21ba 100644
--- a/pages/login/components/main.vue
+++ b/pages/login/components/main.vue
@@ -318,16 +318,17 @@
   }
   // 找回密码和 立即注册
   .fdreg{
-	  display: flex;
+	 display: flex;
 	 margin-top: 26rpx;
 	 line-height: 1.4;
+	 min-height: 26rpx;
 	 color:#ff0000;
 	 padding-left: 32rpx;
 	 padding-right: 32rpx;
 	 
 	 text{
-		 // display: block;
-		 display: flex;
+		 display: block;
+		 // display: flex;
 		 float: left;
 		 width: 46%;
 		 line-height: 1.4;
diff --git a/pages/reg/reg.vue b/pages/reg/reg.vue
index 821f8b8..2335e6f 100644
--- a/pages/reg/reg.vue
+++ b/pages/reg/reg.vue
@@ -4,7 +4,7 @@
     <!-- 页面头部 -->
     <view class="header">
       <view class="title">
-        <text>登录</text>
+        <text>注册</text>
       </view>
     </view>
     <!-- 表单 -->
@@ -28,16 +28,6 @@
 		  </view>
 	  </radio-group>
 
-      <!-- 登录按钮 -->
-      <view class="login-button" @click="handleLogin">
-        <text>登录</text>
-      </view>
-    </view>
-	<!-- 找回密码 注册 -->
-	<view class="fdreg">
-		<text class="findpass">找回密码</text>
-		<text class="regnow">立即注册</text>
-	</view>
 	<!-- 隐私政策等 -->
 	<div class="privacy">
 		<label>
@@ -45,6 +35,17 @@
 			我已阅读并同意网站的 《隐私政策》和 《用户注册协议》
 		</label>
 	</div>
+	
+      <!-- 登录按钮 -->
+      <view class="login-button" @click="handleLogin">
+        <text>注册</text>
+      </view>
+    </view>
+	<!-- 找回密码 注册 -->
+	<view class="regtips">
+		<view>已拥有账户?<a class="loginnow" @click="gologin">登录</a></view>
+	</view>
+
 
 
   </view>
@@ -209,7 +210,11 @@
         } else {
           this.$navTo('pages/index/index')
         }
-      }
+      },
+	  
+	  gologin(){
+		this.$navTo("pages/login/index")  
+	  },
 
     }
   }
@@ -287,32 +292,28 @@
     color: #fff;
     // border-radius: 80rpx;
     box-shadow: 0px 10px 20px 0px rgba(0, 0, 0, 0.1);
-    letter-spacing: 5rpx;
+    letter-spacing: 15rpx;
     display: flex;
     justify-content: center;
     align-items: center;
   }
   // 找回密码和 立即注册
-  .fdreg{
+  .regtips{
 	  display: flex;
 	 margin-top: 26rpx;
 	 line-height: 1.4;
-	 color:#ff0000;
-	 padding-left: 32rpx;
 	 padding-right: 32rpx;
 	 
-	 text{
-		 display: block;
-		 float: left;
-		 width: 46%;
+	 .loginnow{
+		 color: #5299dc;
+		 
+		 &:hover{
+			 color: #a60000;
+		 }
 	 }
 	 
-	 .findpass{
-		 text-align: left;
-	 }
-	 .regnow{
-		 text-align: right;
-	 }
+	 
+
   }
   
   .privacy{