morii
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gitlink_server' of https://gitlink.org.cn/Gitlink/forgeplus-react into feature_websiteBuild

This commit is contained in:
谢思 2023-09-12 09:46:51 +08:00
parent 73bfdc3834 4913bc56a8
commit 0fb2d6b7f0
11 changed files with 108 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package-lock.json generated
View File

@ -14605,7 +14605,7 @@
},
"react-copy-to-clipboard": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.1.0.tgz",
"resolved": "https://registry.npmmirror.com/react-copy-to-clipboard/-/react-copy-to-clipboard-5.1.0.tgz",
"integrity": "sha512-k61RsNgAayIJNoy9yDsYzDe/yAZAzEbEgcz3DZMhF686LEyukcE1hzurxe85JandPUG+yTfGVFzuEw3xt8WP/A==",
"requires": {
"copy-to-clipboard": "^3.3.1",
@ -16355,7 +16355,7 @@
},
"sass-loader": {
"version": "7.3.1",
"resolved": "http://173.15.15.82:8081/repository/npm-all/sass-loader/-/sass-loader-7.3.1.tgz",
"resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-7.3.1.tgz",
"integrity": "sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==",
"dev": true,
"requires": {

4
src/forge/Component/MemberCards.jsx
View File

@ -18,6 +18,10 @@ const Name = styled.div`{
height:22px;
line-height:22px;
margin-bottom:7px;
width: 170px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}`
const Time = styled.div`{
color:#888;

58
src/forge/Information/Component/memberList.jsx Normal file
View File

@ -0,0 +1,58 @@
import React from 'react';
import { Link } from 'react-router-dom';
import { tempEnum } from '../tempInfo';
import Crown from '../img/crown.png';
import Nodata from '../../Nodata';
import nodata from '../img/nodata.png';
function Member(props) {
const { vipLists, temp } = props;
return(
<div className="vip_list">
{
vipLists.map((i,k)=>{
return(
<div className="vip_list_card">
<div className="card_title">
<img src={Crown} alt="" width="37px" style={{marginBottom:5,marginRight:5}}/>
<div>
<div>
{i.typeName}
</div>
{ temp === tempEnum.zone1 && <div className="linear_gradient">{i.typeName}</div> }
</div>
</div>
<p className="card_desc">{i.typeIntroduction}</p>
{
i.zoneMemberList && i.zoneMemberList.length > 0 ?
<ul className="card_ul">
{
i.zoneMemberList.map((j,key)=>{
return(
<li className="card_u_li">
<div className="card_u_wrap">
<Link to={`/${j.login}`} ><img src={j.imageUrl} alt="" /></Link>
<div className="card_u_info">
<div className="card_u_up"><span className="card_name task-hide">{j.name}</span>{j.memberLevel && <span className="card_tag">{j.memberLevel}</span> }</div>
<p className="card_u_down task-hide-2">{j.introduction}</p>
</div>
</div>
</li>
)
})
}
</ul>
:
(
temp === tempEnum.zone1 ? <Nodata _html="暂无数据" img={ nodata }/> : <Nodata _html="暂无数据" />
)
}
</div>
)
})
}
</div>
)
}
export default Member;

33
src/forge/Information/Pages/headerPagebyCCF.jsx
View File

@ -4,10 +4,12 @@ import { httpUrl } from '../fetch';
import { Link } from 'react-router-dom';
import shijian from '../img/shijian.png';
import xuexi from '../img/xuexiguanli.png';
import { getHomePageList, gethomePageDocList, getAllList, getNewsAllList } from '../api';
import { getHomePageList, gethomePageDocList, getAllList, getNewsAllList, getVIPLists } from '../api';
import axios from 'axios';
import Partner from '../Component/partner';
import MemberList from '../Component/memberList';
import '../indexZonebyCCF.scss';
import '../indexZone1.scss';
import "slick-carousel/slick/slick.css";
import "slick-carousel/slick/slick-theme.css";
import Slider from 'react-slick';
@ -49,11 +51,19 @@ function HeaderPageCCF(props) {
}, [id,cateId])
function getPersonList() {
getHomePageList(id).then(result => {
if (result) {
setPersonList(result.data.rows);
}
}).catch(error => { })
// 不分类
// getHomePageList(id).then(result => {
// if (result) {
// setPersonList(result.data.rows);
// }
// }).catch(error => { })
// 分类获取首页推荐的会员列表
getVIPLists(id, {isHomepage: 1}).then(response=>{
if(response){
const list = response.data.rows && response.data.rows.filter(item=>item.zoneMemberList);
setPersonList(list);
}
})
}
function getNewsList() {
@ -100,7 +110,7 @@ function HeaderPageCCF(props) {
}).catch(error => { })
}
return (
<div className="zone_box">
<div className="zone_box pb100">
{
// 新闻动态
data && data.cmsShow === 1 && newsList && newsList.length >= 0 &&
@ -115,7 +125,7 @@ function HeaderPageCCF(props) {
return (
<div className="regform" key={k}>
<div className="newsBannerBox">
<img src={i.headImg || img1} alt="" width="785px" style={{objectFit: "cover"}} onClick={()=>{window.location.href=`/zone/${deptId}/newdetail/${i.id}`}} />
<img src={i.headImg || img1} alt="" className='newsImg' onClick={()=>{window.location.href=`/zone/${deptId}/newdetail/${i.id}`}} />
</div>
</div>
)
@ -232,9 +242,10 @@ function HeaderPageCCF(props) {
{
// 核心贡献者
data && data.memberShow === 1 && personList && personList.length > 0 &&
<div className="zone_contributor">
<div className={`zone_contributor boxmain ${temp}_VIP_box`}>
<p className="in_title">{data.homepageMemberTitle}</p>
{
<MemberList vipLists={personList} temp={temp}/>
{/* {
<ul className="boxmain zone_c_lists">
{
personList.map((i, k) => {
@ -248,7 +259,7 @@ function HeaderPageCCF(props) {
})
}
</ul>
}
} */}
</div>
}

55
src/forge/Information/Pages/zoneVIP.jsx
View File

@ -7,6 +7,7 @@ import { tempConfig, tempEnum } from '../tempInfo'
import MemberApply from '../Component/memberApply';
import { getVIPLists, getAuditStatus, applyJoin } from '../api';
import nodata from '../img/nodata.png';
import MemberList from '../Component/memberList';
import '../indexZone1.scss';
@ -43,7 +44,6 @@ function ZoneVIP(props){
function getMemberStatus() {
getAuditStatus(id).then(res => {
console.log(res)
if (res && res.data && res.data.code === 200) {
setMemberStatus(res.data.data)
} else {
@ -83,58 +83,9 @@ function ZoneVIP(props){
<Spin spinning={isSpin}>
<div style={{minHeight:400}}>
{
vipLists && vipLists.length> 0 &&
<div className="vip_list">
{
vipLists.map((i,k)=>{
return(
<div className="vip_list_card">
<div className="card_title">
<img src={Crown} alt="" width="37px" style={{marginBottom:5,marginRight:5}}/>
<div>
<div>
{i.typeName}
</div>
{ temp === tempEnum.zone1 && <div className="linear_gradient">{i.typeName}</div> }
</div>
</div>
<p className="card_desc">{i.typeIntroduction}</p>
{
i.zoneMemberList && i.zoneMemberList.length > 0 ?
<ul className="card_ul">
{
i.zoneMemberList.map((j,key)=>{
return(
<li className="card_u_li">
<div className="card_u_wrap">
<Link to={`/${j.login}`} ><img src={j.imageUrl} alt="" /></Link>
<div className="card_u_info">
<div className="card_u_up"><span className="card_name task-hide">{j.name}</span>{j.memberLevel && <span className="card_tag">{j.memberLevel}</span> }</div>
<p className="card_u_down task-hide-2">{j.introduction}</p>
</div>
</div>
</li>
)
})
}
</ul>
:
(
temp === tempEnum.zone1 ? <Nodata _html="暂无数据" img={ nodata }/> : <Nodata _html="暂无数据" />
)
}
</div>
)
})
}
</div>
}
{
vipLists && vipLists.length === 0 &&
<div style={{marginTop:30,backgroundColor:"#fff",padding:"20px"}}>
vipLists && (vipLists.length > 0 ? <MemberList vipLists={vipLists} temp={temp}/> : <div style={{marginTop:30,backgroundColor:"#fff",padding:"20px"}}>
<Nodata _html={"暂无数据"}/>
</div>
</div>)
}
</div>
</Spin>

3
src/forge/Information/api.js
View File

@ -76,10 +76,11 @@ export function getProjectsTypeLists(id){
})
}
/**专区会员 */
export function getVIPLists(id){
export function getVIPLists(id, params){
return fetch({
url:`/zone/open/${id}/member/overviewList`,
method: 'get',
params
})
}

18
src/forge/Information/indexZonebyCCF.scss
View File

@ -20,19 +20,17 @@
div {
height: 100%;
.regform {
img {
position: relative;
z-index: 1;
}
}
.newsBannerBox{
height: 595px;
display: flex;
align-items: center;
align-content: center;
}
.newsImg{
width: 785px;
height: 590px;
position: relative;
z-index: 1;
}
}
}
}
@ -82,7 +80,7 @@
text-align: left;
left: 50%;
margin-left: -115px;
bottom: 20%;
bottom: 12%;
position: absolute;
display: flex !important;
z-index: 2;
@ -158,7 +156,7 @@
li {
background-color: #fff;
width: 385px;
padding: 20px !important;
padding: 22px 20px 19px;
border-radius: 4px;
margin-bottom: 25px !important;
position: relative;

4
src/forge/Merge/MergeItem.js
View File

@ -112,7 +112,7 @@ class MergeItem extends Component {
<Tag className="pr-branch-tag">
<Link
to={`/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`}
className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}}
className="maxW200px task-hide ver-middle" style={{maxWidth:"300px"}}
>
{item.is_original
? item.fork_project_user_name
@ -136,7 +136,7 @@ class MergeItem extends Component {
<Tag className="pr-branch-tag">
<Link
to={`/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`}
className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}}
className="maxW200px task-hide ver-middle" style={{maxWidth:"300px"}}
>
{project_author_name}: {item.pull_request_base}
</Link>

4
src/forge/Merge/MessageCount.js
View File

@ -406,7 +406,7 @@ class MessageCount extends Component {
<Tag className="pr-branch-tag">
<Link
to={`/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`}
className="ver-middle task-hide" style={{maxWidth:"200px"}} title={`${data.pull_request.fork_project_user}: ${data.pull_request && data.pull_request.head}`}
className="ver-middle task-hide" style={{maxWidth:"300px"}} title={`${data.pull_request.fork_project_user}: ${data.pull_request && data.pull_request.head}`}
>
{data.pull_request && data.pull_request.fork_project_user}: {data.pull_request && data.pull_request.head}
</Link>
@ -421,7 +421,7 @@ class MessageCount extends Component {
<Tag className="pr-branch-tag">
<Link
to={`/${owner}/${projectsId}/tree/${data.pull_request.base}`}
className="ver-middle task-hide" style={{maxWidth:"200px"}} title={`${data.issue.project_author_name}:${data.pull_request.base}`}
className="ver-middle task-hide" style={{maxWidth:"300px"}} title={`${data.issue.project_author_name}:${data.pull_request.base}`}
>
{data.issue.project_author}: {data.pull_request.base}
</Link>

6
src/glcc/apply/editInfo.jsx
View File

@ -242,12 +242,12 @@ function EditRepoApplyInfo(props) {
{ pattern: emailreg, message: "请输入正确的邮箱地址"},],
<Input placeholder="输入项目联系人邮箱" onBlur={()=>{verify("name")}}/>
)}
<div className='introArea'>{helper('社区简介',
<div className='introArea'>{helper('项目简介',
'',
'projectIntro',
[{ required: true, message: "请输入社区简介" },
[{ required: true, message: "请输入项目简介" },
{ max: 200, message: '超出限制长度200位字符，请重新编辑' }],
<TextArea placeholder="请输入社区简介" onBlur={()=>{verify("intro")}} rows={4}/>
<TextArea placeholder="请输入项目简介" onBlur={()=>{verify("intro")}} rows={4}/>
)}</div>
<div className='introArea'>{helper('项目logo',
'限制上传格式为：png、jpg、jpeg，限制20M。建议上传大小为382*228',

3
src/modules/loginRegister/Register.jsx
View File

@ -103,7 +103,8 @@ function Register(props){
callback();
}else{
setGetCaptchaBut(false);
callback(response.data.status === -2 ? `该${registerType ? '邮箱' : '手机号'}已被注册` : response.data.message);
// callback(response.data.status === -2 ? `该${registerType ? '邮箱' : '手机号'}已被注册` : response.data.message);
callback(response.data.message);
}
}):callback();setEmailStr(undefined);
}else{