Merge remote-tracking branch 'origin/2020-717-formal' into dev

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

@@ -872,7 +872,8 @@
       }
     }
 
-    td:nth-of-type(2) {
+    td:nth-of-type(2), td:nth-of-type(4) {
+      text-align: left;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
@@ -1117,3 +1118,19 @@
     }
   }
 }
+
+.follow {
+  .tip {
+    margin-bottom: 15px;
+  }
+
+  .qrcode {
+    text-align: center;
+  }
+
+  img {
+    width: 120px;
+    height: 120px;
+    margin-bottom: 10px;
+  }
+}
\ No newline at end of file

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

@@ -10,7 +10,7 @@ class Anniversary2020Entry extends Component {
     const match = this.props.match
     return (
       <Switch>
-        <Route path={`${match.path}/question/:assistId?`}
+        <Route path={`${match.path}/question/:isPractice?`}
                render={routeProps => (<Question {...routeProps}></Question>)}></Route>
         <Route path={`${match.path}/invitation`} render={routeProps => (<Invitation {...routeProps}/>)}></Route>
         <Route path={'/anniversary_2020'}

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

@@ -4,9 +4,10 @@ import { WithFullSize } from "@/HOCs"
 import { connect } from "react-redux";
 import { compose } from "redux";
 import { HeaderBar } from "@common/index"
-import { getParam, http, browser } from "@/utils"
+import { getParam, http, browser, wxShare } from "@/utils"
 import { Toast } from "antd-mobile";
 import { CopyToClipboard } from "react-copy-to-clipboard";
+import { Link } from 'react-router-dom'
 
 
 class Invitation extends Component {
@@ -75,6 +76,7 @@ class Invitation extends Component {
         if (code === 200) {
           this.setState({
             teamInfo: data,
+            isMaster: data.is_captain || !getParam('team_code'),
           });
         } else {
           Toast.info(msg)
@@ -100,7 +102,7 @@ class Invitation extends Component {
       .then(res => {
         const {code, msg} = res.data
         if (code === 200) {
-          Toast.info('加入成功')
+          Toast.info('加入成功', 2, null, false)
           this.setState((state, props) => {
             return {
               teamInfo: {...state.teamInfo, ...{status: 2}},
@@ -117,13 +119,33 @@ class Invitation extends Component {
       })
   }
 
+  setupWechatShare = () => {
+    wxShare({
+      title: '答题抽华为P40 Pro+',
+      desc: '这道题你会吗？答题抽奖，100%有奖的，能不能拿华为P40 Pro+，看你自己了--七月在线',
+      link: `${API.m}${location.pathname}?team_code=${this.state.invitationInfo.team_code || getParam('team_code')}`,
+      imgUrl: '',
+    })
+    this.setState({
+      isShowGuide: true,
+    });
+  }
+
+  // 答题抽奖
+  drawQuestions = () => {
+    const {history} = this.props
+    history.push(`/anniversary_2020/question/${0}`)
+  }
+
   render() {
     const {prizes, invitationInfo, isShowGuide, teamInfo, isMaster, isActivityEnd} = this.state
     const {location} = this.props
 
     return (
       <div id={'invitation'}>
-        <HeaderBar title={'答题抽奖'} arrow={true}/>
+        <HeaderBar title={'答题抽奖'} arrow={true} goBack={() => {
+          this.props.history.push('/anniversary_2020')
+        }}/>
         {
           isMaster
             ? <div className="banner"></div>
@@ -160,12 +182,9 @@ class Invitation extends Component {
                   <div className="tip">再有{invitationInfo.invite_num}位队员答对即可获得{invitationInfo.draw_chance}次抽奖机会</div>
                   {
                     browser.isWeixin
-                      ? <button className={'btn'} onClick={() => {
-                        this.setState({
-                          isShowGuide: true,
-                        });
-                      }}>立即邀请</button>
-                      : <CopyToClipboard text={`${API.m}${location.pathname}?team_code=${invitationInfo.team_code}`}
+                      ? <button className={'btn'} onClick={this.setupWechatShare}>立即邀请</button>
+                      : <CopyToClipboard
+                        text={`${API.m}${location.pathname}?team_code=${invitationInfo.team_code || getParam('team_code')}`}
                         onCopy={() => {
                           Toast.info('链接已复制，快去粘贴发给好友吧')
                         }}>
@@ -177,17 +196,12 @@ class Invitation extends Component {
                   {
                     teamInfo.status !== 1 && <div className={'tip'}>
                       {
-                        teamInfo.status === 2 ? '已加入当前队伍' : teamInfo === 3 ? '已加入其他队伍' : null
+                        teamInfo.status === 2 ? '已加入当前队伍' : teamInfo.status === 3 ? '已加入其他队伍' : null
                       }
                     </div>
                   }
-                  {
-                    isActivityEnd
-                      ? <button className={'activity-end'}>活动结束</button>
-                      : teamInfo.status === 1
-                      ? <button className={'btn'} onClick={this.joinTeam}>加入队伍</button>
-                      : <button className={'btn'}>答题抽奖</button>
-                  }
+                  <BottomButton isActivityEnd={isActivityEnd} joinTeam={this.joinTeam} status={teamInfo.status}
+                                drawQuestions={this.drawQuestions} isAnswered={teamInfo.is_answer}/>
                 </>
             }
 
@@ -208,6 +222,19 @@ class Invitation extends Component {
   }
 }
 
+function BottomButton({status, isActivityEnd, isAnswered, joinTeam, drawQuestions}) {
+  if (isActivityEnd) {
+    return <button className={'activity-end'}>活动结束</button>
+  }
+  if (isAnswered) {
+    return <Link to={`/anniversary_2020#lottery`}>
+      <button className={'btn'}>去抽奖</button>
+    </Link>
+  }
+  return status === 1 ? <button className={'btn'} onClick={joinTeam}>加入队伍</button> :
+    <button className={'btn'} onClick={drawQuestions}>答题抽奖</button>
+}
+
 export default compose(
   WithFullSize,
   connect(

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

-import React, { Component } from 'react';
+import React, { Component } from 'react'
 import './index.scss'
-import { Toast } from "antd-mobile";
+import { Toast } from "antd-mobile"
 import classnames from 'classnames'
 import { browser, http } from "@/utils"
 import { WithFullSize } from "@/HOCs"
-import { Link } from "react-router-dom";
+import { Link } from "react-router-dom"
 import { compose } from 'redux'
 import { connect } from 'react-redux'
 import { addData, ADD_RECOMMENDS, ADD_QUESTION, ADD_RESULT, REDO } from './store/reducer'
@@ -17,8 +17,11 @@ class Question extends Component {
     recommends: [],
     selectedOptionId: 0,
     isShowConfirm: false,
-    isTeamHead: this.props.match.params.assistId === undefined,
+    isResultConfirm: false,
+    isTeamHead: this.props.match.params.isPractice == 1,
     isActivityEnd: false,
+    is_correct: '',
+    is_sign: '',
   }
 
   componentDidMount() {
@@ -38,8 +41,8 @@ class Question extends Component {
   }
 
   getQuestion = () => {
-    const assistId = this.props.match.params.assistId
-    http.get(`${API.home}/activity/anniversary/get_question/${assistId ? 2 : 1}/${assistId ? assistId : 0}`)
+    const isPractice = this.props.match.params.isPractice
+    http.get(`${API.home}/activity/anniversary/get_question/${isPractice == 1 ? 1 : 2}`)
       .then(res => {
         const {code, msg, data} = res.data
         if (code === 200) {
@@ -56,14 +59,14 @@ class Question extends Component {
   select = (id) => {
     this.setState({
       selectedOptionId: id,
-    });
+    })
   }
 
   submit = () => {
-    const assistId = this.props.match.params.assistId
+    const isPractice = this.props.match.params.isPractice
     const {selectedOptionId} = this.state
     http.post(`${API.home}/activity/anniversary/submit`, {
-      type: assistId ? 2 : 1,
+      type: isPractice == 1 ? 1 : 2,
       option_id: selectedOptionId,
       id: this.props.cache.question.id,
     }).then(res => {
@@ -73,8 +76,11 @@ class Question extends Component {
         this.afterSubmitted(data)
         this.setState({
           isShowConfirm: false,
+          isResultConfirm: isPractice != 1,
           selectedOptionId: undefined,
-        });
+          is_correct: data.is_correct,
+          is_sign: data.is_sign,
+        })
         this.props.addData({
           payload: data,
           type: ADD_RESULT,
@@ -85,17 +91,35 @@ class Question extends Component {
     })
   }
 
+  resultFun = () => {
+    const {history} = this.props
+    if (this.state.is_sign) {
+      history.push('/anniversary_2020#lottery')
+    } else {
+      http.get(`${API.home}/activity/anniversary/sign`)
+        .then(res => {
+          const {code, msg} = res.data
+          if (code === 200) {
+            Toast.info('签到成功 抽奖次数+1')
+            history.push('/anniversary_2020')
+          } else {
+            Toast.info(msg)
+          }
+        })
+    }
+  }
+
   afterSubmitted = (result) => {
     const {isTeamHead} = this.state
 
     if (isTeamHead) {
       if (result.stage === 4) {
-
+        this.setState({
+          isActivityEnd: true,
+        });
       } else {
         result.is_correct ? Toast.info('回答正确 抽奖次数+1') : Toast.info('很遗憾 回答错误')
       }
-    } else {
-
     }
   }
 
@@ -131,6 +155,7 @@ class Question extends Component {
       selectedOptionId,
       isShowConfirm,
       isActivityEnd,
+      isResultConfirm,
       isTeamHead,
     } = this.state
 
@@ -184,12 +209,14 @@ class Question extends Component {
         }
         <div className="submit-bar">
           <BottomButton result={result}
+                        resultFun={this.resultFun}
                         isTeamHead={isTeamHead}
+                        isActivityEnd={isActivityEnd}
                         submit={() => {
                           if (this.state.selectedOptionId) {
                             this.setState({
                               isShowConfirm: true,
-                            });
+                            })
                           }
                         }}
                         redo={this.redo}
@@ -200,36 +227,52 @@ class Question extends Component {
           <Confirm submit={this.submit} cancel={() => {
             this.setState({
               isShowConfirm: false,
-            });
+            })
           }}></Confirm>
         }
+        {
+          isResultConfirm &&
+          <ResultConfirm resultFun={this.resultFun} is_correct={this.state.is_correct}
+                         is_sign={this.state.is_sign}></ResultConfirm>
+        }
       </div>
-    );
+    )
   }
 }
 
-function Confirm({submit, cancel}) {
+function ResultConfirm({resultFun, is_correct, is_sign}) {
   return <div className="modal-cover">
     <div className="modal">
-      <div className="title">提交确认</div>
-      <div className="btns">
-        <button onClick={cancel}>取消</button>
-        <button onClick={submit}>确认提交</button>
+      {
+        is_correct === 1 &&
+        <div className="title">回答正确，抽奖次数+1</div>
+      }
+      {
+        is_correct === 0 &&
+        <div className="rusult-title">很遗憾，回答错误 <p>快去抽奖提提神吧</p></div>
+      }
+
+      <div className={'btm-button'}>
+        <button onClick={resultFun}>{is_sign ? '去抽奖' : '签到领取抽奖机会'}</button>
       </div>
     </div>
   </div>
 }
 
-function Result() {
-  return <div className={'modal-cover'}>
+function Confirm({submit, cancel}) {
+  return <div className="modal-cover">
     <div className="modal">
-      <div className="title"></div>
+      <div className="title">提交确认</div>
+      <div className="btns">
+        <button onClick={cancel}>取消</button>
+        <button onClick={submit}>确认提交</button>
+      </div>
     </div>
   </div>
 }
 
-function BottomButton({result, submit, isTeamHead, redo}) {
-  if (result.stage === 4) {
+function BottomButton({resultFun, result, submit, isTeamHead, redo, isActivityEnd}) {
+  if (result.stage === 4 || isActivityEnd) {
     return <button className={'activity-end'}>活动已结束</button>
   }
   if (isTeamHead) {
@@ -237,10 +280,18 @@ function BottomButton({result, submit, isTeamHead, redo}) {
       return result.practiceNum === 0
         ? <button className={'lottery-related'}><Link to={`/anniversary_2020/invitation`}>组队答题抽奖</Link></button>
         : <button className={'submit'} onClick={redo}>继续答题</button>
+    } else {
+      return <button className={'submit'} onClick={submit}>提交</button>
+    }
+  } else {
+    if (result.analysis) {
+      return !result.is_sign
+        ? <button className={'lottery-related'} onClick={resultFun}>签到领取抽奖机会</button>
+        : <button className={'submit'} onClick={resultFun}>去抽奖</button>
     }
+    return <button className={'submit'} onClick={submit}>提交</button>
   }
 
-  return <button className={'submit'} onClick={submit}>提交</button>
 }
 
 function Recommends({recommends}) {
@@ -268,4 +319,4 @@ export default compose(
       addData: data => dispatch(addData(data)),
     }),
   ),
-)(Question);
+)(Question)
\ No newline at end of file

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

@@ -204,6 +204,40 @@
       color: #525C65;
     }
 
+    .rusult-title {
+      text-align: center;
+      padding-top: 20px;
+      color: #525C65;
+      font-size: 18px;
+      font-weight: 500;
+      margin-bottom: 20px;
+
+      p {
+        margin-top: 10px;
+        color: #525C65;
+        font-size: 15px;
+        font-weight: 400;
+      }
+    }
+
+    .btm-button {
+      width: 100%;
+      margin: 0 0 20px 0;
+      text-align: center;
+
+      button {
+        min-width: 128px;
+        height: 33px;
+        background: rgba(250, 228, 77, 1);
+        border-radius: 4px;
+        border: none;
+        color: #2034F5;
+        font-size: 16px;
+        font-weight: 500;
+        padding: 0 17px;
+      }
+    }
+
     .btns {
       border-top: 1px solid #DDD;
       height: 44px;

src/utils/index.js

@@ -146,7 +146,7 @@ export {
   browser,
   isLogin,
   dateCountDown,
-  isValidUrl
+  isValidUrl,
 }
 export {
   default as SendMessageToApp,