Merge branch 'ai-test' of https://gitlab.julyedu.com/baiguangyao/mr-julyedu into dev

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

@@ -86,7 +86,8 @@ class Analysis extends Component {
           </div>
         </div>
         {
-          !!questions.length && questions[activeIndex].type_id && <Recommends typeId={questions[activeIndex].type_id}/>
+          !!questions.length && questions[activeIndex] && questions[activeIndex].commend_course && !!questions[activeIndex].commend_course.length &&
+          <Recommends recommends={questions[activeIndex].commend_course}/>
         }
         <Navigation questions={questions} isAnalysis={true} handleClick={(index) => {
           this.setState({

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

@@ -115,7 +115,8 @@ class Assist extends Component {
         <div style={{height: '8px', backgroundColor: '#f5f5f5'}}></div>
         {
           result && <div className="content">
-            <div class={'info'}>您的选择是{userAnswer}，正确答案是{rightAnswer} 回答{userAnswer === rightAnswer ? '正确' : '错误'}</div>
+            <div
+              className={'info'}>您的选择是{userAnswer}，正确答案是{rightAnswer} 回答{userAnswer === rightAnswer ? '正确' : '错误'}</div>
             <div className="head">
               <i className="icon"></i>
               <span>解析</span>
@@ -124,8 +125,8 @@ class Assist extends Component {
           </div>
         }
         {
-          result && <>
-            <Recommends typeId={question.type_id}/>
+          result && question.commend_course && question.commend_course.length && <>
+            <Recommends recommends={question.commend_course}/>
             <div className={classnames(['status', {
               end: result.status === 6,
               success: result.status === 1,
@@ -152,6 +153,6 @@ class Assist extends Component {
 }
 
 export default connect(
-  state => state.user,
+  ({user}) => ({user}),
   null,
 )(Assist)
\ No newline at end of file

src/components/ai-test/common/recommends/index.js

 import React, { Component } from 'react';
 import './index.scss'
-import { http } from "@/utils"
-import { Toast } from "antd-mobile";
 import { Link } from "react-router-dom";
 
 
 class Recommends extends Component {
-  state = {
-    recommends: [],
-  }
-
-  componentDidMount() {
-    this.props.typeId && this.getRecommends(this.props.typeId)
-  }
-
-  getRecommends = (typeId) => {
-    http.post(`${API.home}/sys/get_commend_course`, {
-      type_id: typeId,
-    }).then(res => {
-      const {code, msg, data} = res.data
-      if (code === 200) {
-        this.setState({
-          recommends: data,
-        })
-      } else {
-        Toast.fail(msg, 2, null, msg)
-      }
-    })
-  }
-
   render() {
-    const {recommends} = this.state
+    const {recommends} = this.props
     return (
       <div className="recommends">
         <div>相关课程</div>

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

@@ -28,12 +28,17 @@ class scoreReport extends Component {
     }
 
     componentDidMount() {
+        window.onbeforeunload = () => {
+            document.documentElement.scrollTop = 0
+            document.body.scrollTop = 0
+        }
         this.getCodeWe()
         this.handleFetchInfo(0)
     }
 
+
     shouldComponentUpdate(nextProps, nextState, nextContext) {
-        if (this.props.user.data.avatar!==nextProps.user.data.avatar) {
+        if (this.props.user.data.avatar !== nextProps.user.data.avatar) {
             this.getCanvas()
             return false
         }
@@ -42,10 +47,13 @@ class scoreReport extends Component {
 
 
     getCanvas() {
+        document.documentElement.scrollTop = 0
+        document.body.scrollTop = 0
+
         let _this = this
         var canvas2 = document.createElement("canvas")
         let _canvas = document.getElementsByClassName('score-list')[0]
-        if(!_canvas){
+        if (!_canvas) {
             return
         }
         var w = parseInt(window.getComputedStyle(_canvas).width)
@@ -98,7 +106,7 @@ class scoreReport extends Component {
                 this.getBase64(avatar)
                 setTimeout(() => {
                     this.getCanvas()
-                },500)
+                }, 500)
             }
         })
     }