From 4c99a6d9eab85b06ce3947ecf3da3af54307d05e Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期三, 21 八月 2024 16:05:00 +0800
Subject: [PATCH] 提交
---
pages/tabBar/count/count.vue | 61 ++++++++++++------------------
pages/index/index.vue | 36 +++++++-----------
2 files changed, 38 insertions(+), 59 deletions(-)
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 492ff3b..99b3d8f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -13,22 +13,21 @@
<view>
<u-form :model="form" ref="uForm" class="form" >
<u-form-item style="width: 80%;"><u-input v-model="form.username" :class="{'isFocused': userFocused}" placeholder="请输入用户名" @focus="focusUser"/></u-form-item>
- <u-form-item style="margin-top: 10px;width: 80%;" ><u-input v-model="form.password" :class="{'isFocused': codeFocused}" :type="codeType" placeholder="请输入密码" @focus="focusCode">
- <template slot="suffix">
- <u-icon v-show="codeType == 'password'" name="eye" color="#999" size="20" @click="viewCode"></u-icon>
- <u-icon v-show="codeType == 'text'" name="eye-off" color="#999" size="20" @click="viewCode"></u-icon>
- </template>
- </u-input></u-form-item>
- <!-- <view class="loginPsw">
- <u-checkbox-group >
- <u-checkbox disabled="true"></u-checkbox><text style="color: #fff;">自动登录</text>
- </u-checkbox-group>
- <text style="color: lightblue;">忘记密码</text>
- </view> -->
+ <u-form-item style="margin-top: 10px;width: 80%;" >
+ <u-input v-show="isPwd" v-model="form.password" :class="{'isFocused': codeFocused}" :password="true" placeholder="请输入密码" @focus="focusCode">
+ <template slot="suffix">
+ <u-icon name="eye" color="#999" size="20" @click="isPwd = false"></u-icon>
+ </template>
+ </u-input>
+ <u-input v-show="!isPwd" v-model="form.password" :class="{'isFocused': codeFocused}" :password="false" placeholder="请输入密码" @focus="focusCode">
+ <template slot="suffix">
+ <u-icon name="eye-off" color="#999" size="20" @click="isPwd = true"></u-icon>
+ </template>
+ </u-input>
+ </u-form-item>
<u-form-item style="margin-top: 10px;width: 80%;">
<u-button class="loginBtn" :loading="isLogining" style="width: 100%;height: 56px;border-radius: 28px" @click="Login" type="primary">登录</u-button>
</u-form-item>
- <!-- <view style="color: white;margin-top: 150px;">技术支持：技术保障部</view>-->
</u-form>
</view>
</view>
@@ -56,7 +55,7 @@
code: '',
uuid: ''
},
- codeType: 'password',
+ isPwd: true,
type: '',
//极光推送
connectStatus: '未连接',
@@ -195,13 +194,6 @@
focusCode(){
this.codeFocused = true
this.userFocused = false
- },
- viewCode(){
- if(this.codeType == 'password'){
- this.codeType = 'text'
- } else{
- this.codeType = 'password'
- }
}
}
}
@@ -239,7 +231,7 @@
transform: translate(-50%, -50%)
}
50% {
- transform: translate(-50%, calc(-50% + 12rpx))
+ transform: translate(-50%, calc(-50% + 15rpx))
}
}
diff --git a/pages/tabBar/count/count.vue b/pages/tabBar/count/count.vue
index 7849718..2ae4c74 100644
--- a/pages/tabBar/count/count.vue
+++ b/pages/tabBar/count/count.vue
@@ -59,38 +59,40 @@
</view>
<u-modal :show="showModal" title="修改密码" :showConfirmButton="false" :closeOnClickOverlay="true" ref="uModal" :asyncClose="true" @close="closeModal()">
<view>
- <u--form labelPosition="top" labelWidth="120" :model="pwdForm" :rules="rules" ref="uForm">
+ <u-form labelPosition="top" labelWidth="120" :model="pwdForm" :rules="rules" ref="uForm">
<u-form-item
prop="password"
ref="password"
label="新密码"
>
- <u--input
- v-model="pwdForm.password"
- placeholder="请输入新密码"
- :type="codeType1"
- >
+ <u-input v-show="isPwd1" v-model="pwdForm.password" placeholder="请输入新密码" :password="true">
<template slot="suffix">
- <u-icon v-show="codeType1 == 'password'" name="eye" color="#999" size="20" @click="viewCode(1)"></u-icon>
- <u-icon v-show="codeType1 == 'text'" name="eye-off" color="#999" size="20" @click="viewCode(1)"></u-icon>
+ <u-icon name="eye" color="#999" size="20" @click="isPwd1 = false"></u-icon>
</template>
- </u--input>
+ </u-input>
+ <u-input v-show="!isPwd1" v-model="pwdForm.password" placeholder="请输入新密码" :password="false">
+ <template slot="suffix">
+ <u-icon name="eye-off" color="#999" size="20" @click="isPwd1 = true"></u-icon>
+ </template>
+ </u-input>
</u-form-item>
<u-form-item
prop="rePassword"
ref="rePassword"
label="确认密码"
>
- <u--input
- v-model="pwdForm.rePassword"
- placeholder="请确认密码"
- :type="codeType2"
- ><template slot="suffix">
- <u-icon v-show="codeType2 == 'password'" name="eye" color="#999" size="20" @click="viewCode(2)"></u-icon>
- <u-icon v-show="codeType2 == 'text'" name="eye-off" color="#999" size="20" @click="viewCode(2)"></u-icon>
- </template></u--input>
+ <u-input v-show="isPwd2" v-model="pwdForm.rePassword" placeholder="请输入新密码" :password="true">
+ <template slot="suffix">
+ <u-icon name="eye" color="#999" size="20" @click="isPwd2 = false"></u-icon>
+ </template>
+ </u-input>
+ <u-input v-show="!isPwd2" v-model="pwdForm.rePassword" placeholder="请输入新密码" :password="false">
+ <template slot="suffix">
+ <u-icon name="eye-off" color="#999" size="20" @click="isPwd2 = true"></u-icon>
+ </template>
+ </u-input>
</u-form-item>
- </u--form>
+ </u-form>
<u-button type="primary" style="margin-top: 20px" text="确认" @click="confirmPwd()"></u-button>
</view>
</u-modal>
@@ -160,8 +162,8 @@
}
]
},
- codeType1: 'password',
- codeType2: 'password'
+ isPwd1: true,
+ isPwd2: true
}
},
@@ -233,23 +235,6 @@
t.showModal = true
},
- viewCode(type){
- const t = this
- if(type == 1){
- if(this.codeType1 == 'password'){
- this.codeType1 = 'text'
- } else{
- this.codeType1 = 'password'
- }
- }else{
- if(this.codeType2 == 'password'){
- this.codeType2 = 'text'
- } else{
- this.codeType2 = 'password'
- }
- }
- },
-
confirmPwd(){
const t = this
t.$refs.uForm.validate().then(res => {
@@ -299,6 +284,8 @@
password: '',
rePassword: ''
}
+ this.isPwd1 = true
+ this.isPwd2 = true
}
}
}
--
Gitblit v1.9.2