diff --git a/assets/images/none.png b/assets/images/none.png
new file mode 100644
index 0000000..c8aaa03
Binary files /dev/null and b/assets/images/none.png differ
diff --git a/assets/images/show.png b/assets/images/show.png
new file mode 100644
index 0000000..6fdda96
Binary files /dev/null and b/assets/images/show.png differ
diff --git a/pages/login/login.js b/pages/login/login.js
index e80796a..7e1c2f5 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -127,10 +127,6 @@ Page({
// 请求短信登录start
UserApi.codeLogin(params).then(res => {
if (res.success) {
- wx.setStorage({
- key: 'userInfo',
- data: res.result.userInfo
- })
// 第一次登录系统，需要设置密码
if(res.message === "updatePassword") {
// 存临时token
@@ -138,9 +134,10 @@ Page({
key: 'token-temp',
data: res.result.token
})
+ let userInfo = JSON.stringify(res.result.userInfo)
// 跳转设置密码页
wx.navigateTo({
- url: '../setPassword/setPassword',
+ url: `../setPassword/setPassword?userInfo=${userInfo}`,
})
}else{
// 存token和userInfo
@@ -148,6 +145,10 @@ Page({
key: 'X-Access-Token',
data: res.result.token
})
+ wx.setStorage({
+ key: 'userInfo',
+ data: res.result.userInfo
+ })
// 绑定微信
this.wxBindPhone()
// 跳转首页
diff --git a/pages/phonePassword/phonePassword.js b/pages/phonePassword/phonePassword.js
index 1943fea..55d90fa 100644
--- a/pages/phonePassword/phonePassword.js
+++ b/pages/phonePassword/phonePassword.js
@@ -10,6 +10,8 @@ Page({
* 页面的初始数据
*/
data: {
+ show: true, // 默认显示的是闭眼睛
+ type: 'password',
form: {
currdatetime: '',
requestCodeSuccess: true,
@@ -18,7 +20,19 @@ Page({
rsaPublicKey: '', // 公钥
flag: false
},
-
+ showPassword(){
+ if(this.data.show){ // 显示睁开眼睛的时候 type="text"
+ this.setData({
+ type: 'text',
+ show: false
+ })
+ }else{
+ this.setData({
+ type: 'password',
+ show: true
+ })
+ }
+ },
back(){
wx.navigateBack({
delta: 1
@@ -108,21 +122,33 @@ Page({
if(this.data.flag){
UserApi.passWordLogin(params).then(res => {
if(res.success){
- // 绑定微信
- this.wxBindPhone()
- // 存token和userInfo
- wx.setStorage({
- key: 'X-Access-Token',
- data: res.result.token
- })
- wx.setStorage({
- key: 'userInfo',
- data: res.result.userInfo
- })
- // 跳转首页
- wx.switchTab({
- url: '../home/home',
- })
+ if(res.message == '请先用手机号登录'){
+ wx.showToast({
+ title: '首次登录请用验证码方式登录',
+ icon: 'none',
+ duration: 2000
+ })
+ setTimeout(() => {
+ wx.navigateBack()
+ }, 2000);
+ return
+ }else{
+ // 绑定微信
+ this.wxBindPhone()
+ // 存token和userInfo
+ wx.setStorage({
+ key: 'X-Access-Token',
+ data: res.result.token
+ })
+ wx.setStorage({
+ key: 'userInfo',
+ data: res.result.userInfo
+ })
+ // 跳转首页
+ wx.switchTab({
+ url: '../home/home',
+ })
+ }
}else{
wx.showToast({
title: res.message,
diff --git a/pages/phonePassword/phonePassword.wxml b/pages/phonePassword/phonePassword.wxml
index 8ec3929..ab3de1a 100644
--- a/pages/phonePassword/phonePassword.wxml
+++ b/pages/phonePassword/phonePassword.wxml
@@ -10,7 +10,9 @@
密码
-
+
+
+
diff --git a/pages/phonePassword/phonePassword.wxss b/pages/phonePassword/phonePassword.wxss
index e9a66f1..7e71d14 100644
--- a/pages/phonePassword/phonePassword.wxss
+++ b/pages/phonePassword/phonePassword.wxss
@@ -6,6 +6,9 @@
.text-label {
width: 60px !important;
}
+.text-value{
+ position: relative;
+}
.forget{
color: #999;
font-size: 14px;
@@ -27,4 +30,12 @@
width: 100%;
height: 90%;
border-radius: 5px;
+}
+.show{
+ width: 15px;
+ height: 15px;
+ position: absolute;
+ right: 10px;
+ top: 8px;
+ z-index: 9;
}
\ No newline at end of file
diff --git a/pages/setPassword/setPassword.js b/pages/setPassword/setPassword.js
index baa00ea..958be81 100644
--- a/pages/setPassword/setPassword.js
+++ b/pages/setPassword/setPassword.js
@@ -11,10 +11,37 @@ Page({
newPassword: '', // 密码
verifyPassword: '', // 确认密码
rsaPublicKey: '',
- flag: false
+ flag: false,
+ show: true, // 默认显示的是闭眼睛
+ showVerify: true,
+ type: 'password',
+ typeVerify: 'password'
},
- bindBlurInput(e){
-
+ showPassword(){
+ if(this.data.show){ // 显示睁开眼睛的时候 type="text"
+ this.setData({
+ type: 'text',
+ show: false
+ })
+ }else{
+ this.setData({
+ type: 'password',
+ show: true
+ })
+ }
+ },
+ showPasswordVerify(){
+ if(this.data.showVerify){ // 显示睁开眼睛的时候 type="text"
+ this.setData({
+ typeVerify: 'text',
+ showVerify: false
+ })
+ }else{
+ this.setData({
+ typeVerify: 'password',
+ showVerify: true
+ })
+ }
},
// 登录
formSubmit(e) {
@@ -84,6 +111,10 @@ Page({
key: 'X-Access-Token',
data: that.data.password
})
+ wx.setStorage({
+ key: 'userInfo',
+ data: this.data.userInfo
+ })
// 绑定微信
this.wxBindPhone()
wx.switchTab({
@@ -111,6 +142,9 @@ Page({
UserApi.wxBind(params).then(res=>{})
})
},
+ onLoad(options){
+ this.data.userInfo = JSON.parse(options.userInfo)
+ },
/**
* 生命周期函数--监听页面显示
*/
diff --git a/pages/setPassword/setPassword.wxml b/pages/setPassword/setPassword.wxml
index 3355739..63f0e2f 100644
--- a/pages/setPassword/setPassword.wxml
+++ b/pages/setPassword/setPassword.wxml
@@ -5,13 +5,17 @@
密码
-
+
+
+
确认密码
-
+
+
+
diff --git a/pages/setPassword/setPassword.wxss b/pages/setPassword/setPassword.wxss
index 4d8b27a..f3b8ea4 100644
--- a/pages/setPassword/setPassword.wxss
+++ b/pages/setPassword/setPassword.wxss
@@ -7,6 +7,9 @@ page {
.form-box{
transform: translateY(100%);
}
+.text-value{
+ position: relative;
+}
.set-password{
display: block;
font-size: 16px;
@@ -16,3 +19,11 @@ page {
margin-bottom: 20px;
letter-spacing: 0.5px;
}
+.show{
+ width: 15px;
+ height: 15px;
+ position: absolute;
+ right: 10px;
+ top: 8px;
+ z-index: 9;
+}
diff --git a/pages/upDateInfo/upDateInfo.js b/pages/upDateInfo/upDateInfo.js
index efb6cd7..70029ff 100644
--- a/pages/upDateInfo/upDateInfo.js
+++ b/pages/upDateInfo/upDateInfo.js
@@ -13,59 +13,54 @@ Page({
oldpassword: '', // 旧密码
password: '', // 新密码
confirmpassword: '', // 确认新密码
- // count: 60, // 倒计时秒
rsaPublicKey: '', // 公钥
},
- // showGetCaptcha: true
+ showOld: true,
+ typeOld: 'password',
+ show: true, // 默认显示的是闭眼睛
+ showVerify: true,
+ type: 'password',
+ typeVerify: 'password'
+ },
+ showPasswordOld(){
+ if(this.data.showOld){ // 显示睁开眼睛的时候 type="text"
+ this.setData({
+ typeOld: 'text',
+ showOld: false
+ })
+ }else{
+ this.setData({
+ typeOld: 'password',
+ showOld: true
+ })
+ }
+ },
+ showPassword(){
+ if(this.data.show){ // 显示睁开眼睛的时候 type="text"
+ this.setData({
+ type: 'text',
+ show: false
+ })
+ }else{
+ this.setData({
+ type: 'password',
+ show: true
+ })
+ }
+ },
+ showPasswordVerify(){
+ if(this.data.showVerify){ // 显示睁开眼睛的时候 type="text"
+ this.setData({
+ typeVerify: 'text',
+ showVerify: false
+ })
+ }else{
+ this.setData({
+ typeVerify: 'password',
+ showVerify: true
+ })
+ }
},
-
- // // 获取验证码
- // getVerCode() {
- // if (/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(this.data.form.phone)) {
- // UserApi.sendCode({
- // phone: this.data.form.phone
- // }).then(res => {
- // // 获取成功，倒计时 start
- // if (res.success) {
- // this.countDown()
- // } else {
- // wx.showToast({
- // title: '获取验证码失败',
- // icon: 'error',
- // duration: 2000
- // })
- // }
- // })
- // } else {
- // wx.showToast({
- // title: '请输入正确的手机号',
- // icon: 'none',
- // duration: 2000
- // })
- // }
- // },
- // 倒计时
- // countDown() {
- // if (countdown === 0) {
- // this.setData({
- // showGetCaptcha: true
- // })
- // countdown = 60;
- // return;
- // } else {
- // this.setData({
- // showGetCaptcha: false
- // })
- // countdown--;
- // this.setData({
- // count: countdown
- // })
- // }
- // setTimeout(() => {
- // this.countDown()
- // }, 1000)
- // // 倒计时 end
- // },
// 提交
formSubmit(e) {
if(!e.detail.value.oldpassword){
diff --git a/pages/upDateInfo/upDateInfo.wxml b/pages/upDateInfo/upDateInfo.wxml
index e1a9482..9d32d28 100644
--- a/pages/upDateInfo/upDateInfo.wxml
+++ b/pages/upDateInfo/upDateInfo.wxml
@@ -4,27 +4,25 @@
旧密码
-
+
+
+
-
新密码
-
+
+
+
确认新密码
-
+
+
+
diff --git a/pages/upDateInfo/upDateInfo.wxss b/pages/upDateInfo/upDateInfo.wxss
index f18450f..ca0291b 100644
--- a/pages/upDateInfo/upDateInfo.wxss
+++ b/pages/upDateInfo/upDateInfo.wxss
@@ -5,3 +5,14 @@
.text-label {
width: 80px !important;
}
+.text-value{
+ position: relative;
+}
+.show{
+ width: 15px;
+ height: 15px;
+ position: absolute;
+ right: 10px;
+ top: 8px;
+ z-index: 9;
+}
\ No newline at end of file