diff --git a/src/forge/Images/taskbar.png b/src/forge/Images/taskbar.png new file mode 100644 index 00000000..91ceec7f Binary files /dev/null and b/src/forge/Images/taskbar.png differ diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx index 7ed723c7..bb298aa1 100644 --- a/src/forge/Main/sub/DetailBanner.jsx +++ b/src/forge/Main/sub/DetailBanner.jsx @@ -48,7 +48,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa item.menu_name === "issues" &&
  • - + 易修(Issue) diff --git a/src/forge/Team/Group/GroupDetails.jsx b/src/forge/Team/Group/GroupDetails.jsx index ba569386..1122ce72 100644 --- a/src/forge/Team/Group/GroupDetails.jsx +++ b/src/forge/Team/Group/GroupDetails.jsx @@ -117,8 +117,8 @@ export default ((props) => {
    {group.description ? group.description : "暂无描述"}
    -

    管理员团队对 所有仓库 具有操作权限,且对组织具有 管理员权限

    -

    此外,该团队拥有了 创建仓库 的权限:成员可以在组织中创建新的仓库。

    +

    组织的Owner团队拥有更改组织设置,在组织内新建仓库,新建组织团队等权限。

    +

    此外,Owner团队成员对当前组织下所有项目均具有仓库管理员权限,组织下其他团队的权限可由Owner团队成员自由制定。

    {group.is_admin ? : ""}
    diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss index a19619d7..579508f0 100644 --- a/src/forge/css/index.scss +++ b/src/forge/css/index.scss @@ -4,6 +4,13 @@ ul,ol,dl{ .newMain{ background-color: #fff; } +.newTable{ + background-color: #F0F5FF; + .newImages{ + background-image: url('../../forge/Images/taskbar.png'); + height: 364px; + } +} .color-black{ color: #333; } diff --git a/src/modules/403/Shixunauthority.js b/src/modules/403/Shixunauthority.js index a16ef32a..435d818b 100644 --- a/src/modules/403/Shixunauthority.js +++ b/src/modules/403/Shixunauthority.js @@ -1,4 +1,4 @@ -import React, { Component } from 'react'; +import React, { Component, useReducer } from 'react'; import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom"; @@ -11,20 +11,29 @@ import { TPMIndexHOC } from '../tpm/TPMIndexHOC'; import { SnackbarHOC,getImageUrl } from 'educoder'; class Shixunauthority extends Component { + constructor(props) { + super(props); + } render() { + console.log(this.props); + const { current_user } = this.props; return ( -
    -
    +
    +
    {/*mt100 mb100*/} -

    - 您可以稍后尝试 返回首页 - ,或者  +

    +

    您尚未被授权访问此页面,请先获取相关权限

    + 您可尝试 + {(!current_user || !current_user.login) && ( +

    您可尝试登录

    + )} + 返回首页,也可以通过 QQ反馈>> -

    + href="https://qm.qq.com/cgi-bin/qm/qr?k=YVGUhY7uK8ovpyd7tG_lHe2qGZ63LOij&jump_from=webapi" + className="color-blue">QQ向我们反馈 +

    {/*
    */} {/**/} @@ -33,5 +42,4 @@ class Shixunauthority extends Component { ); } } - export default SnackbarHOC() (TPMIndexHOC ( Shixunauthority )); diff --git a/src/modules/404/Shixunnopage.js b/src/modules/404/Shixunnopage.js index af1ad958..508255dd 100644 --- a/src/modules/404/Shixunnopage.js +++ b/src/modules/404/Shixunnopage.js @@ -11,19 +11,29 @@ import { TPMIndexHOC } from '../tpm/TPMIndexHOC'; import { SnackbarHOC,getImageUrl } from 'educoder'; class http500 extends Component { + constructor(props) { + super(props); + } render() { + console.log(this.props); + const { current_user } = this.props; return ( -
    -
    +
    +
    {/*mt100 mb100*/} -

    - 您可以稍后尝试  +

    你访问的页面不存在

    + 您可尝试 + {(!current_user || !current_user.login) && ( +

    您可尝试登录

    + )} + 返回首页 - ,或者  + ,也可通过 QQ反馈>> + href="https://qm.qq.com/cgi-bin/qm/qr?k=YVGUhY7uK8ovpyd7tG_lHe2qGZ63LOij&jump_from=webapi" + className="color-blue">QQ向我们反馈

    {/*
    */} diff --git a/src/modules/500/http500.js b/src/modules/500/http500.js index 89e1baa5..96ef9474 100644 --- a/src/modules/500/http500.js +++ b/src/modules/500/http500.js @@ -13,17 +13,18 @@ import { SnackbarHOC,getImageUrl } from 'educoder'; class Shixunnopage extends Component { render() { return ( -
    +
    {/*mt100 mb100*/} -

    - 您可以稍后尝试  +

    服务器异常,请稍后重试

    + 您可尝试刷新页面返回首页 - ,或者  + ,也可以通过 QQ反馈>> + href="https://qm.qq.com/cgi-bin/qm/qr?k=YVGUhY7uK8ovpyd7tG_lHe2qGZ63LOij&jump_from=webapi" + className="color-blue">QQ向我们反馈

    {/*
    */}