ADD：step2 token in detail

src/components/GlobalHeader/RightContent.jsx

@@ -30,7 +30,6 @@ const GlobalHeaderRight = (props) => {
         token
       }
     }).then(res=>{
-      console.log(res)
       //{result: "fail", cause: "身份验证失败，请重新点击按钮进入答题页面"}
       if(res.result === 'success'){
         let idInfo = {
@@ -41,10 +40,10 @@ const GlobalHeaderRight = (props) => {
           case_take_id:res.caseId + '-' + res.examId,
         }
         setIdInfo(idInfo);
-        console.log(idInfo)
       }else{
         //错误处理
         console.log(res)
+
       }
     })
   },[])

src/pages/edit/components/Step2/index.jsx

@@ -51,7 +51,7 @@ const Step2 = (props) => {
 
   const {
     dispatch, reportCommonInfo, osType,
-    testCaseList, caseBugList, categories, pathInfo,
+    testCaseList, caseBugList, categories, pathInfo,commonId
   } = props;
   const [showTaskRecommendModal, setTaskRecommendModal] = useState(false);
   const [showAddTestCaseModal, setAddTestCaseModal] = useState(false);
@@ -76,8 +76,8 @@ const Step2 = (props) => {
       let formData = new FormData();
       formData.append('name', res.name);
       formData.append('report_id', reportCommonInfo.id);
-      formData.append('worker_id', idInfo.userId);
-      formData.append('case_take_id', idInfo.case_take_id);
+      formData.append('worker_id', commonId.userId);
+      formData.append('case_take_id', commonId.case_take_id);
       formData.append('device_model', res.device_model);
       formData.append('device_brand', res.device_brand);
       formData.append('device_os', res.device_os);
@@ -146,9 +146,9 @@ const Step2 = (props) => {
       formData.append('recurrent', res.recurrent);
       formData.append('parent', null);
       formData.append('useCase', currentTestCaseRef.current.id);
-      formData.append('case_id', idInfo.caseId);
-      formData.append('case_take_id', idInfo.case_take_id);
-      formData.append('worker_id', idInfo.userId);
+      formData.append('case_id', commonId.caseId);
+      formData.append('case_take_id', commonId.case_take_id);
+      formData.append('worker_id', commonId.userId);
       formData.append('page', `${res.page1}-${res.page2}-${res.page3}`);
       if (fileList.length) {
         let str = '';
@@ -202,21 +202,21 @@ const Step2 = (props) => {
     dispatch({
       type: 'editReport/getPathInfo',
       payload: {
-        case_take_id: idInfo.case_take_id,
+        case_take_id: commonId.case_take_id,
         report_id: reportCommonInfo.id,
       },
     });
     dispatch({
       type: 'editReport/getBugRecommendPath',
       payload: {
-        case_take_id: idInfo.case_take_id,
+        case_take_id: commonId.case_take_id,
         report_id: reportCommonInfo.id,
       },
     });
     dispatch({
       type: 'editReport/getBugRecommendList',
       payload: {
-        case_take_id: idInfo.case_take_id,
+        case_take_id: commonId.case_take_id,
         report_id: reportCommonInfo.id,
       },
     });
@@ -269,13 +269,13 @@ const Step2 = (props) => {
   };
 
   useEffect(() => {
-    //能到第二步，说明是有报告信息的
+      //能到第二步，说明是有报告信息的
       //有报告，获取对应信息。没有就直接转去了第一步
       dispatch({
         type: 'editReport/getTestCaseList',
         payload: { report_id: reportCommonInfo.id },
       }).then((res) => {
-        if (res && res.length) {
+        if (res && res.length && commonId) {
           currentTestCaseRef.current = res[0];
           dispatch({
             type: 'editReport/getCaseBugList',
@@ -285,9 +285,9 @@ const Step2 = (props) => {
       });
       dispatch({
         type: 'editReport/getCategories',
-        payload: { examId: idInfo.examId },
+        payload: { examId: commonId.examId },
       });
-  }, [dispatch, reportCommonInfo,idInfo.userId,idInfo.examId,idInfo.case_take_id]);
+  }, [reportCommonInfo,commonId.userId,commonId.examId,commonId.case_take_id]);
 
   useEffect(() => {
     let bugs = caseBugList.map(item => item.detail);

src/pages/edit/index.jsx

@@ -1,12 +1,11 @@
 import React, { useState, useEffect } from 'react';
-import { Card, Steps,Modal} from 'antd';
+import { Card, Steps} from 'antd';
 import { PageContainer } from '@ant-design/pro-layout';
 import { ExclamationCircleOutlined } from '@ant-design/icons';
 import { connect } from 'umi';
 import Step1 from './components/Step1';
 import Step2 from './components/Step2';
 import styles from './style.less';
-const { confirm } = Modal;
 const { Step } = Steps;
 
 const getCurrentStepAndComponent = (current) => {

src/pages/edit/model.js

@@ -69,6 +69,7 @@ const Model = {
     * getIdByToken({ payload }, { call, put }) {
       const { token } = payload;
       let res = yield call(getIdByToken, token)
+      res['case_take_id'] = res['caseId'] + '_' + res['examId'];
       yield put({
         type: 'saveCommonId',
         payload: res,