Merge remote-tracking branch 'fitjourney前端代码仓库/master'

master
Gary 3 months ago
commit 7671e04efc

@ -8,11 +8,11 @@
<view class="login_ways"> <view class="login_ways">
<!-- --> <!-- -->
<view class="account_words" @click="toPassageEvent" <view class="account_words" @click="toPassageEvent"
:style="{borderBottomColor:passageWordsBottomColor, borderBottom:passageWordsBottomBorder}"> :style="{borderBottom:passageWordsBottomBorder}">
密码登录 密码登录
</view> </view>
<view class="captcha_words" @click="toCaptchaEvent" <view class="captcha_words" @click="toCaptchaEvent"
:style="{borderBottomColor:captchaWordsBottomColor, borderBottom:captchaWordsBottomBorder}"> :style="{borderBottom:captchaWordsBottomBorder}">
验证码登录 验证码登录
</view> </view>
</view> </view>
@ -66,10 +66,8 @@ const captchaButtonColor = computed(() => isSendCaptcha.value ? "#ffffff" : "#00
const captchaButtonText = computed(() => isSendCaptcha.value ? (codeTime.value+"s后重新发送"):"发送验证码") const captchaButtonText = computed(() => isSendCaptcha.value ? (codeTime.value+"s后重新发送"):"发送验证码")
const isPassagePage = ref(true); // const isPassagePage = ref(true); //
const passageWordsBottomBorder = computed(() => isPassagePage.value? "solid":"none"); // const passageWordsBottomBorder = computed(() => isPassagePage.value? "0.1rem solid #094ABC":"none"); //
const passageWordsBottomColor = computed(() => isPassagePage.value? "#094ABC":"#ffffff");// const captchaWordsBottomBorder = computed(() => isPassagePage.value? "none":"0.1rem solid #094ABC"); //
const captchaWordsBottomBorder = computed(() => isPassagePage.value? "none":"solid"); //
const captchaWordsBottomColor = computed(() => isPassagePage.value? "#ffffff":"#094ABC");//
const isOpened = ref(true); // const isOpened = ref(true); //
const eyesStateIcon = ref("../../../static/login/account_login/login_part/closedeyes.png"); const eyesStateIcon = ref("../../../static/login/account_login/login_part/closedeyes.png");
@ -127,6 +125,7 @@ function openEyesEvent()
background-size: cover; background-size: cover;
background-position: center; background-position: center;
height: 100vh; height: 100vh;
width: auto;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
@ -149,53 +148,31 @@ function openEyesEvent()
// left: calc(50% - 314px/2 + 3px); // left: calc(50% - 314px/2 + 3px);
.login_ways{ .login_ways{
position: absolute; position: absolute;
width: 49%; width: 58%;
height: 8.1%; height: 8.1%;
display: flex; display: flex;
.account_words{ .account_words{
// width:36.1%; height: 90%;
// height: 90%; margin-right: 5%;
margin-right: 10%; padding-bottom: 0.5rem;
border-bottom: solid medium #094ABC; border-bottom: 1rem solid #094ABC;
/* 密码登录 */
width: 56px;
height: 24px;
/* Body */
font-family: 'PingFang SC'; font-family: 'PingFang SC';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
font-size: 14px; font-size: 0.9rem;
line-height: 24px; text-align: center;
/* identical to box height, or 171% */
display: flex;
align-items: center;
color: #000364; color: #000364;
/* Inside auto layout */
flex: none;
order: 0;
flex-grow: 0;
} }
.captcha_words{ .captcha_words{
// width:45.2%; height: 90%;
// height: 90%; padding-bottom: 0.5rem;
margin-left: 5%; margin-left: 3%;
/* 验证码登录 */
width: 70px;
height: 24px;
/* Body */
font-family: 'PingFang SC'; font-family: 'PingFang SC';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
font-size: 14px; font-size: 0.9rem;
line-height: 24px; text-align: center;
/* identical to box height, or 171% */
display: flex;
align-items: center;
color: #000364; color: #000364;
/* Inside auto layout */
flex: none;
order: 1;
flex-grow: 0;
} }
} }
.login_form{ .login_form{
@ -209,90 +186,93 @@ function openEyesEvent()
height: 100%; height: 100%;
.login_form_item{ .login_form_item{
height: 25%; height: 25%;
margin-bottom: 10px; margin-bottom: 5%;
} }
.account_box{ .account_box{
padding-left: 10px; padding-left: 3%;
background-color: #D5E9FF; background-color: #D5E9FF;
border-radius: 12px; border-radius: 12px;
.account{ .account{
height: 100%; height: 100%;
padding-left: 30px; padding-left: 11%;
background-image: url("../../../static/login/account_login/login_part/phone_icon.png"); background-image: url("../../../static/login/account_login/login_part/phone_icon.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 4%; background-size: 0.8rem;
background-position: 8px 50%; background-position: 3% 50%;
font-size: 0.8rem;
} }
} }
.passage_box{ .passage_box{
display: flex; display: flex;
justify-content: space-around;
align-items: center; align-items: center;
padding-left: 3%;
background-color: #D5E9FF; background-color: #D5E9FF;
border-radius: 12px; border-radius: 12px;
position: relative;
.passage{ .passage{
height: 100%; height: 100%;
padding-left: 22px; padding-left: 11%;
background-image: url("../../../static/login/account_login/login_part/lock_icon.png"); background-image: url("../../../static/login/account_login/login_part/lock_icon.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 6%; background-size: 0.8rem;
background-position: 0px 50%; background-position: 4.7% 50%;
font-size: 0.8rem;
} }
.eyes{ .eyes{
/* User Interface / No Preview */ width: 1rem;
width: 20px; height: 1rem;
height: 20px; position: absolute;
/* Inside auto layout */ right: 13%;
flex: none;
order: 3;
flex-grow: 0;
} }
} }
.captcha_box{ .captcha_box{
display: flex; display: flex;
justify-content: space-around;
align-items: center; align-items: center;
padding-left: 3%;
background-color: #D5E9FF; background-color: #D5E9FF;
border-radius: 12px; border-radius: 12px;
position: relative;
.captcha{ .captcha{
height: 100%; height: 100%;
padding-left: 40px; padding-left: 11%;
background-image: url("../../../static/login/account_login/login_part/captcha_icon.png"); background-image: url("../../../static/login/account_login/login_part/captcha_icon.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 7%; background-size: 0.8rem;
background-position: 16px 50%; background-position: 4.5% 50%;
font-size: 0.8rem;
} }
.captcha_button{ .captcha_button{
/* 发送验证码 */ /* 发送验证码 */
width: 108px; width: 5.5rem;
height: 34px; height: 1.9rem;
/* Inside auto layout */
flex: none;
order: 3;
flex-grow: 0;
border-radius: 15px; border-radius: 15px;
font-size: 14px; font-size: 0.8rem;
color: #000364; color: #000364;
position: absolute;
right: 5%;
} }
} }
.forget_passage{ .forget_passage{
margin-bottom: 5px; margin-bottom: 0.4rem;
margin-top: 10px; margin-top: 1.2rem;
text-align: right; text-align: right;
color: #000364; color: #000364;
font-family: 'PingFang SC'; font-family: 'PingFang SC';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 24rem;
font-size: 14px; font-size: 0.8rem;
line-height: 24px; // line-height: 24px;
} }
.login_button{ .login_button{
display: flex;
align-items: center;
justify-content: center;
height: 100%; height: 100%;
border-radius: 12px; border-radius: 12px;
background-color: #4A69F7; background-color: #4A69F7;
color: #FFFCFC; color: #FFFCFC;
text-align: center; text-align: center;
font-size: 1.2rem;
} }
} }
} }
@ -304,19 +284,16 @@ function openEyesEvent()
top: 78%; top: 78%;
left: 43%; left: 43%;
object-fit: contain; object-fit: contain;
// left: calc(50% - 56.5px/2 + 0.25px);
} }
.otherways_part{ .otherways_part{
position: absolute; position: absolute;
width: 59%; width: 59%;
height: 10.9%; height: 10.9%;
// left: calc(50% - 243.25px/2 - 0.38px);
top: 82%; top: 82%;
.otherways_tips{ .otherways_tips{
position: absolute; position: absolute;
width: 98.6%; width: 98.6%;
height: 24%; height: 24%;
// left: calc(50% - 243.25px/2 - 0.38px);
top: 0%; top: 0%;
} }
.two_ways{ .two_ways{
@ -332,18 +309,16 @@ function openEyesEvent()
.qq_icon{ .qq_icon{
/* qq图标 */ /* qq图标 */
position: absolute; position: absolute;
width: 43.9%; width: 2.6rem;
height: 88%; height: 2.6rem;
left: 0%; left: 0%;
// background: url(image.png);
} }
.weixin_icon{ .weixin_icon{
/* 微信图标 */ /* 微信图标 */
position: absolute; position: absolute;
width: 40%; width: 2.2rem;
height: 89%; height: 2.2rem;
left: 50%; left: 50%;
// background: url(image.png);
} }
} }
} }

@ -1,8 +1,8 @@
{ {
"hash": "3dcffc29", "hash": "239ea83a",
"configHash": "cc60d382", "configHash": "3f4641d2",
"lockfileHash": "e3b0c442", "lockfileHash": "e3b0c442",
"browserHash": "e601f541", "browserHash": "619b4131",
"optimized": {}, "optimized": {},
"chunks": {} "chunks": {}
} }
Loading…
Cancel
Save