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 @@ - 登录 + 注册 @@ -28,16 +28,6 @@ - - - 登录 - - - - - 找回密码 - 立即注册 -
+ + + + 注册 + + + + + 已拥有账户?登录 + + @@ -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{