Merge branch 'ai-test' into dev

src/components/ai-test/scores/index.js

@@ -6,6 +6,7 @@ import storage from 'store2'
 import { html } from '@/utils'
 import { compareDesc } from "date-fns";
 import { Link } from "react-router-dom";
+import { connect } from "react-redux";
 
 
 class Scores extends Component {
@@ -48,8 +49,10 @@ class Scores extends Component {
   componentDidMount() {
     this.getInitialData()
     this.getRankList(null, 0)
-    this.getUserScores(0)
-    this.getUserAddress()
+    if (!this.props.user.hasError) {
+      this.getUserScores(0)
+      this.getUserAddress()
+    }
   }
 
   handleChange = (e) => {
@@ -171,6 +174,7 @@ class Scores extends Component {
       userAddress,
       entryButtonInRule,
     } = this.state
+    const {user, history} = this.props
     const _rankList = Array.isArray(rankList) ? isExpandRankList ? rankList : rankList.slice(0, 10) : []
     return (
       <div className={'scores'}>
@@ -202,16 +206,24 @@ class Scores extends Component {
                       </tr>
                       </thead>
                       <tbody>
-                      <tr>
-                        {
-                          userScore.score === '-' ? '-' :
-                            <td>{userScore.score} <Link to={`/ai-test/analysis/${userScore.r_id}`}>解析</Link></td>
-                        }
-                        <td>{userScore.cost_time}</td>
-                        {
-                          userScore.rank === '-' ? '-' : <td>{userScore.rank}名</td>
-                        }
-                      </tr>
+                      {
+                        user.hasError
+                          ? <tr>
+                            <td>--</td>
+                            <td>--</td>
+                            <td>--</td>
+                          </tr>
+                          : <tr>
+                            {
+                              userScore.score === '-' ? '-' :
+                                <td>{userScore.score} <Link to={`/ai-test/analysis/${userScore.r_id}`}>解析</Link></td>
+                            }
+                            <td>{userScore.cost_time}</td>
+                            {
+                              userScore.rank === '-' ? '-' : <td>{userScore.rank}名</td>
+                            }
+                          </tr>
+                      }
                       </tbody>
                     </table>
                   </div>
@@ -231,9 +243,13 @@ class Scores extends Component {
             <div>
               <span>仅显示前50名</span>
               <a href="javascript:void(0);" onClick={() => {
-                this.setState({
-                  isShowUserAddress: true,
-                })
+                if(user.hasError){
+                  history.push('/passport')
+                }else {
+                  this.setState({
+                    isShowUserAddress: true,
+                  })
+                }
               }}>收货地址</a>
             </div>
           </div>
@@ -386,4 +402,7 @@ function Rule({neverShow, isNeverShow, rule, close, startTest, entryButtonInRule
 }
 
 
-export default Scores;
+export default connect(
\ No newline at end of file
+  ({user}) => ({user}),
+  null,
+)(Scores);
\ No newline at end of file

src/components/ai-test/scores/index.scss

@@ -50,6 +50,10 @@
       background-color: $blue-bg;
     }
 
+    th{
+      width: 33.333333%;
+    }
+
   }
 
   th {