From dbcf8057cec610f1a9d3e28789ff4c4a510ae92d Mon Sep 17 00:00:00 2001 From: guotao Date: Fri, 14 May 2021 10:11:57 +0800 Subject: [PATCH 01/21] =?UTF-8?q?XC=E7=99=BB=E5=BD=95=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 17 +++++++++- src/modules/login/LoginDialog.js | 24 +++++++++++++ src/modules/login/Otherloginxc.js | 54 ++++++++++++++++++++++++++++++ src/modules/login/ccyun.png | Bin 0 -> 8857 bytes 4 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 src/modules/login/Otherloginxc.js create mode 100644 src/modules/login/ccyun.png diff --git a/src/App.js b/src/App.js index 6c3382455..afbea00e8 100644 --- a/src/App.js +++ b/src/App.js @@ -10,7 +10,7 @@ import { import axios from 'axios'; import LoginDialog from './modules/login/LoginDialog'; import 'babel-polyfill'; -import Loading from './Loading'; +import Loading from './Loading' import Loadable from 'react-loadable'; import marked from './common/marked'; @@ -75,6 +75,11 @@ const EducoderLogin = Loadable({ loading: Loading, }) +const Otherloginxc = Loadable({ + loader: () => import('./modules/login/Otherloginxc'), + loading: Loading, +}) + class App extends Component { constructor(props) { super(props); @@ -206,6 +211,7 @@ class App extends Component { }); }; + render() { return ( @@ -214,6 +220,15 @@ class App extends Component { this.Modifyloginvalue()}> + {/*xc登录*/} + { + return () + } + }> + {/*项目*/} { + try { + var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting')); + for(var i=0; i { return document.body; } @@ -582,6 +597,15 @@ class LoginDialog extends Component {

+

+ ———————— 快速登录 ———————— +

+

+ {this.props.user && this.props.user.main_site === true ? this.state.isphone === true ?

———————— 快速登录 ————————

diff --git a/src/modules/login/Otherloginxc.js b/src/modules/login/Otherloginxc.js new file mode 100644 index 000000000..3f28eeee6 --- /dev/null +++ b/src/modules/login/Otherloginxc.js @@ -0,0 +1,54 @@ +import React, { Component } from 'react'; + +import { BrowserRouter as Router, Route, Link } from "react-router-dom"; + +import { Spin } from 'antd'; +import axios from 'axios'; +class Otherloginxc extends Component { + + componentDidMount() { + debugger + let query=this.props.location.search; + if(query!= ""){ + const type = query.split('?code='); + const types = type[1].split('&state='); + const typeshref = types[1].split('%2C'); + let codeurl = `/auth/ccyun/callback.json`; + + axios.get(codeurl,{params:{ + code:types[0], + //https://test-newweb.educoder.net/ + //https://www.educoder.net/otherloginqq + }}).then((result)=> { + if(result){ + if(result.data.status===0){ + + window.location.href=`/`; + } + } + }).catch((error)=>{ + + }) + } + } + + render() { + // Loading + return ( +
+ + +
+ ); + } +} + +export default Otherloginxc; \ No newline at end of file diff --git a/src/modules/login/ccyun.png b/src/modules/login/ccyun.png new file mode 100644 index 0000000000000000000000000000000000000000..219c291def2f80bc0d63e73c98f29399d8dc48c2 GIT binary patch literal 8857 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 SCH7xih^(ZN1Vqd@=zjnQ Date: Mon, 17 May 2021 11:47:28 +0800 Subject: [PATCH 02/21] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .ccyun.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .ccyun.yml diff --git a/.ccyun.yml b/.ccyun.yml new file mode 100644 index 000000000..b161fea56 --- /dev/null +++ b/.ccyun.yml @@ -0,0 +1,9 @@ +kind: pipeline +type: docker +name: default + +steps: +- name: 编译 + image: npm + commands: + - npm install -- 2.34.1 From e9bab1c78ed11f3a0783e7d789205b7b7e40ad70 Mon Sep 17 00:00:00 2001 From: guotao Date: Tue, 18 May 2021 09:02:50 +0800 Subject: [PATCH 03/21] update --- .ccyun.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ccyun.yml b/.ccyun.yml index b161fea56..002aa5523 100644 --- a/.ccyun.yml +++ b/.ccyun.yml @@ -6,4 +6,4 @@ steps: - name: 编译 image: npm commands: - - npm install + - echo '123' -- 2.34.1 From 518ed03adb0d5da2ed3bdb675c22766593e93d12 Mon Sep 17 00:00:00 2001 From: guotao Date: Tue, 18 May 2021 09:14:32 +0800 Subject: [PATCH 04/21] update --- .ccyun.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ccyun.yml b/.ccyun.yml index 002aa5523..d38550c75 100644 --- a/.ccyun.yml +++ b/.ccyun.yml @@ -6,4 +6,4 @@ steps: - name: 编译 image: npm commands: - - echo '123' + - echo '1234' -- 2.34.1 From 079cdbce82e5a761bcc0fa3c7b8446ea030222bc Mon Sep 17 00:00:00 2001 From: guotao Date: Tue, 18 May 2021 09:35:21 +0800 Subject: [PATCH 05/21] update --- .ccyun.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ccyun.yml b/.ccyun.yml index d38550c75..6e3571589 100644 --- a/.ccyun.yml +++ b/.ccyun.yml @@ -6,4 +6,4 @@ steps: - name: 编译 image: npm commands: - - echo '1234' + - echo '12345' -- 2.34.1 From 876298d76dba754580eb8eb3b06056cd60ab518d Mon Sep 17 00:00:00 2001 From: guotao Date: Tue, 18 May 2021 10:14:16 +0800 Subject: [PATCH 06/21] update --- .ccyun.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ccyun.yml b/.ccyun.yml index 6e3571589..49cd9ae1a 100644 --- a/.ccyun.yml +++ b/.ccyun.yml @@ -6,4 +6,4 @@ steps: - name: 编译 image: npm commands: - - echo '12345' + - echo '123456' -- 2.34.1 From 78d8f2994afa5ab656127925ccd4011f17576c80 Mon Sep 17 00:00:00 2001 From: guotao Date: Tue, 18 May 2021 10:21:14 +0800 Subject: [PATCH 07/21] update --- .ccyun.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.ccyun.yml b/.ccyun.yml index 49cd9ae1a..d05416744 100644 --- a/.ccyun.yml +++ b/.ccyun.yml @@ -2,6 +2,10 @@ kind: pipeline type: docker name: default +platform: + os: linux + arch: arm64 + steps: - name: 编译 image: npm -- 2.34.1 From 234eff129685a5dd2d0fee1a7440477dfa3028f6 Mon Sep 17 00:00:00 2001 From: guotao Date: Tue, 18 May 2021 10:57:19 +0800 Subject: [PATCH 08/21] update --- .ccyun.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ccyun.yml b/.ccyun.yml index d05416744..cf048817f 100644 --- a/.ccyun.yml +++ b/.ccyun.yml @@ -8,6 +8,6 @@ platform: steps: - name: 编译 - image: npm + image: docker.io/mkenney/npm commands: - echo '123456' -- 2.34.1 From fc8b612e6c114219ceb65f5577a60e639b4363dc Mon Sep 17 00:00:00 2001 From: guotao Date: Tue, 18 May 2021 11:01:08 +0800 Subject: [PATCH 09/21] update --- .ccyun.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.ccyun.yml b/.ccyun.yml index cf048817f..ff850c10d 100644 --- a/.ccyun.yml +++ b/.ccyun.yml @@ -10,4 +10,6 @@ steps: - name: 编译 image: docker.io/mkenney/npm commands: - - echo '123456' + - npm install -g cnpm --registry=https://registry.npm.taobao.org + - cnpm install + - npm run build -- 2.34.1 From 1ab1ca3567c204b0255e67cd5f6aa3b5b99d9c80 Mon Sep 17 00:00:00 2001 From: guotao Date: Tue, 18 May 2021 11:06:11 +0800 Subject: [PATCH 10/21] update --- .ccyun.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ccyun.yml b/.ccyun.yml index ff850c10d..b4c0c045f 100644 --- a/.ccyun.yml +++ b/.ccyun.yml @@ -8,7 +8,7 @@ platform: steps: - name: 编译 - image: docker.io/mkenney/npm + image: docker.io/library/node commands: - npm install -g cnpm --registry=https://registry.npm.taobao.org - cnpm install -- 2.34.1 From 70fffa38628ecd1ea85a6f8c1a4dd951516f2777 Mon Sep 17 00:00:00 2001 From: guotao Date: Tue, 18 May 2021 11:31:50 +0800 Subject: [PATCH 11/21] update --- .ccyun.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.ccyun.yml b/.ccyun.yml index b4c0c045f..ffe339f38 100644 --- a/.ccyun.yml +++ b/.ccyun.yml @@ -13,3 +13,11 @@ steps: - npm install -g cnpm --registry=https://registry.npm.taobao.org - cnpm install - npm run build + volumes: + - name: node_cache + path: ./node_modules + +volumes: +- name: node_cache + host: + path: /data/node_cache -- 2.34.1 From ae0379d589a328e3f0eeef904960d3c80d7465a9 Mon Sep 17 00:00:00 2001 From: guotao Date: Tue, 18 May 2021 11:36:17 +0800 Subject: [PATCH 12/21] update --- .ccyun.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ccyun.yml b/.ccyun.yml index ffe339f38..8491e78ef 100644 --- a/.ccyun.yml +++ b/.ccyun.yml @@ -8,14 +8,14 @@ platform: steps: - name: 编译 - image: docker.io/library/node + image: node commands: - npm install -g cnpm --registry=https://registry.npm.taobao.org - cnpm install - npm run build volumes: - name: node_cache - path: ./node_modules + path: node_modules volumes: - name: node_cache -- 2.34.1 From 7aad151a0496a35b118533e5a1af00943f77902a Mon Sep 17 00:00:00 2001 From: guotao Date: Tue, 18 May 2021 11:38:41 +0800 Subject: [PATCH 13/21] update --- .ccyun.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.ccyun.yml b/.ccyun.yml index 8491e78ef..43ca28496 100644 --- a/.ccyun.yml +++ b/.ccyun.yml @@ -1,10 +1,9 @@ kind: pipeline type: docker name: default - -platform: - os: linux - arch: arm64 + #platform: + # os: linux + #arch: arm64 steps: - name: 编译 @@ -13,11 +12,11 @@ steps: - npm install -g cnpm --registry=https://registry.npm.taobao.org - cnpm install - npm run build - volumes: - - name: node_cache - path: node_modules +# volumes: +# - name: node_cache +# path: node_modules -volumes: -- name: node_cache - host: - path: /data/node_cache +#volumes: +#- name: node_cache +# host: +# path: /data/node_cache -- 2.34.1 From 035609b9ed06e48fb4b073c9f499feee8cdb8fa3 Mon Sep 17 00:00:00 2001 From: guotao Date: Tue, 18 May 2021 11:40:54 +0800 Subject: [PATCH 14/21] update --- .ccyun.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.ccyun.yml b/.ccyun.yml index 43ca28496..28adbb618 100644 --- a/.ccyun.yml +++ b/.ccyun.yml @@ -1,9 +1,6 @@ kind: pipeline type: docker -name: default - #platform: - # os: linux - #arch: arm64 +name: 确实社区前端自动化编译部署脚本 steps: - name: 编译 @@ -12,11 +9,3 @@ steps: - npm install -g cnpm --registry=https://registry.npm.taobao.org - cnpm install - npm run build -# volumes: -# - name: node_cache -# path: node_modules - -#volumes: -#- name: node_cache -# host: -# path: /data/node_cache -- 2.34.1 From f14ca72ca7eb303d0f3936affe5a16a5f3c61433 Mon Sep 17 00:00:00 2001 From: guotao Date: Tue, 18 May 2021 11:47:11 +0800 Subject: [PATCH 15/21] update --- .ccyun.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.ccyun.yml b/.ccyun.yml index 28adbb618..82ea2cbc4 100644 --- a/.ccyun.yml +++ b/.ccyun.yml @@ -6,6 +6,5 @@ steps: - name: 编译 image: node commands: - - npm install -g cnpm --registry=https://registry.npm.taobao.org - - cnpm install + - npm install - npm run build -- 2.34.1 From bcfe3214ad15f375ec0585a3343317f9059f43b8 Mon Sep 17 00:00:00 2001 From: guotao Date: Tue, 18 May 2021 13:30:45 +0800 Subject: [PATCH 16/21] update --- .ccyun.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.ccyun.yml b/.ccyun.yml index 82ea2cbc4..867820455 100644 --- a/.ccyun.yml +++ b/.ccyun.yml @@ -3,8 +3,6 @@ type: docker name: 确实社区前端自动化编译部署脚本 steps: -- name: 编译 - image: node +- name: step1 commands: - - npm install - - npm run build + - echo 'Hello, world' -- 2.34.1 From 49e127f0736c056f83c5b77de28bd78ddddf3fbe Mon Sep 17 00:00:00 2001 From: guotao Date: Tue, 18 May 2021 15:21:59 +0800 Subject: [PATCH 17/21] update --- .ccyun.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.ccyun.yml b/.ccyun.yml index 867820455..1ee4a9260 100644 --- a/.ccyun.yml +++ b/.ccyun.yml @@ -4,5 +4,8 @@ name: 确实社区前端自动化编译部署脚本 steps: - name: step1 + image: node commands: - - echo 'Hello, world' + - npm install -g cnpm --registry=https://registry.npm.taobao.org + - cnpm install + - npm run build -- 2.34.1 From 2500b438bc8471e3d87316b65a763214a72405e7 Mon Sep 17 00:00:00 2001 From: guotao Date: Tue, 18 May 2021 15:24:38 +0800 Subject: [PATCH 18/21] update --- .ccyun.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ccyun.yml b/.ccyun.yml index 1ee4a9260..28adbb618 100644 --- a/.ccyun.yml +++ b/.ccyun.yml @@ -3,7 +3,7 @@ type: docker name: 确实社区前端自动化编译部署脚本 steps: -- name: step1 +- name: 编译 image: node commands: - npm install -g cnpm --registry=https://registry.npm.taobao.org -- 2.34.1 From 5369a96f434424c62bfc11b497e4eea3c7f75284 Mon Sep 17 00:00:00 2001 From: guotao Date: Tue, 18 May 2021 15:29:54 +0800 Subject: [PATCH 19/21] update --- .ccyun.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.ccyun.yml b/.ccyun.yml index 28adbb618..127f39179 100644 --- a/.ccyun.yml +++ b/.ccyun.yml @@ -2,6 +2,10 @@ kind: pipeline type: docker name: 确实社区前端自动化编译部署脚本 +platform: + os: linux + arch: arm64 + steps: - name: 编译 image: node -- 2.34.1 From 5e1495e71fa6653d388c41674a8b9dee07a702f9 Mon Sep 17 00:00:00 2001 From: guotao Date: Fri, 28 May 2021 09:49:21 +0800 Subject: [PATCH 20/21] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E5=A4=B4=E5=83=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 13 ++------- src/common/UrlTool.js | 8 +++++- src/common/components/comment/CommentItem.js | 2 +- src/forge/Activity/ActivityItem.js | 2 +- src/forge/Component/AddMember.jsx | 2 +- src/forge/Component/Cards.jsx | 2 +- src/forge/Component/Contributors.jsx | 4 +-- src/forge/Component/MemberCards.jsx | 2 +- src/forge/Component/SearchUser.jsx | 2 +- src/forge/Head/Header.js | 4 +-- src/forge/Main/CoderDepot.jsx | 2 +- src/forge/Main/CoderRootCommit.js | 4 +-- src/forge/Main/Diff.jsx | 2 +- src/forge/Main/Index.js | 2 +- src/forge/Main/IndexItem.js | 3 +- src/forge/Main/sub/Contribute.jsx | 2 +- src/forge/Merge/Commits.jsx | 2 +- src/forge/Merge/MergeItem.js | 2 +- src/forge/Merge/MergeSubmit.js | 2 +- src/forge/Merge/MessageCount.js | 2 +- src/forge/Newfile/UserSubmitComponent.js | 2 +- src/forge/Order/Detail.js | 2 +- src/forge/Settings/CollaboratorMember.jsx | 2 +- src/forge/Source/Index.jsx | 2 +- src/forge/Team/Group/GroupDetailProject.jsx | 2 +- .../Team/Group/Setting/GroupMemberSetting.jsx | 2 +- src/forge/Team/RightBox.jsx | 2 +- src/forge/Team/Setting/TeamSettingCommon.jsx | 2 +- src/forge/Team/Setting/TeamSettingMember.jsx | 2 +- src/forge/Team/TeamGroupItems.jsx | 2 +- src/forge/UsersList/fork_users.js | 2 +- src/forge/UsersList/user_list.js | 2 +- src/forge/comments/children_comments.js | 2 +- src/forge/comments/children_journals.js | 2 +- src/forge/comments/comments.js | 6 ++-- src/forge/users/Infos.js | 28 +++++++++++++++---- src/forge/users/Team-item.jsx | 2 +- src/modules/404/Shixunnopage.js | 2 +- .../Competitioncommon/CompetitionCommon.js | 4 +-- .../CompetitionContentsChart.js | 2 +- .../shixunHomework/ShixunWorkReport.js | 2 +- 41 files changed, 76 insertions(+), 62 deletions(-) diff --git a/package-lock.json b/package-lock.json index 65734943b..9472c0f5f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "educoder", + "name": "forge", "version": "0.1.0", "lockfileVersion": 1, "requires": true, @@ -870,7 +870,6 @@ "antd": { "version": "3.26.20", "resolved": "https://registry.nlark.com/antd/download/antd-3.26.20.tgz", - "integrity": "sha1-8/Vw76qllQoUSULyHrKqqgiOlAc=", "requires": { "@ant-design/create-react-context": "^0.2.4", "@ant-design/icons": "~2.1.1", @@ -3893,11 +3892,6 @@ "randomfill": "^1.0.3" } }, - "crypto-js": { - "version": "4.0.0", - "resolved": "https://registry.npm.taobao.org/crypto-js/download/crypto-js-4.0.0.tgz", - "integrity": "sha1-KQSrJnep0EKFai6i74DekuSjbcw=" - }, "crypto-random-string": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", @@ -9186,8 +9180,7 @@ }, "is-mobile": { "version": "2.2.2", - "resolved": "https://registry.nlark.com/is-mobile/download/is-mobile-2.2.2.tgz", - "integrity": "sha1-9snF1Q7gElTOBec5vdg18e1OmVQ=" + "resolved": "https://registry.nlark.com/is-mobile/download/is-mobile-2.2.2.tgz" }, "is-npm": { "version": "1.0.0", @@ -14506,7 +14499,6 @@ "rc-table": { "version": "6.10.15", "resolved": "https://registry.nlark.com/rc-table/download/rc-table-6.10.15.tgz", - "integrity": "sha1-GB9McMT9dPZX7o8jGW5+sIoDZco=", "requires": { "classnames": "^2.2.5", "component-classes": "^1.2.6", @@ -15252,7 +15244,6 @@ "react-slick": { "version": "0.25.2", "resolved": "https://registry.nlark.com/react-slick/download/react-slick-0.25.2.tgz", - "integrity": "sha1-VjMbZ9R9i8/i3OtqyrHI/VvR9rw=", "requires": { "classnames": "^2.2.5", "enquire.js": "^2.1.6", diff --git a/src/common/UrlTool.js b/src/common/UrlTool.js index 6ccea6a92..c442c85f3 100644 --- a/src/common/UrlTool.js +++ b/src/common/UrlTool.js @@ -15,7 +15,13 @@ export function getImageUrl(path) { if (isDev) { return `${local}/${path}` } - return `${path}`; + var url = `${path}` + if (url.indexOf("http") > -1) { + return `${path}`; + } else { + return `/${path}`; + } + } export function getImage(path) { diff --git a/src/common/components/comment/CommentItem.js b/src/common/components/comment/CommentItem.js index e577c3bce..f0696d09d 100644 --- a/src/common/components/comment/CommentItem.js +++ b/src/common/components/comment/CommentItem.js @@ -64,7 +64,7 @@ function CommentItem({ const commentAvatar = (author) => ( ); diff --git a/src/forge/Activity/ActivityItem.js b/src/forge/Activity/ActivityItem.js index b726a4af0..0e1a7e02b 100644 --- a/src/forge/Activity/ActivityItem.js +++ b/src/forge/Activity/ActivityItem.js @@ -33,7 +33,7 @@ class ActivityItem extends Component { }

- + {item.user_name} {item.created_at && 创建于{item.created_at}} diff --git a/src/forge/Component/AddMember.jsx b/src/forge/Component/AddMember.jsx index 0548e52da..9620bcf62 100644 --- a/src/forge/Component/AddMember.jsx +++ b/src/forge/Component/AddMember.jsx @@ -42,7 +42,7 @@ function AddMember({getID,login}){ className="user_img radius" width="28" height="28" - src={getImageUrl(`/${item && item.image_url}`)} + src={getImageUrl(`${item && item.image_url}`)} alt="" /> diff --git a/src/forge/Component/Cards.jsx b/src/forge/Component/Cards.jsx index 498b375c1..45620dfb1 100644 --- a/src/forge/Component/Cards.jsx +++ b/src/forge/Component/Cards.jsx @@ -6,7 +6,7 @@ import './Component.scss'; function Cards({img , title, desc , rightBtn , src}){ return(

- {img &&
} + {img &&
}

{title} diff --git a/src/forge/Component/Contributors.jsx b/src/forge/Component/Contributors.jsx index 1e26354a5..fc4696637 100644 --- a/src/forge/Component/Contributors.jsx +++ b/src/forge/Component/Contributors.jsx @@ -52,7 +52,7 @@ function Contributors({contributors,owner,projectsId}){ - + {data.name} { @@ -146,7 +146,7 @@ function Contributors({contributors,owner,projectsId}){ return( - setVisibleFunc(true,item.login,key)}/> + setVisibleFunc(true,item.login,key)}/> ) diff --git a/src/forge/Component/MemberCards.jsx b/src/forge/Component/MemberCards.jsx index 393ddbb17..d994e61ab 100644 --- a/src/forge/Component/MemberCards.jsx +++ b/src/forge/Component/MemberCards.jsx @@ -45,7 +45,7 @@ const Div = styled.div`{ export default (({ user , img, name, time, focusStatus, is_current_user, login , successFunc }) => { return (

- +
{name} diff --git a/src/forge/Component/SearchUser.jsx b/src/forge/Component/SearchUser.jsx index 0203d24f5..97e802aae 100644 --- a/src/forge/Component/SearchUser.jsx +++ b/src/forge/Component/SearchUser.jsx @@ -44,7 +44,7 @@ export default ({ getUser })=>{ className="user_img radius" width="28" height="28" - src={getImageUrl(`/${item && item.image_url}`)} + src={getImageUrl(`${item && item.image_url}`)} alt="" /> diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index e76fc8147..d9e68b53d 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -570,7 +570,7 @@ class NewHeader extends Component { { settings && settings.nav_logo_url ? - 可控开源社区 + 可控开源社区 : 可控开源社区 } @@ -670,7 +670,7 @@ class NewHeader extends Component { :
- +