diff --git a/src/common/UrlTool.js b/src/common/UrlTool.js
index cc82ec16b..e45ae6ba2 100644
--- a/src/common/UrlTool.js
+++ b/src/common/UrlTool.js
@@ -144,7 +144,7 @@ export function getUrl(path, goTest) {
// if (isDev) {
// return `${local}${path?path:''}`
// }
- return `${path ? path: TEST_HOST}`;
+ return `${path ? path: ''}`;
}
export function getZoneUrl(path) {
diff --git a/src/forge/Information/Pages/help.jsx b/src/forge/Information/Pages/help.jsx
index 9d2ba6e18..823a6fdf0 100644
--- a/src/forge/Information/Pages/help.jsx
+++ b/src/forge/Information/Pages/help.jsx
@@ -66,7 +66,7 @@ function ProjectSource(props) {
// 获取wiki内容
setLoading(true);
getWiki({
- pageName: wiki.titleStr,
+ pageName: wiki.title_sub,
...wikiParams
}).then(res=>{
setLoading(false);
@@ -78,7 +78,7 @@ function ProjectSource(props) {
message.error("加载失败")
}
})
- }, [wiki && wiki.titleStr])
+ }, [wiki && wiki.title_sub])
useEffect(() => {
if (scroller) {
@@ -236,7 +236,7 @@ function ProjectSource(props) {
{wikiDetail.name}
{wikiDetail.commit && 更新时间:{wikiDetail.commit.author.date || '刚刚'}
}
- {adminUrl && }
+ {adminUrl && }
{wikiDetail.md_content && }
diff --git a/src/forge/Main/CoderRootFileDetail.js b/src/forge/Main/CoderRootFileDetail.js
index 372af7202..072ab931e 100644
--- a/src/forge/Main/CoderRootFileDetail.js
+++ b/src/forge/Main/CoderRootFileDetail.js
@@ -54,6 +54,11 @@ class CoderRootFileDetail extends Component {
}
}
+ isCommit = () => {
+ const {detail, branch} = this.props;
+ return detail && detail.commit && detail.commit.sha.includes(branch)
+ }
+
// 更新网页标题
updateDocumentTitle(){
const {projectDetail, treeValuePath, location} = this.props;
@@ -300,7 +305,7 @@ class CoderRootFileDetail extends Component {
- {flag && platform && (
+ {flag && platform && !this.isCommit() && (
{readOnly ? (
diff --git a/src/glcc/home/timerShaft/index.jsx b/src/glcc/home/timerShaft/index.jsx
index 67d15bc4a..37a1bf372 100644
--- a/src/glcc/home/timerShaft/index.jsx
+++ b/src/glcc/home/timerShaft/index.jsx
@@ -5,6 +5,7 @@ import { formatParsedResult } from '../../api';
function TimerShaft(props) {
const {current_user, period, history, showLoginDialog, id, glccSettings} = props;
+ let repoApplyEnd = undefined
const step = [{
title: "Step1",
date: "4.22",
@@ -71,6 +72,9 @@ function TimerShaft(props) {
const repoApply = glccSettings.filter(item=>item.name === "repoApply");
repoApply[0] && (step[0].date = formatParsedResult(repoApply, "startMonthDay"))
repoApply[0] && (step[1].date = formatParsedResult(repoApply, "rangeConcatDot"))
+ if(repoApply[0]){
+ repoApplyEnd = new Date(repoApply[0].value.split(",")[1]).getTime()-new Date().getTime() < 0
+ }
// 学生报名
const stuApply = glccSettings.filter(item=>item.name === "stuApply");
stuApply[0] && (step[3].date = formatParsedResult(stuApply, "rangeConcatDot"))
@@ -93,12 +97,12 @@ function TimerShaft(props) {
有兴趣成为GLCC的导师吗?
想要扩大项目知名度和影响力,为开源项目吸引新鲜血液,培养长期开发者。通过GitLink平台,与高校建立连接,指导开源新人传授他们的开源文化,享受开源的乐趣
- {period === "repoApply" ?
立即报名
:
项目报名已结束
}
+ {period === "repoApply" ?
立即报名
:
项目报名{repoApplyEnd ? "已结束" : "敬请期待"}
}
你是开源新手,有兴趣参加GLCC吗?
想要参与一线开源项目开发,熟悉开源社区运作流程,接受资深开源软件专家指导,获得丰厚奖金和实习机会。参加GLCC,开启全新的开源之旅。
- {(period === "stuApply" || period === "stuApply1") ?
学生报名
:
学生报名{period === "repoApply" ? "敬请期待" : "已结束"}
}
+ {(period === "stuApply" || period === "stuApply1") ?
学生报名
:
学生报名{(period === "repoApply" || !period) ? "敬请期待" : "已结束"}
}