diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 6c4a20fa9..61ab83126 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -31,7 +31,7 @@ export function initAxiosInterceptors(props) {
// proxy = "http://testbdweb.trustie.net"
// proxy = "http://testbdweb.educoder.net"
proxy = "https://testeduplus2.educoder.net"
- proxy="http://47.96.87.25:48080"
+ //proxy="http://47.96.87.25:48080"
// 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
// 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
index 47f38746c..2fd67bd57 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
@@ -259,26 +259,25 @@ class GraduationTasksappraise extends Component{
</div>
-
+ <div className="color-grey" key={key}>
{firelistdata===undefined?"":firelistdata.length===0?"":firelistdata.revise_attachments.map((item,key)=>{
- return(
- <div className="color-grey" key={key}>
- <a className="color-grey ml20">
- <i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
- </a>
- <a href={item.url}
- className="mr12 color9B9B" length="58">
- {item.title}
- </a>
- <span className="color656565 mt2 color-grey-6 font-12 mr8">{item.filesize}</span>
- {item.delete===true?<i className="font-14 iconfont icon-guanbi " id={item.id} aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.id)}></i>:""}
-
- </div>
- )
- })}
-
-
+ return(
+ <span>
+ <a className="color-grey ml20">
+ <i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
+ </a>
+ <a href={item.url}
+ className="mr12 color9B9B" length="58">
+ {item.title}
+ </a>
+ <span className="color656565 mt2 color-grey-6 font-12 mr8">{item.filesize}</span>
+ {item.delete===true?<i className="font-14 iconfont icon-guanbi " id={item.id} aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.id)}></i>:""}
+ </span>
+ )
+ })}
+
+ </div>
<div className={"color-grey-6 h20 ml20"}>
diff --git a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
index 02107b912..a7c7fbad7 100644
--- a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
+++ b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
@@ -467,6 +467,7 @@ class Workquestionandanswer extends Component {
<span>
<div className="font-16 color-dark break_word flex1 pl20 " style={{"padding":"10px 10px 10px 20px"}}>
{jobsettingsdata === undefined ? "" : jobsettingsdata === null ? "" : jobsettingsdata === "null" ? "" :
+ jobsettingsdata.data.explanation=== undefined?"" :jobsettingsdata.data.explanation=== null?"":
<div dangerouslySetInnerHTML={{__html:markdownToHTML(jobsettingsdata.data.explanation).replace(/▁/g,"▁▁▁")}}></div>
}
</div>
diff --git a/public/react/src/modules/login/Trialapplication.js b/public/react/src/modules/login/Trialapplication.js
index 77abca50c..283574938 100644
--- a/public/react/src/modules/login/Trialapplication.js
+++ b/public/react/src/modules/login/Trialapplication.js
@@ -34,8 +34,8 @@ class Trialapplication extends Component {
showTrial: false,
}
//user_phone_binded 判断是否手机号验证
- console.log("Trialapplication");
- console.log(props);
+ // console.log("Trialapplication");
+ // console.log(props);
}
Cancel = () => {
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 1620d19fb..6ea5360b4 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -173,8 +173,8 @@ class NewHeader extends Component {
user_phone_binded:false,
showTrial:false,
}
- console.log("176")
- console.log(props);
+ // console.log("176")
+ // console.log(props);
}
componentDidMount() {
diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index 51d4cee9f..82c18a09d 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -640,7 +640,7 @@ class TPMBanner extends Component {
className="fr user_default_btn task-btn-orange font-18"
id="shixun_operation" data-remote="true"
>
- {shixunsDetails.task_operation === undefined ? "" : shixunsDetails.status > 1 ? shixunsDetails.task_operation[0] : "模拟实战"}
+ {shixunsDetails.task_operation === undefined ? "" : shixunsDetails.task_operation[0]}
</a>
</Tooltip>
: ""
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
index 73dcb0b49..49d7cf016 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -359,7 +359,7 @@ class Challenges extends Component {
{item.delete_url != undefined &&
<Tooltip placement="bottom" title={"删除"}>
<a onClick={() => this.delOperations(item.challenge_id)}
- style={{ display: this.props.identity < 4 && this.props.status === 0 ? "block" : 'none' }}
+ style={{ display:this.props.user.admin===true?"block":this.props.identity < 4 && this.props.status === 0 ? "block" : 'none' }}
className="fl ring-op-green mr25">
<img src={getImageUrl("images/educoder/icon/close.svg")}
className="fl mt5 ml5" />
@@ -371,7 +371,7 @@ class Challenges extends Component {
{item.up_url != undefined &&
<Tooltip placement="bottom" title={"向上移动"}>
<a onClick={operationstrue===true?"":() => this.operations(item.challenge_id, "up")}
- style={{ display: this.props.identity < 4 && this.props.status === 0 ? "block" : 'none' }}
+ style={{ display:this.props.user.admin===true?"block":this.props.identity < 4 && this.props.status === 0 ? "block" : 'none' }}
className="fl ring-op-green mr25">
<img src={getImageUrl("images/educoder/icon/moveup.svg")}
className="fl mt2 ml4" />
@@ -381,7 +381,7 @@ class Challenges extends Component {
{item.down_url != undefined &&
<Tooltip placement="bottom" title={"向下移动"}>
<a onClick={operationstrue===true?"":() => this.operations(item.challenge_id, "down")}
- style={{ display: this.props.identity < 4 && this.props.status === 0 ? "block" : 'none' }}
+ style={{ display: this.props.user.admin===true?"block":this.props.identity < 4 && this.props.status === 0 ? "block" : 'none' }}
className="fl ring-op-green mr25">
<img src={getImageUrl("images/educoder/icon/movedown.svg")} className="fl mt2 ml4" />
</a>
@@ -393,7 +393,7 @@ class Challenges extends Component {
item.st === 1 ?
<Tooltip placement="bottom" title={"编辑"}>
<a
- style={{ display: this.props.identity < 4 && this.props.status < 3 ? "block" : 'none' }}
+ style={{ display:this.props.user.admin===true?"block":this.props.identity < 4 && this.props.status < 3 ? "block" : 'none' }}
href={"/shixuns/" + ChallengesDataList.shixun_identifier + "/challenges/" + item.challenge_id + "/editquestion"}
className="fl ring-green">
<img src={getImageUrl("images/educoder/icon/edit.svg")}
@@ -403,7 +403,7 @@ class Challenges extends Component {
:
<Tooltip placement="bottom" title={"编辑"}>
<a
- style={{ display: this.props.identity < 4 && this.props.status < 3 ? "block" : 'none' }}
+ style={{ display:this.props.user.admin===true?"block":this.props.identity < 4 && this.props.status < 3 ? "block" : 'none' }}
href={"/shixuns/" + ChallengesDataList.shixun_identifier + "/challenges/" + item.challenge_id + "/editcheckpoint"}
className="fl ring-green">
<img src={getImageUrl("images/educoder/icon/edit.svg")}