From 79331db271f6cd1db442deba438fefc9cf50858d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 12 Nov 2021 12:33:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E9=99=86=E6=B3=A8=E5=86=8Cbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 7 +- src/AppConfig.js | 2 +- src/forge/Head/Header.js | 4 +- src/modules/loginRegister/Login.jsx | 2 +- .../loginRegister/LoginRegisterPage.jsx | 5 +- .../loginRegister/LoginRegisterPage.scss | 246 +++++++++--------- src/modules/loginRegister/Register.jsx | 11 +- src/modules/loginRegister/ResetPassword.jsx | 11 +- src/modules/loginRegister/img/ball.png | Bin 46419 -> 154493 bytes src/modules/loginRegister/img/banner.png | Bin 260733 -> 876928 bytes src/modules/loginRegister/img/bg.png | Bin 116606 -> 364283 bytes src/modules/loginRegister/img/contBg.png | Bin 110664 -> 84144 bytes src/modules/loginRegister/img/loginBg.png | Bin 94053 -> 69108 bytes src/modules/loginRegister/img/logo.png | Bin 25051 -> 23365 bytes src/modules/loginRegister/img/registerBg.png | Bin 137052 -> 101155 bytes .../loginRegister/img/resetPasswordBg.png | Bin 109803 -> 80190 bytes 16 files changed, 145 insertions(+), 143 deletions(-) diff --git a/src/App.js b/src/App.js index 821fc9532..49905dd3e 100644 --- a/src/App.js +++ b/src/App.js @@ -137,14 +137,17 @@ class App extends Component { this.unlisten = this.props.history.listen((location) => { let newPathname = location.pathname.split('/')[1]; if (this.state.pathName !== newPathname) { - this.setState({ pathType: '' }); + // this.setState({ pathType: '' }); newPathname && this.getPathnameType(newPathname); } }); } shouldComponentUpdate(nextProps, nextState) { - // (!keyWord.includes(this.props.location.pathname.split('/')[1])) && + if(!nextProps.location.pathname==='/'){ + return true; + } + // 阻止个人与组织切换时(组件渲染)请求导致的404 if (nextProps.location.pathname.split('/')[1] !== this.props.location.pathname.split('/')[1] && nextState.pathType === this.state.pathType) { return false; } else { diff --git a/src/AppConfig.js b/src/AppConfig.js index bb5405c6f..665e85f0f 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -25,7 +25,7 @@ if (isDev) { } debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' : window.location.search.indexOf('debug=s') !== -1 ? 'student' : - window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || '' + window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin' } window._debugType = debugType; export function initAxiosInterceptors(props) { diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index 33f2614e3..0d745f374 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -473,9 +473,9 @@ class NewHeader extends Component { { (settings && settings.common && settings.common.register) ? publicNav ? - 立即注册 + 立即注册 : - 注册 + 注册 :"" } diff --git a/src/modules/loginRegister/Login.jsx b/src/modules/loginRegister/Login.jsx index f8206e03e..b5e930ba5 100644 --- a/src/modules/loginRegister/Login.jsx +++ b/src/modules/loginRegister/Login.jsx @@ -95,7 +95,7 @@ function Login(props){ )} -
3MsZd(77!HGdrXC*&Px^>Q#buM%uE%dSwko2YXLp_+7gM*f(_eMJ
zJJUCZNeSQ^HUryPZz(2(Nvw=I*p`mJ^YWAXUA~D?LAfis%fe;N`fYON4~ozIvD}g+
zCg|`bZf%$$cfu+8#e<&{9mi3VpWkAhwHXfk`{R=21f1bEr@(N0?!t1LK?8jkLc`*u
zLvvU^JQKSKi}Z@os!N|`41 gfF0E= _p3V%Xl!dp}$R#T5*_Nf3QDq3E4{RZrBWu*Wls3F=-j
zv|v4;qR7stR6P4mt~WMQwf=j%$?tbC1IZv{lj~HJYgnDAQZKNMA%u%(af&M3GhFk6
zV=$^Jb}ooG3%3+FC;G}s%(zk~&o5Fw>w}CDh6}8p6wp~!ofG@HE)lGg<-hApTE=iO
zspNMFHPy<)WVo1Ku`myz&k&jQJHvy;td=_}sQ9GG?;gHSqq0C`uqLi+7N~#=L=IkZ
zQZZSo8~r0#lLIyJew0$dDW#}WfraZ-+@#QCe8`HLJfOurZP0E=&aAT*srOGE+a^xR0OCQ
z54=6x3~-T3xKPNj*xyc`j-sGYTDKL^Eh>UH@*;RG%Y!vj;7SzfGW*y8zwgc{L^`Tf
zBa8x34(vr<&|*(_ehQ+6QfjlAH+}~&VX{4}B4E@Gt9;-PrshR}WR_x~U1Tq;7kckb
zk9NMa6@C8uDqQcMJ3t7!f>bX!wUpy5IQ{~En^xsuxF`qZGR~r`_Bkl1RenCoik+-n
z;CX>k!S0aqIT}>tl&Pqkj*5CPP#Unv*-@+NTuch+T(ZiD4CrLAV55w4i%e7Ydr}(e
zQ3HmDi_rUDBh!RyqjD8IOP5G?nFN&(pwE(14ElV>Nz
zu#0#Kp5mNSPI*>R^aJ-tS&O0^p;)y5NI(^V+XIUX+~m3x_=0B@!kxdvRVWw|INO8k
zQJ` ZJZs^trzowUB;vIeivkOLH!>Gx3TK}?1j{TPA`70qI{Rx2SS-d=@PG~j7GIJ|
zKIr}i^Vo_-lQw-@^sg4eO|(Y$`U=E%myO1{QZ~U@VBppZm6kP70znTFltjQLl>I*%kmm
zw4+kcspnM6xxj0HA&NQidQX}l9)+M26Urc9MljtXO-TPNH5d5Imqn<#7^=6x@{4pr
zod+&nObhA~T-c9e{=*Vj%s)nHj>Un+!Iwb%{vJdLgknt}*FBG^@a@k%pdfJY0a#!x
zP~s>%l+yjd?xa|j!B+qiWfL(EGB~pO@(0_SgQdXsOIxYWrRZWQe91$trnxW^?_nP7
zm!@PY@JN~p{adH(2`!0G6CzSQaICrgy@&UH?3gqUtRRSb#)NSO*b6a_S}nbO
ziM0v~v+xvyAK^KlB~)bu2SOzPFmMBnuBhBWb`$A1o8mstyNbawqP;<6b!F6U)YW6V
zyKBGk#5H;5*PfSeO)z+>P*On!{<3VJu4NFGNAz>D6rQ~Rz@Xif42OaTT^E4`83~p=
zSQfzmkLUOg;KI+>Wk;o;lK_L+7bTD=%Oco+FX*J^!k0w|CdgV~88R0D6kQF=UN4P&
z)j++^xS)!KzjiO?#Cv_IoIckA^WC_T$h@jr_j$TxE@oc8=ADw)eeru$tYC3qG5fd<
zae?5#&1*6?uLQz_k1(v#UP>1TlQt>X^o_-^d{?R_*Si)94*Ffat(3M=ud65>AnZ`e
zmgjoMpM;tSyee}km_dPgcTBXYdJZjJV0$coVBd6*VE0gc?QNv&K1!A%2O(+Xtqhy!??Y
zq}oZ84aD@37E?MoQX?^K7^c8PL4{)}HfmY<;EA2TzO^Rb*GjvJuqkR4B0~`rhtL#S
z;$^{3z(N@ZUJNrFuQ^6~y+f>2q@EsuRku6;wW^hqYa&~ktiA6E494?2B3E>%b30`_
zmyh@I;ASnyS1Z{XwX#{aaz5HZMNX|~wnaJh6&-dOk*gDtYYfTK-%o)`bO$0iF_l&7
z4x-vXGByM&3m~R#<