登录模块bug修复(phone) && sloved conflict

sanyuan0704 · Sep 4, 2019 · f6481fd · f6481fd
2 parents 392483b + 82442bb
commit f6481fd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/application/Player/mini-player/index.js b/src/application/Player/mini-player/index.js
@@ -38,9 +38,9 @@ function MiniPlayer(props) {
         <div className="control">
           <ProgressCircle radius={32} percent={percent}>
             { playing ? 
-              <i className="icon-mini iconfont icon-pause" onClick={(e) => clickPlaying(e, true)}>&#xe650;</i>
+              <i className="icon-mini iconfont icon-pause" onClick={(e) => clickPlaying(e, false)}>&#xe650;</i>
               :
-              <i className="icon-mini iconfont icon-play" onClick={(e) => clickPlaying(e, false)}>&#xe61e;</i> 
+              <i className="icon-mini iconfont icon-play" onClick={(e) => clickPlaying(e, true)}>&#xe61e;</i> 
             }
           </ProgressCircle>
         </div>

diff --git a/src/application/User/Login/components/PhoneForm/step-one/index.js b/src/application/User/Login/components/PhoneForm/step-one/index.js
@@ -9,10 +9,6 @@ const StepOne = props => {
   });
   return (
     <>
-      <p className="tips">
-        &emsp;&emsp;暂时不支持验证码登录，请输入手机号和密码
-      </p>
-
       <p className="input">
         +86
         <input

diff --git a/src/application/User/Login/components/PhoneForm/step-two/index.js b/src/application/User/Login/components/PhoneForm/step-two/index.js
@@ -30,6 +30,7 @@ const StepTwo = props => {
   }, [vcode, triggerLogin]);
 
   const onChangeVcode = e => {
+    if (!e.target.value) return;
     const val = e.target.value;
     setVcode(val);
     setCursorIndex(val.split("").length);
@@ -72,7 +73,7 @@ const StepTwo = props => {
               key={idx}
               className={`line ${cursorIndex === idx ? "animated" : ""}`}
             >
-              {vcode.split("")[idx]}
+              {vcode[idx]}
             </label>
           ))}
         </div>