Merge remote-tracking branch 'origin/bww-v1' into wxl-guide

src/pages/deployschool/index.js

@@ -104,14 +104,13 @@ class DeploySchoolForm extends React.Component {
       deployType,
       schoolStatus,
     } = this.props;
-    console.log(schoolStatus, 'schoolStatus');
     const { deployVisible, curStep, numberPercent } = this.state;
     const typeList = [
-      { id: 3, title: '书法练字', img: '/developschool/type_icon1.png' },
-      { id: 2, title: '美术创意', img: '/developschool/type_icon2.png' },
-      { id: 4, title: '体育跆拳道', img: '/developschool/type_icon3.png' },
-      { id: 1, title: '口才表演', img: '/developschool/type_icon4.png' },
-      { id: 5, title: '通用', img: '/developschool/type_default.png' },
+      { id: 3, title: '书法练字', img: 'developschool/type_icon1.png' },
+      { id: 2, title: '美术创意', img: 'developschool/type_icon2.png' },
+      { id: 4, title: '体育跆拳道', img: 'developschool/type_icon3.png' },
+      { id: 1, title: '口才表演', img: 'developschool/type_icon4.png' },
+      { id: 5, title: '通用', img: 'developschool/type_default.png' },
     ];
     return (
       <div className={`login register ${pageStyle.logincontainer}`}>
@@ -129,6 +128,9 @@ class DeploySchoolForm extends React.Component {
                   <div key={index} className={pageStyle.typeItem} onClick={() => this.handleChooseType(item.id)}>
                     <div className={pageStyle.typeImg}>
                       <img className={pageStyle.img} src={`${__IMGCDN__}${item.img}`} alt="" />
+                      {
+                        deployType === Number(item.id) && <div className={pageStyle.imgBg}></div>
+                      }
                       {
                         deployType === Number(item.id) ? <img className={pageStyle.checkImg} src={`${__IMGCDN__}developschool/checked.png`} alt="" />
                         : <img className={pageStyle.checkImg} src={`${__IMGCDN__}developschool/un_checked.png`} alt="" />
@@ -240,7 +242,7 @@ class DeploySchoolForm extends React.Component {
                   </div>
                 </div>
                 <div className={pageStyle.stepWrap}>
-                  <div className={pageStyle.stepLeft} style={{ marginRight: 40 }}>个性化展示</div>
+                  <div className={pageStyle.stepLeft} style={{ marginRight: 50 }}>个性化展示</div>
                   <div className={pageStyle.stepRight}>
                     <div className={pageStyle.lineBox}>
                       <div className={curStep >= 10 ? pageStyle.checkedcircle : pageStyle.circle}>
@@ -255,7 +257,7 @@ class DeploySchoolForm extends React.Component {
               </div>
               <div className={pageStyle.progress} style={{ border: numberPercent > 100 ? 'none' : '' }}>
                 {
-                  numberPercent < 100 ? <div className={deployVisible ? pageStyle.innerAnimation : pageStyle.innerProgress}><div className={pageStyle.innerText}>部署中...{numberPercent}%</div></div>
+                  numberPercent < 100 ? <div className={deployVisible ? pageStyle.innerAnimation : pageStyle.innerProgress}><div className={pageStyle.innerTextWrap}><div className={pageStyle.innerText}>部署中...{numberPercent}%</div></div></div>
                     : <div className={pageStyle.enterIndex} onClick={this.goHome}>进入轻校</div>
                  }
               </div>

src/pages/deployschool/index.less

@@ -47,9 +47,18 @@
             .img {
                 width: 115px;
                 height: 115px;
-                //box-shadow:0px 0px 10px 0px rgba(0, 0, 0, 0.08);
+                box-shadow:0px 0px 10px 0px rgba(0, 0, 0, 0.08);
                 border-radius: 50%;
             }
+            .imgBg {
+                position: absolute;
+                width: 108px;
+                height: 108px;
+                border-radius: 50%;
+                top: 4px;
+                left: 4px;
+                background-color: rgba(0,0,0,0.15);
+            }
             .checkImg {
                 width: 34px;
                 height: 34px;
@@ -252,17 +261,23 @@
     background:rgba(255,255,255,1);
     border:2px solid rgba(220,220,220,1);
     border-radius:24px;
-    .innerText {
-        width: 100%;
+    .innerTextWrap {
+        width: 630px;
         font-size:18px;
+        height: 48px;
         font-family:PingFang SC;
         font-weight:bold;
         color:rgba(0,0,0,1);
         text-align: center;
-        position: absolute;
-        left: 0;
-        bottom: 0;
-        z-index: 2;
+        position: relative;
+        .innerText {
+            position: absolute;
+            width: 100%;
+            height: 100%;
+            left: 0;
+            bottom: 0;
+            z-index: 2;
+        }
     }
 }
 .innerProgress {
@@ -272,6 +287,9 @@
     border:2px solid rgba(220,220,220,1);
     border-radius:24px;
     text-align: center;
+    top:-2px;
+    left: -1px;
+    position: absolute;
 }
 .innerAnimation{
     animation: dailogBtnChange 6s linear forwards;
@@ -285,6 +303,9 @@
     font-family:PingFang SC;
     font-weight:bold;
     color:rgba(0,0,0,1);
+    top:-2px;
+    left: -1px;
+    position: absolute;
 }
 .enterIndex {
     width: 630px;

src/pages/login/QxLogin.js

@@ -185,7 +185,7 @@ class QxLoginForm extends React.Component {
           </Form>
           <div className={LoginStyles.registerbox}>
             <div className={LoginStyles.noaccount}>还没有账号？</div>
-            <Link className={LoginStyles.goregister} to="/register" target="_blank">去注册</Link>
+            <Link className={LoginStyles.goregister} to="/register">去注册</Link>
           </div>
         </div>
       </div>

src/pages/newregister/index.js

@@ -226,7 +226,7 @@ class LoginForm extends React.Component {
                       { required: true, message: '请输入机构名称!' },
                     ],
                   })(
-                    <Input placeholder="请输入机构名称" autoComplete="off" />,
+                    <Input maxLength={30} placeholder="请输入机构名称" autoComplete="off" />,
                   )}
                   <span className={LoginStyles.formTip}>机构名称后期支持自由修改</span>
                 </FormItem>