From dcc0e8b1fa34d141e5b10a51d2b45ef055aa0a7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=BA=9A=E7=94=B7?= Date: Fri, 22 Oct 2021 11:09:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E5=85=B3=E5=AF=86=E7=A0=81=E6=A1=86?= =?UTF-8?q?=E9=83=BD=E5=8A=A0=E4=B8=8A=E5=B0=8F=E7=9C=BC=E7=9D=9B=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=AF=86=E7=A0=81=E6=98=BE=E9=9A=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/images/none.png | Bin 0 -> 4926 bytes assets/images/show.png | Bin 0 -> 6270 bytes pages/login/login.js | 11 +-- pages/phonePassword/phonePassword.js | 58 ++++++++++----- pages/phonePassword/phonePassword.wxml | 4 +- pages/phonePassword/phonePassword.wxss | 11 +++ pages/setPassword/setPassword.js | 40 ++++++++++- pages/setPassword/setPassword.wxml | 8 ++- pages/setPassword/setPassword.wxss | 11 +++ pages/upDateInfo/upDateInfo.js | 95 ++++++++++++------------- pages/upDateInfo/upDateInfo.wxml | 20 +++--- pages/upDateInfo/upDateInfo.wxss | 11 +++ 12 files changed, 181 insertions(+), 88 deletions(-) create mode 100644 assets/images/none.png create mode 100644 assets/images/show.png diff --git a/assets/images/none.png b/assets/images/none.png new file mode 100644 index 0000000000000000000000000000000000000000..c8aaa036a30b7f7a5e6909f5924b7addf794f4aa GIT binary patch literal 4926 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 F`#+sldD#E} literal 0 HcmV?d00001 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