Merge branch '2020-717-formal'

src/components/activity/2020-717/activity/index.js

@@ -1267,7 +1267,7 @@ function WinPrize({name, close, info}) {
   return <div className={'modal-cover'}>
     <div className="modal win-prize">
       <div className="title">恭喜您</div>
-      <div className="des">抽中了XXX<span className={'name'}>{name}</span></div>
+      <div className="des">抽中了 <span className={'name'}>{name}</span></div>
       <div className="contact">{info}</div>
       <button onClick={close}>我知道了</button>
     </div>

src/components/activity/2020-717/invitation/index.js

@@ -110,7 +110,7 @@ class Invitation extends Component {
       return
     }
     let _data = {team_code: getParam('team_code')}
-    if (data) {
+    if (data.token && data.sig) {
       _data = {..._data, ...data}
     }
     http.post(`${API.home}/activity/anniversary/joinTeam`, _data)
@@ -121,7 +121,7 @@ class Invitation extends Component {
           this.setState((state, props) => {
             return {
               teamInfo: {...state.teamInfo, ...{status: 2, is_check: false}},
-              isShowCaptcha: false
+              isShowCaptcha: false,
             }
           });
         } else if (code === 5002) {
@@ -161,6 +161,7 @@ class Invitation extends Component {
     return (
       isShowCaptcha
         ? <div className={'captcha-container'}>
+          <div className={'tip'}>亲，系统正忙，滑动一下马上回来</div>
           <CaptchaAli
             getInstance={instance => {
               this.setState({

src/components/activity/2020-717/invitation/index.scss

@@ -226,4 +226,18 @@ html, body, #root {
     border-radius: 4px;
   }
 
+}
+
+.captcha-container {
+  padding: 40vh 30px;
+  text-align: center;
+
+  .tip {
+    margin-bottom: 10px;
+    font-size: 16px;
+  }
+
+  & + .year19-index {
+    display: none;
+  }
 }
\ No newline at end of file

src/components/activity/2020-717/question/index.scss

@@ -276,8 +276,3 @@
     }
   }
 }
-
-
-.captcha-container {
-  padding: 40vh 30px;
-}
\ No newline at end of file