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

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

@@ -231,9 +231,11 @@ class PollDetailIndex extends Component{
                   {
 										user_permission && user_permission.current_status!=3 ?
 											<WordsBtn style="blue" to={`/courses/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollId}/users/${this.props.current_user.login}`}>
-												{ user_permission && user_permission.current_status ==0 ? "继续答题" : user_permission.current_status == 1 ?
+												{ user_permission && user_permission.current_status ==0 ? "继续答题" :
-													(polls_status===2?"":polls_status===3?"":polls_status===4?"":"查看答题")
+													user_permission.current_status == 1 ?
-													: "开始答题"  }
+													(polls_status===1?"":"查看答题")
+													:user_permission.current_status == 2 ?(polls_status===3?"":polls_status===4?"":"开始答题"):""
+												}
 											</WordsBtn>
 											:""
 									}

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

@@ -3151,8 +3151,11 @@ class PollNew extends Component {
 																	 onClick={() => this.Deleteadddom(indexo,true)}>取消</ActionBtn>
                         <ActionBtn style="blue" className="mr20 w100"
 																	 onClick={() => this.Deleteadddomthree(indexo, itemo,true)}>保存</ActionBtn>
+																					{
+																						polls_status && polls_status < 2 ?
 											 <ActionBtn style="blue" className=" w100"
 																	onClick={() => this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续</ActionBtn>
+																							:""}
                       </span>
 																			</div>
 																		</div>
@@ -3248,8 +3251,11 @@ class PollNew extends Component {
 																	 onClick={() => this.Deleteadddom(indexo,true)}>取消</ActionBtn>
                         <ActionBtn style="blue" className="mr20 w100"
 																	 onClick={() => this.Deleteadddomthree(indexo, itemo,true)}>保存</ActionBtn>
+																					{
+																						polls_status && polls_status < 2 ?
 											 <ActionBtn style="blue" className=" w100"
 																	onClick={() => this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续</ActionBtn>
+																							:""}
                       </span>
 																			</div>
 
@@ -3261,8 +3267,11 @@ class PollNew extends Component {
 																	 onClick={() => this.Deleteadddom(indexo,true)}>取消</ActionBtn>
                         <ActionBtn style="blue" className="mr20 w100"
 																	 onClick={() => this.Deleteadddomthree(indexo, itemo,true)}>保存</ActionBtn>
+															{
+																polls_status && polls_status < 2 ?
 											 <ActionBtn style="blue" className=" w100"
 																	onClick={() => this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续</ActionBtn>
+																	:""}
                       </span>
 																			</div>
 																	)
@@ -3274,8 +3283,11 @@ class PollNew extends Component {
 																	 onClick={() => this.Deleteadddom(indexo,true)}>取消</ActionBtn>
                         <ActionBtn style="blue" className="mr20 w100"
 																	 onClick={() => this.Deleteadddomthree(indexo, itemo,true)}>保存</ActionBtn>
+													{
+														polls_status && polls_status < 2 ?
 											 <ActionBtn style="blue" className=" w100"
 																	onClick={() => this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续</ActionBtn>
+															:""}
                       </span>
 																		</div>
 																		:
@@ -3393,8 +3405,11 @@ class PollNew extends Component {
 																	 onClick={() => this.Deleteadddom(indexo,true)}>取消</ActionBtn>
                         <ActionBtn style="blue" className="mr20 w100"
 																	 onClick={() => this.Deleteadddomthree(indexo, itemo,true)}>保存</ActionBtn>
+																						{
+																							polls_status && polls_status < 2 ?
 											 <ActionBtn style="blue" className=" w100"
 																	onClick={() => this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续</ActionBtn>
+																								:""}
                       </span>
 																				</div>
 																			</div>
@@ -3490,8 +3505,11 @@ class PollNew extends Component {
 																	 onClick={() => this.Deleteadddom(indexo,true)}>取消</ActionBtn>
                         <ActionBtn style="blue" className="mr20 w100"
 																	 onClick={() => this.Deleteadddomthree(indexo, itemo,true)}>保存</ActionBtn>
+																						{
+																							polls_status && polls_status < 2 ?
 											 <ActionBtn style="blue" className=" w100"
 																	onClick={() => this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续</ActionBtn>
+																								:""}
                       </span>
 																				</div>
 
@@ -3503,8 +3521,11 @@ class PollNew extends Component {
 																	 onClick={() => this.Deleteadddom(indexo,true)}>取消</ActionBtn>
                         <ActionBtn style="blue" className="mr20 w100"
 																	 onClick={() => this.Deleteadddomthree(indexo, itemo,true)}>保存</ActionBtn>
+															{
+																polls_status && polls_status < 2 ?
 											 <ActionBtn style="blue" className=" w100"
 																	onClick={() => this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续</ActionBtn>
+																	:""}
                       </span>
 																				</div>
 																		)
@@ -3516,8 +3537,11 @@ class PollNew extends Component {
 																	 onClick={() => this.Deleteadddom(indexo,true)}>取消</ActionBtn>
                         <ActionBtn style="blue" className="mr20 w100"
 																	 onClick={() => this.Deleteadddomthree(indexo, itemo,true)}>保存</ActionBtn>
+													{
+														polls_status && polls_status < 2 ?
 											 <ActionBtn style="blue" className=" w100"
 																	onClick={() => this.Deleteadddomtwo(indexo, itemo,true)}>保存并继续</ActionBtn>
+															:""}
                       </span>
 																			</div>
 																			:
@@ -3644,8 +3668,12 @@ class PollNew extends Component {
 																	 onClick={() => this.Deleteadddom(indexo)}>取消</ActionBtn>
                         <ActionBtn style="blue" className="mr20 w100"
 																	 onClick={() => this.Deleteadddomthree(indexo, itemo)}>保存</ActionBtn>
+																			{
+																				polls_status && polls_status < 2 ?
 																					<ActionBtn style="blue" className=" w100"
 																										 onClick={() => this.Deleteadddomtwo(indexo, itemo)}>保存并继续</ActionBtn>
+																			:""
+																			}
                       </span>
 																	</div>
 																</div>
@@ -3741,8 +3769,12 @@ class PollNew extends Component {
 																	 onClick={() => this.Deleteadddom(indexo)}>取消</ActionBtn>
                         <ActionBtn style="blue" className="mr20 w100"
 																	 onClick={() => this.Deleteadddomthree(indexo, itemo)}>保存</ActionBtn>
+																			{
+																				polls_status&&polls_status<2?
 											 <ActionBtn style="blue" className=" w100"
 																	onClick={() => this.Deleteadddomtwo(indexo, itemo)}>保存并继续</ActionBtn>
+																					:""
+																			}
                       </span>
 																	</div>
 
@@ -3754,8 +3786,12 @@ class PollNew extends Component {
 																	 onClick={() => this.Deleteadddom(indexo)}>取消</ActionBtn>
                         <ActionBtn style="blue" className="mr20 w100"
 																	 onClick={() => this.Deleteadddomthree(indexo, itemo)}>保存</ActionBtn>
+															{
+																polls_status&&polls_status<2?
 											 <ActionBtn style="blue" className=" w100"
 																	onClick={() => this.Deleteadddomtwo(indexo, itemo)}>保存并继续</ActionBtn>
+																	:""
+															}
                       </span>
 																	</div>
 															)
@@ -3767,8 +3803,13 @@ class PollNew extends Component {
 																	 onClick={() => this.Deleteadddom(indexo)}>取消</ActionBtn>
                         <ActionBtn style="blue" className="mr20 w100"
 																	 onClick={() => this.Deleteadddomthree(indexo, itemo)}>保存</ActionBtn>
+													{
+														polls_status&&polls_status<2?
 															<ActionBtn style="blue" className=" w100"
 																				 onClick={() => this.Deleteadddomtwo(indexo, itemo)}>保存并继续</ActionBtn>
+															:""
+													}
+
                       </span>
 																</div>
 																: