Merge branch 'dev' of…

Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev

src/modules/teach-tool/examination-manager/PreviewModal.tsx

@@ -33,18 +33,18 @@ function PreviewModal(props: any) {
                 <div className="phone">
                 <div className="phone">
                     <div className="content">
                     <div className="content">
                         <div className="topContent">
                         <div className="topContent">
-                            <div className="title" style={{ fontSize: props.info.examName.length > 24 ? 13 : 22 ,marginTop:props.info.examName.length > 24?44:20}}>{props.info.examName || ' '}</div>
+                            <div className="title" style={{ fontSize: props.info.examName.length > 24 ? 13 : 22 ,marginTop: 20}}>{props.info.examName || ' '}</div>
                             {
                             {
                                 props.info.examStartTime && <div className="time">{moment(props.info.examStartTime).format("YYYY-MM-DD HH:mm")}~{moment(props.info.examEndTime).format("YYYY-MM-DD HH:mm")}</div>
                                 props.info.examStartTime && <div className="time">{moment(props.info.examStartTime).format("YYYY-MM-DD HH:mm")}~{moment(props.info.examEndTime).format("YYYY-MM-DD HH:mm")}</div>
                             }
                             }
 
 
                             <div className="rule">
                             <div className="rule">
                                 <div className="item">
                                 <div className="item">
-                                    <div className="num">{props.info.totalScore || 0}</div>
+                                    <div className="num">{props.info.totalScore  || props.info.examPaper.totalScore || 0}</div>
                                     <div className="text">总分 <span className="dw" style={{color:'#999'}}>(分)</span></div>
                                     <div className="text">总分 <span className="dw" style={{color:'#999'}}>(分)</span></div>
                                 </div>
                                 </div>
                                 <div className="item">
                                 <div className="item">
-                                    <div className="num">{props.info.examTotal || 0}</div>
+                                    <div className="num">{props.info.examTotal  || props.info.examPaper.questionCnt || 0}</div>
                                     <div className="text">总题数<span className="dw" style={{color:'#999'}} >(道)</span></div>
                                     <div className="text">总题数<span className="dw" style={{color:'#999'}} >(道)</span></div>
                                 </div>
                                 </div>
                                 <div className="item">
                                 <div className="item">