From 0ca78ec9ee5e0161ef7dbf3936b9692edfbbd2c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=BA=9A=E7=94=B7?= Date: Thu, 28 Oct 2021 18:04:54 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E7=AD=89=E9=A1=B5=E9=9D=A2=E9=87=8D=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/images/wx.png | Bin 3073 -> 3093 bytes assets/js/http/userApi.js | 2 +- pages/forgetPassword/forgetPassword.js | 10 -- pages/forgetPassword/forgetPassword.wxml | 24 ++-- pages/forgetPassword/forgetPassword.wxss | 124 +++++++++++++++++- pages/login/login.js | 1 + pages/login/login.json | 4 +- pages/login/login.wxml | 21 ++- pages/login/login.wxss | 105 ++++++++++++++- pages/mineInfo/mineInfo.js | 2 +- pages/mineInfo/mineInfo.wxml | 4 +- pages/phonePassword/phonePassword.js | 5 - pages/phonePassword/phonePassword.json | 3 +- pages/phonePassword/phonePassword.wxml | 38 ++++-- pages/phonePassword/phonePassword.wxss | 157 +++++++++++++++++++---- pages/setPassword/setPassword.js | 17 +-- pages/setPassword/setPassword.wxml | 12 +- pages/setPassword/setPassword.wxss | 71 +++++++--- pages/upDateInfo/upDateInfo.js | 15 --- pages/upDateInfo/upDateInfo.wxml | 18 +-- pages/upDateInfo/upDateInfo.wxss | 133 +++++++++++++++++-- 21 files changed, 613 insertions(+), 153 deletions(-) diff --git a/assets/images/wx.png b/assets/images/wx.png index 20dc292124661a7308a43afb60847c5c1cd41390..30dd07969466793e70f70990aaead2becc6bc83d 100644 GIT binary patch literal 3093 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 literal 3073 zcmV+c4F2!BG(qL~K%r$3&&o@{=jsZy z6ww2C)|JIo6ctq3M3$FjthNNhbMW=x;B~=uaarDkkL-bf6A&n- ze9J@-x{`qO4n&Dy_NAc3pyY9DdiEBzd{u#xy4h?9kH8xsbz>6&8Nw^9t?4P~0j&m8z8#lyf=4zNDC4%9$7?m@<9gqs z!?X)7H=Vp=Le6(eHC7A?vmb-%2k8W zAd{`*{TpDvprl!6j3c1iNXMKZ&48mo4F$Q$W?HqQB}7{UC1d;a1gg>Q>|i#;-we7y z+^#Ws6V@E}Md%Y0w(S}tv9lxWGX7BTcJ#=BYJ)hYV1)d3?Gu#rd~-GkG4l%SF!TgD z`Dxh}Iele8xw_MQ)=nL>VBt8_flew(K8P16p|W{SyXd6Q5)tyaRw=w!@{zX!d;;?%N$-Q~as zC0}9VFW;h0yrP;9Pe)4VTh_Fk#&I`-GUm(aokI$j~aI^dg^15J!~$*wcdH}BbQI&@gJ7*sK`w#f-bR{a^^{( zq+2a)marO);q_sQ=c{}v*0=lOfkb` zm0MKwF1{|?)A-w(;q#?sB-faeH*^0hJcHz-Wd%3EUE76>w^?r0P_U|-;x?`K?U>f* z_7>^4mF+=6eHAIn~G78(;Hsf>krYIS zjTz>RzkGvPi4XYPd6ekKe4PbHb8*amS_!!i8hV_8QUQ=C9xg8?J&GG*NAPs<(S_y5)?r)OZneBBNqWA;2?8AthdaBcD`sEu8jZ6evt_BS|{q<{OUU1gow^8kK!qRs#Zt6P9ix1nC<`u5w)sf8< zew)Iiu$bn(;V&XOG=f*CL~s7@5gJ|4YX za>nG^lA^WPTDBXB#$H%H=qW^pc4|g;qPhgn9C!n@Vl5uKb~5hnd7~_!_lrNr+Ebf3 zKw-O&3O}W(ggd&MFe~AH4xzxVi-)lJtPP8OES&~s6?IjJ3hm?*IF_CeLA{n%Q)QS} zJp0gF%Jq}{6r1IJP(F{=Q^GA>N8`D~2f&g}N*c2#%o}A!wzV5eXFgQ$5{DSNj+ktg zOhWl$A2|sF!uv>HK1S!?<@tmKfcDc8kgeTLI!ZB(0~AW>TvbuB+(4LZ*l_&<^w7up z9cSM80

E^ufM0vZv3g%U58UOXVKTt10f#% zOi4`{o;~*)D-#xgi=M7TcW6Qb!U_}oSGbM zQ&2*P78|Z#DD5gN^k?}GCGFO3W02MVAtj`$XjtU@)`<@l_idJ=Rh!Lkkj831%#S$b zIICCzM##R%%Ar|E>U1qvKPALxoEI>C-$JfDOS5dgG+V6ZA_CH1iNIjeuq^+|p_zyZ zY3`f_B7>D)SuU6DJW88a-AA%3dFD9~$TFo&f=L%|yaulhej3q10EQLkXCHbSM=zh` zRFP)pn>;Fnfz*;YrOT3c({;uRNsmbBN41UZYJWMr0>w3a%NU^5by|1tont*}$yW{T z-v}j7sZ}b_e$3ZlG0gqFZc(+ISm^NDu?^g6_&jyMI7#PIKu-MD$3xjRKDJ8=Zj2p) zff4;=0b)UAk^Lmf>#A^b*HKc4!77rIcg>dKA*Idl`IP$E61B~P5?oSE*i1A zDCh+pT+}7`9cP{8Qi6#!=0(rwJ4GtEJ$2w!9Ju83G^m#-O6g*2dQP*GTV8Rybbsek z$2{}KylPg^-*T?Sv%`(RP@q_FUmWOpKS(y2k!CgjK>%S%2);x~Fs4S^@lbv`vO%YG z>x|U^eYEX#Y;#Gg^G(^Z=Y)Nqxc=U3FgpHEPh3+RtTxio+$XNtcl-TpzK_|PVKa}X zlx*#w_k27@RRhs|OMXVKt)<1P$dEF_OCVj5>(KXoC@@9t*tsV_ia@#Q*s&eyqYgS_ zYDCbxl>oxVsu&c>#;~O%l7E9B@S<;9Z8j9;M4*4nOKXKYgbib0##aTOBbHxcyrB^1_r6$n+@R(@+JW0$Ef0=cAyITG549`zDa`%&6^iJ2qgh=*=>#RTLY-#`Rr^pTH z_m_73d}irQCarF?0O=W`WQa}PWTGTYI$}mq3qotW-edyyYh7*kCe!}_PVI#`2oWRf P00000NkvXXu0mjfBirT4 diff --git a/assets/js/http/userApi.js b/assets/js/http/userApi.js index 6c4e6ae..2dae09b 100644 --- a/assets/js/http/userApi.js +++ b/assets/js/http/userApi.js @@ -43,7 +43,7 @@ const UserApi = { // 退出 logout: (params) => http.post(`${URL_CONFIG}sys/logout`, params), // 个人信息 - mineInfo: (params) => http.get(`${URL_CONFIG}company/payContactsManagement/queryByIdMeeting`, params), + mineInfo: (params) => http.get(`${URL_CONFIG}company/payContactsManagement/queryByIdGetContract`, params), // 编辑个人信息提交 editMineInfo: (params) => http.post(`${URL_CONFIG}company/payContactsManagement/companyEdit`, params), // 我的资料 diff --git a/pages/forgetPassword/forgetPassword.js b/pages/forgetPassword/forgetPassword.js index e6c3bfe..2d3d9c2 100644 --- a/pages/forgetPassword/forgetPassword.js +++ b/pages/forgetPassword/forgetPassword.js @@ -88,11 +88,6 @@ Page({ }, clearrepeatval(){ this.data.vals = [] - wx.showToast({ - title: '禁止复制粘贴请手动输入', - icon: 'none', - duration: 2000 - }) this.setData({ password: '' }) @@ -100,11 +95,6 @@ Page({ }, clearrepeatvalVerify(){ this.data.valsVerify = [] - wx.showToast({ - title: '禁止复制粘贴请手动输入', - icon: 'none', - duration: 2000 - }) this.setData({ verifyPassword: '' }) diff --git a/pages/forgetPassword/forgetPassword.wxml b/pages/forgetPassword/forgetPassword.wxml index 710d629..c65aa0c 100644 --- a/pages/forgetPassword/forgetPassword.wxml +++ b/pages/forgetPassword/forgetPassword.wxml @@ -1,30 +1,30 @@

- - 手机号 - + + 手机号 + - - 验证码 - + + 验证码 + 获取验证码 {{count}} - - 新密码 - + + 新密码 + - - 确认密码 - + + 确认密码 + diff --git a/pages/forgetPassword/forgetPassword.wxss b/pages/forgetPassword/forgetPassword.wxss index e6de5cf..38199fe 100644 --- a/pages/forgetPassword/forgetPassword.wxss +++ b/pages/forgetPassword/forgetPassword.wxss @@ -3,20 +3,132 @@ page { width: 100%; color: #333; } +.container-box{ + overflow-x: hidden; +} + .form-box{ - transform: translateY(50%); + display: block; + box-sizing: border-box; + width: 100%; + height: auto; + background-color: #fff; + border-top-left-radius: 15px; + border-top-right-radius: 15px; + padding: 30px 20px; } -.text-value{ +.form-box .item { position: relative; + display: block !important; + width: 100%; + margin-bottom: 25px; } -.text-password input{ - padding-right: 30px; +.form-box .label{ + width: 100%; + color: #A4A4A4; + font-size: 12px; + margin-bottom: 10px; +} +.form-box .value{ + width: 100%; +} +.form-box .value input{ + width: 100%; + box-sizing: border-box; + background-color: #F2F2F4; + border-radius: 8px; + color: #333; + font-size: 15px; + height: 50px; + padding: 0 90px 0 20px; +} +.form-box .captcha{ + color: #069F99; + position: absolute; + right: 10px; + font-size: 13px; + top: 55%; + z-index: 9; +} +.form-box .view-flex{ + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + height: 50px; +} +.form .view-flex .value{ + flex: 1; +} +.form-box .captchaImage{ + width: 140px; + height: 50px; + flex-shrink: 0; + margin-left: 20px; +} +.form-box .captchaImage image{ + width: 100%; + height: 50px; + border-radius: 10px; +} +.form-box .count { + color: #999; +} +.btn-area button{ + background-color: #069F99 !important; + height: 50px; + display: flex; + justify-content: center; + align-items: center; + border-radius: 10px; +} +.other-way{ + color: #A4A4A4; + font-size: 12px; + display: block; + width: 100%; + text-align: center; + margin-top: 70px; + letter-spacing: 1px; +} +.weixin{ + margin-top: 30px !important; + width: 55px !important; + height: 55px !important; + background-color: #F2F2F4; + border-radius: 10px; + margin: auto; + display: flex; + justify-content: center; + align-items: center; +} +.weixin image{ + width: 32px !important; + height: 26px !important; +} +.forget{ + color: #999; + font-size: 14px; + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 20px; +} +.weixin{ + width: 100%; + display: flex; + justify-content: center; + margin-top: 70px; +} +.weixin image{ + width: 50px; + height: 50px; } .show{ width: 15px; height: 15px; position: absolute; right: 10px; - top: 8px; + top: 58%; z-index: 9; -} +} \ No newline at end of file diff --git a/pages/login/login.js b/pages/login/login.js index 7d342a0..d530ecd 100644 --- a/pages/login/login.js +++ b/pages/login/login.js @@ -93,6 +93,7 @@ Page({ wx.getStorage({ key: 'authorize', success(result){ + console.log(result) // 做过查看微信用户信息 if(result.data){ // 做过用户信息获取 wx.showToast({ diff --git a/pages/login/login.json b/pages/login/login.json index e301e43..965b8e8 100644 --- a/pages/login/login.json +++ b/pages/login/login.json @@ -1,4 +1,4 @@ { - "navigationBarTitleText": "登录", - "usingComponents": {} + "usingComponents": {}, + "navigationStyle": "custom" } \ No newline at end of file diff --git a/pages/login/login.wxml b/pages/login/login.wxml index 62bd907..32e5d60 100644 --- a/pages/login/login.wxml +++ b/pages/login/login.wxml @@ -1,14 +1,22 @@ + + + + + 您好，欢迎使用 + 标准所协同工作平台 + + - - 手机号 - + + 手机号 + - - 验证码 - + + 验证码 + 获取验证码 @@ -21,6 +29,7 @@ 手机密码登录 忘记密码？ + 或用以下方式登录 diff --git a/pages/login/login.wxss b/pages/login/login.wxss index 11fbe39..7dab361 100644 --- a/pages/login/login.wxss +++ b/pages/login/login.wxss @@ -2,9 +2,112 @@ page { overflow-x: hidden; width: 100%; color: #333; + box-sizing: border-box; +} +.container-box{ + overflow-x: hidden; } .form-box{ - transform: translateY(20%); + transform: translateY(-50px) !important; +} +.home-bg{ + height: 200pt; +} +.bg-text{ + position: relative; + top: -100pt; + left: 34pt; + color: #fff; +} +.bg-text text:nth-child(1){ + display: block; + font-size: 15px; + margin-bottom: 8px; +} +.bg-text text:nth-child(2){ + display: block; + font-size: 18px; + font-weight: 600; + letter-spacing: 1px; +} +.form-box{ + display: block; + box-sizing: border-box; + width: 100%; + height: auto; + background-color: #fff; + border-top-left-radius: 15px; + border-top-right-radius: 15px; + transform: translateY(-10%); + padding: 30px 20px; +} +.form-box .item { + position: relative; + display: block !important; + width: 100%; + margin-bottom: 25px; +} +.form-box .label{ + width: 100%; + color: #A4A4A4; + font-size: 12px; + margin-bottom: 10px; +} +.form-box .value{ + width: 100%; +} +.form-box .value input{ + width: 100%; + box-sizing: border-box; + background-color: #F2F2F4; + border-radius: 8px; + color: #333; + font-size: 15px; + height: 50px; + padding: 0 90px 0 20px; +} +.form-box .captcha{ + color: #069F99; + position: absolute; + right: 10px; + font-size: 13px; + top: 55%; + z-index: 9; +} +.form-box .count { + color: #999; +} +.btn-area button{ + background-color: #069F99 !important; + height: 50px; + display: flex; + justify-content: center; + align-items: center; + border-radius: 10px; +} +.other-way{ + color: #A4A4A4; + font-size: 12px; + display: block; + width: 100%; + text-align: center; + margin-top: 70px; + letter-spacing: 1px; +} +.weixin{ + margin-top: 30px !important; + width: 55px !important; + height: 55px !important; + background-color: #F2F2F4; + border-radius: 10px; + margin: auto; + display: flex; + justify-content: center; + align-items: center; +} +.weixin image{ + width: 32px !important; + height: 26px !important; } .forget{ color: #999; diff --git a/pages/mineInfo/mineInfo.js b/pages/mineInfo/mineInfo.js index dfe29e6..bf54e4c 100644 --- a/pages/mineInfo/mineInfo.js +++ b/pages/mineInfo/mineInfo.js @@ -12,7 +12,7 @@ Page({ name: '', companyName: '', post: '', - gender: '1', + gender: null, phone: '', contactAddress: '', email: '', diff --git a/pages/mineInfo/mineInfo.wxml b/pages/mineInfo/mineInfo.wxml index 9a5304a..f4f3b6d 100644 --- a/pages/mineInfo/mineInfo.wxml +++ b/pages/mineInfo/mineInfo.wxml @@ -23,7 +23,7 @@ 性别 - + @@ -32,7 +32,7 @@ diff --git a/pages/phonePassword/phonePassword.js b/pages/phonePassword/phonePassword.js index cf4bb7f..ea3fad9 100644 --- a/pages/phonePassword/phonePassword.js +++ b/pages/phonePassword/phonePassword.js @@ -52,11 +52,6 @@ Page({ }, clearrepeatval(){ this.data.vals = [] - wx.showToast({ - title: '禁止复制粘贴请手动输入', - icon: 'none', - duration: 2000 - }) this.setData({ password: '' }) diff --git a/pages/phonePassword/phonePassword.json b/pages/phonePassword/phonePassword.json index e301e43..7bc51df 100644 --- a/pages/phonePassword/phonePassword.json +++ b/pages/phonePassword/phonePassword.json @@ -1,4 +1,5 @@ { "navigationBarTitleText": "登录", - "usingComponents": {} + "usingComponents": {}, + "navigationStyle": "custom" } \ No newline at end of file diff --git a/pages/phonePassword/phonePassword.wxml b/pages/phonePassword/phonePassword.wxml index 0e6a5e0..99981e5 100644 --- a/pages/phonePassword/phonePassword.wxml +++ b/pages/phonePassword/phonePassword.wxml @@ -1,27 +1,37 @@ - + + + + + + 您好，欢迎使用 + 标准所协同工作平台 + + - - 手机号 - + + 手机号 + - - 密码 - + + 密码 + - - 验证码 - - - - - + + 验证码 + + + + + + + 重新获取 diff --git a/pages/phonePassword/phonePassword.wxss b/pages/phonePassword/phonePassword.wxss index 9c3871e..1bb29ec 100644 --- a/pages/phonePassword/phonePassword.wxss +++ b/pages/phonePassword/phonePassword.wxss @@ -1,16 +1,133 @@ -/* pages/meeting/meeting.wxss */ +page { + overflow-x: hidden; + width: 100%; + color: #333; +} +.container-box{ + overflow-x: hidden; +} .form-box{ - transform: translateY(25%); + transform: translateY(-50px) !important; } - -.text-label { - width: 60px !important; +.home-bg{ + height: 200pt; } -.text-value{ +.bg-text{ position: relative; + top: -100pt; + left: 34pt; + color: #fff; } -.text-password input{ - padding-right: 30px; +.bg-text text:nth-child(1){ + display: block; + font-size: 15px; + margin-bottom: 8px; +} +.bg-text text:nth-child(2){ + display: block; + font-size: 18px; + font-weight: 600; + letter-spacing: 1px; +} +.form-box{ + display: block; + box-sizing: border-box; + width: 100%; + height: auto; + background-color: #fff; + border-top-left-radius: 15px; + border-top-right-radius: 15px; + transform: translateY(-10%); + padding: 30px 20px; +} +.form-box .item { + position: relative; + display: block !important; + width: 100%; + margin-bottom: 25px; +} +.form-box .label{ + width: 100%; + color: #A4A4A4; + font-size: 12px; + margin-bottom: 10px; +} +.form-box .value{ + width: 100%; +} +.form-box .value input{ + width: 100%; + box-sizing: border-box; + background-color: #F2F2F4; + border-radius: 8px; + color: #333; + font-size: 15px; + height: 50px; + padding: 0 90px 0 20px; +} +.form-box .captcha{ + color: #069F99; + position: absolute; + right: 10px; + font-size: 13px; + top: 55%; + z-index: 9; +} +.form-box .view-flex{ + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + height: 50px; +} +.form .view-flex .value{ + flex: 1; +} +.form-box .captchaImage{ + width: 140px; + height: 50px; + flex-shrink: 0; + margin-left: 20px; +} +.form-box .captchaImage image{ + width: 100%; + height: 50px; + border-radius: 10px; +} +.form-box .count { + color: #999; +} +.btn-area button{ + background-color: #069F99 !important; + height: 50px; + display: flex; + justify-content: center; + align-items: center; + border-radius: 10px; +} +.other-way{ + color: #A4A4A4; + font-size: 12px; + display: block; + width: 100%; + text-align: center; + margin-top: 70px; + letter-spacing: 1px; +} +.weixin{ + margin-top: 30px !important; + width: 55px !important; + height: 55px !important; + background-color: #F2F2F4; + border-radius: 10px; + margin: auto; + display: flex; + justify-content: center; + align-items: center; +} +.weixin image{ + width: 32px !important; + height: 26px !important; } .forget{ color: #999; @@ -20,25 +137,21 @@ align-items: center; margin-top: 20px; } -.captcha{ - padding: 0 !important; - background-color: #fff !important; -} -.count{ - background-color: #f5f5f5 !important; - color: #999 !important; -} -.captcha image{ - display: block; +.weixin{ width: 100%; - height: 90%; - border-radius: 5px; + display: flex; + justify-content: center; + margin-top: 70px; +} +.weixin image{ + width: 50px; + height: 50px; } .show{ width: 15px; height: 15px; position: absolute; right: 10px; - top: 8px; + top: 58%; z-index: 9; -} +} \ No newline at end of file diff --git a/pages/setPassword/setPassword.js b/pages/setPassword/setPassword.js index e98d0ae..0e8b2c8 100644 --- a/pages/setPassword/setPassword.js +++ b/pages/setPassword/setPassword.js @@ -29,11 +29,6 @@ Page({ }, clearrepeatval(){ this.data.valsNew = [] - wx.showToast({ - title: '禁止复制粘贴请手动输入', - icon: 'none', - duration: 2000 - }) this.setData({ newPassword: '' }) @@ -41,11 +36,6 @@ Page({ }, clearrepeatvalVerify(){ this.data.valsVerify = [] - wx.showToast({ - title: '禁止复制粘贴请手动输入', - icon: 'none', - duration: 2000 - }) this.setData({ verifyPassword: '' }) @@ -155,13 +145,14 @@ Page({ verifyPassword: encrypt(this.data.rsaPublicKey, e.detail.value.verifyPassword), // 确认密码 rsaPublicKey: this.data.rsaPublicKey } - // 请求短信登录start + // 请求登录start UserApi.setPassword(params).then(res => { + console.log(res) if (res.success) { // 成功设置密码，跳转首页 wx.setStorage({ key: 'X-Access-Token', - data: that.data.password + data: this.data.password }) wx.setStorage({ key: 'userInfo', @@ -195,7 +186,7 @@ Page({ }) }, onLoad(options){ - // this.data.userInfo = JSON.parse(options.userInfo) + this.data.userInfo = JSON.parse(options.userInfo) }, /** * 生命周期函数--监听页面显示 diff --git a/pages/setPassword/setPassword.wxml b/pages/setPassword/setPassword.wxml index 924b9b0..be8925b 100644 --- a/pages/setPassword/setPassword.wxml +++ b/pages/setPassword/setPassword.wxml @@ -2,17 +2,17 @@ 初次登录请设置密码 - - 密码 - + + 密码 + - - 确认密码 - + + 确认密码 + diff --git a/pages/setPassword/setPassword.wxss b/pages/setPassword/setPassword.wxss index 43e4115..ba852b2 100644 --- a/pages/setPassword/setPassword.wxss +++ b/pages/setPassword/setPassword.wxss @@ -1,32 +1,69 @@ -/* pages/meeting/meeting.wxss */ page { - overflow: hidden; + overflow-x: hidden; width: 100%; color: #333; } +.container-box{ + overflow-x: hidden; +} + .form-box{ - transform: translateY(20%); -} -.text-value{ - position: relative; -} -.text-password input{ - padding-right: 30px; + display: block; + box-sizing: border-box; + width: 100%; + height: auto; + background-color: #fff; + border-top-left-radius: 15px; + border-top-right-radius: 15px; + padding: 30px 20px; } .set-password{ - display: block; - font-size: 16px; - color: #333; - width: 100%; text-align: center; - margin-bottom: 20px; - letter-spacing: 0.5px; + display: block; + width: 100%; } +.form-box .item { + position: relative; + display: block !important; + width: 100%; + margin-bottom: 25px; +} +.form-box .label{ + width: 100%; + color: #A4A4A4; + font-size: 12px; + margin-bottom: 10px; +} +.form-box .value{ + width: 100%; +} +.form-box .value input{ + width: 100%; + box-sizing: border-box; + background-color: #F2F2F4; + border-radius: 8px; + color: #333; + font-size: 15px; + height: 50px; + padding: 0 90px 0 20px; +} + + +.btn-area button{ + background-color: #069F99 !important; + height: 50px; + display: flex; + justify-content: center; + align-items: center; + border-radius: 10px; +} + + .show{ width: 15px; height: 15px; position: absolute; right: 10px; - top: 8px; + top: 58%; z-index: 9; -} +} \ No newline at end of file diff --git a/pages/upDateInfo/upDateInfo.js b/pages/upDateInfo/upDateInfo.js index 7284753..3dccc40 100644 --- a/pages/upDateInfo/upDateInfo.js +++ b/pages/upDateInfo/upDateInfo.js @@ -37,11 +37,6 @@ Page({ }, clearrepeatvalOld(){ this.data.valsOld = [] - wx.showToast({ - title: '禁止复制粘贴请手动输入', - icon: 'none', - duration: 2000 - }) this.setData({ oldpassword: '' }) @@ -49,11 +44,6 @@ Page({ }, clearrepeatval(){ this.data.valsNew = [] - wx.showToast({ - title: '禁止复制粘贴请手动输入', - icon: 'none', - duration: 2000 - }) this.setData({ password: '' }) @@ -61,11 +51,6 @@ Page({ }, clearrepeatvalVerify(){ this.data.valsVerify = [] - wx.showToast({ - title: '禁止复制粘贴请手动输入', - icon: 'none', - duration: 2000 - }) this.setData({ confirmpassword: '' }) diff --git a/pages/upDateInfo/upDateInfo.wxml b/pages/upDateInfo/upDateInfo.wxml index 1bdb7c8..818ad2a 100644 --- a/pages/upDateInfo/upDateInfo.wxml +++ b/pages/upDateInfo/upDateInfo.wxml @@ -1,25 +1,25 @@ - - 旧密码 - + + 旧密码 + - - 新密码 - + + 新密码 + - - 确认新密码 - + + 确认新密码 + diff --git a/pages/upDateInfo/upDateInfo.wxss b/pages/upDateInfo/upDateInfo.wxss index cd0ca0c..38199fe 100644 --- a/pages/upDateInfo/upDateInfo.wxss +++ b/pages/upDateInfo/upDateInfo.wxss @@ -1,21 +1,134 @@ -/* pages/meeting/meeting.wxss */ +page { + overflow-x: hidden; + width: 100%; + color: #333; +} +.container-box{ + overflow-x: hidden; +} + .form-box{ - transform: translateY(20%); + display: block; + box-sizing: border-box; + width: 100%; + height: auto; + background-color: #fff; + border-top-left-radius: 15px; + border-top-right-radius: 15px; + padding: 30px 20px; } -.text-label { - width: 80px !important; -} -.text-value{ +.form-box .item { position: relative; + display: block !important; + width: 100%; + margin-bottom: 25px; } -.text-password input{ - padding-right: 30px; +.form-box .label{ + width: 100%; + color: #A4A4A4; + font-size: 12px; + margin-bottom: 10px; +} +.form-box .value{ + width: 100%; +} +.form-box .value input{ + width: 100%; + box-sizing: border-box; + background-color: #F2F2F4; + border-radius: 8px; + color: #333; + font-size: 15px; + height: 50px; + padding: 0 90px 0 20px; +} +.form-box .captcha{ + color: #069F99; + position: absolute; + right: 10px; + font-size: 13px; + top: 55%; + z-index: 9; +} +.form-box .view-flex{ + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + height: 50px; +} +.form .view-flex .value{ + flex: 1; +} +.form-box .captchaImage{ + width: 140px; + height: 50px; + flex-shrink: 0; + margin-left: 20px; +} +.form-box .captchaImage image{ + width: 100%; + height: 50px; + border-radius: 10px; +} +.form-box .count { + color: #999; +} +.btn-area button{ + background-color: #069F99 !important; + height: 50px; + display: flex; + justify-content: center; + align-items: center; + border-radius: 10px; +} +.other-way{ + color: #A4A4A4; + font-size: 12px; + display: block; + width: 100%; + text-align: center; + margin-top: 70px; + letter-spacing: 1px; +} +.weixin{ + margin-top: 30px !important; + width: 55px !important; + height: 55px !important; + background-color: #F2F2F4; + border-radius: 10px; + margin: auto; + display: flex; + justify-content: center; + align-items: center; +} +.weixin image{ + width: 32px !important; + height: 26px !important; +} +.forget{ + color: #999; + font-size: 14px; + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 20px; +} +.weixin{ + width: 100%; + display: flex; + justify-content: center; + margin-top: 70px; +} +.weixin image{ + width: 50px; + height: 50px; } .show{ width: 15px; height: 15px; position: absolute; right: 10px; - top: 8px; + top: 58%; z-index: 9; -} +} \ No newline at end of file