Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/poll/PollDetailTabThird.js

@@ -20,6 +20,13 @@ class PollDetailTabThird extends Component{
     let url=`/polls/${pollId}.json`;
     axios.get(url).then((result)=>{
       if(result.status==200){
+				if (result.data.status === 401) {
+					//未登入
+					this.setState({
+						pollDetail: undefined
+					})
+					return
+				}
         this.setState({
           pollDetail:result.data
         })

public/react/src/modules/courses/poll/PollDetailTabThirdInfo.js

@@ -14,10 +14,16 @@ class PollDetailTabThirdInfo extends Component{
   }
   render(){
     let { pollDetail }=this.props;
+    console.log("pollDetailpollDetail");
+    console.log(pollDetail);
     return(
+      <div>
+        {
+          pollDetail !== undefined ?
+
             <div className="edu-back-white">
               {
-            pollDetail && pollDetail.poll.polls_description && 
+                pollDetail !== pollDetail.poll.polls_description &&
                 <p style={{whiteSpace:"pre-wrap"}} className="color-grey-3 padding20-30">{ pollDetail.poll.polls_description }</p>
               }
               <p className="padding20-30 clearfix edu-txt-left" style={{background:"#fafafa"}}>
@@ -59,7 +65,11 @@ class PollDetailTabThirdInfo extends Component{
                       </span>:""
                         }
                       </p>
-                  <li className="pl30 pr30 pb15">{item.question.question_title}</li>
+                      <p className="pl30 pr30 pb15"><span className="font-14  flex1" style={{
+                        "white-space": "pre-wrap",
+                        "word-break": "break-all",
+                        "word-wrap": "break-word"
+                      }}>{item.question.question_title}</span></p>
                       {
                         // 单选题
                         item.question.question_type==1 &&
@@ -111,6 +121,9 @@ class PollDetailTabThirdInfo extends Component{
                 })
               }
             </div>
+            : ""
+        }
+      </div>
     )
   }
 }

public/react/src/modules/courses/poll/PollInfo.js

@@ -392,7 +392,11 @@ class PollInfo extends Component{
                           </span>:""
                         }
                       </div>
-                      <li className="pl30 pr30 mb10 lineh-20">{item.question.question_title}</li>
+											<p className="pl30 pr30 mb10 "><span className="font-14  flex1" style={{
+												"white-space": "pre-wrap",
+												"word-break": "break-all",
+												"word-wrap": "break-word"
+											}}>{item.question.question_title}</span></p>
                       {
                         //单选
                         item.question.question_type==1 && 

public/react/src/modules/courses/poll/PollNew.js

@@ -616,11 +616,16 @@ class PollNew extends Component {
 		// let name="Anchor_"+index;
 		console.log("scrollToAnchor");
 		console.log(index);
+		try {
 			if (index) {
 				let anchorElement = document.getElementById(index);
 				// if(anchorElement) { anchorElement.scrollIntoView(); }
 				$("html").animate({scrollTop: $(anchorElement).offset().top - 150})
 			}
+		} catch (e) {
+
+		}
+
 	}
 	//新增添加题目 有new
 	addMytopic = (index, pollid, Insertposition, Whether, id,inty) => {

public/react/src/modules/user/usersInfo/banks/PollBanksContent.js

@@ -18,6 +18,7 @@ class PollBanksContent extends Component{
     let url = `/exercise_banks/${bankId}.json`
     axios.get(url).then((result)=>{
       if(result){
+				if (result.status == 200) {
 					let pollDetail = {
           poll:{
             id: result.data.poll && result.data.poll.id ,
@@ -48,10 +49,18 @@ class PollBanksContent extends Component{
           authorize:result && result.data && result.data.authorize,
         }
         this.props.initPublic(crumbData,menuData,result.data);
+					if (result.data.status === 401) {
+						//未登入
+						this.setState({
+							pollDetail: undefined
+						})
+						return
+					}
         this.setState({
           pollDetail
         })
 				}
+      }
     }).catch((error)=>{
       console.log(error);
     })