v1.0 issue

This commit is contained in:
caishi 2023-04-26 16:36:24 +08:00
parent 3cc4db141e
commit 58c25a1d47
6 changed files with 25 additions and 19 deletions

View File

@ -5,7 +5,7 @@ export default (({ name , icon , count , bottom , children , url })=>{
return(
<div className="box">
<div className="head">
<span className="font-18">{icon}{name}{count && `(${count})`}</span>
<span className="font-17">{icon}{name}{count && `(${count})`}</span>
{ url && <Link to={url} style={{color:"rgba(31, 35, 41, 1)"}}>更多<i className="iconfont icon-youjiantou font-12 ml3"></i></Link>}
</div>
<div className="content">

View File

@ -37,6 +37,7 @@
font-size:15px;
line-height:26px;
height: 52px;
word-break: break-all;
}
}
}
@ -94,7 +95,7 @@
padding-top: 40px;
.list-l{
background-color: #fff;
background-image: url('./images/left-bc.png');
// background-image: url('./images/left-bc.png');
background-size: 100%;
max-width: 860px;
width: 72%;
@ -132,24 +133,24 @@
text-align: center;
margin:30px auto 20px;
.ant-radio-group{
box-shadow:0px 0px 10px rgba(30, 47, 162, 0.09);
.ant-radio-button-wrapper{
height: 44px;
line-height: 42px;
border:none;
background-color: #fff;
line-height: 34px;
border:1px solid #cccfd2;
&:first-child{
padding:3px 0px 3px 3px;
border-right: none;
}
&:last-child{
padding:3px 3px 3px 0px;
border-left: none;
}
span{
background-color:rgba(30, 47, 162, 0.09) ;
display: block;
}
}
.ant-radio-button-wrapper-checked{
background-color:#466aff;
border-color:#466aff;
color: #fff;
}
}
@ -201,6 +202,8 @@
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
word-break: break-all;
line-height: 22px;
}
&:last-child{
border-bottom: none;;
@ -212,7 +215,7 @@
width: 28%;
max-width: 338px;
padding-left:30px;
margin-bottom: 30px;
padding-bottom: 30px;
box-sizing: border-box;
}
.box{

View File

@ -153,6 +153,7 @@ function List(props){
btn={
<span><i className="iconfont icon-zidingyi font-14 mr5"></i>自定义</span>
}
typeFlag={true}
userLogin={OIdentifier}
type="organizations"
current={organizeDetail.is_admin}

View File

@ -12,15 +12,17 @@ import CheckProfile from '../Component/ProfileModal/Profile';
const Span = styled.span`{
color:#888;
font-size:12px;
font-size:14px;
margin-right:10px;
height:20px;
line-height:20px;
}`
const Align = styled.div`{
display:flex;
aligin:center;
}`
const ListName = styled.div`{
font-size:14px;
font-size:15px;
color:#333;
margin-bottom:8px;
height:18px;
@ -28,7 +30,7 @@ const ListName = styled.div`{
}`;
const ColorListName = styled.div`{
color:rgba(31, 35, 41, 1);
font-size:14px;
font-size:15px;
margin-bottom:8px;
height:18px;
line-height:18px;
@ -61,7 +63,7 @@ function RightBox({ OIdentifier , history , admin , showCompeleteDialog ,complet
arr.push({name:item,percent:languages[item].replace("%",""),color:getColor()});
})
setLanguageData(arr);
console.log(result.data);
console.log(arr);
}
}).catch(error=>{})
}
@ -94,7 +96,7 @@ function RightBox({ OIdentifier , history , admin , showCompeleteDialog ,complet
return(
<div className="list-r">
{
languageData ?
languageData && languageData.length>0 ?
<Box
name="仓库语言"
// count={languageData && languageData.length}

View File

@ -158,7 +158,6 @@ function ConcentrateBox({ visible , onCancel , onSure , type , username , choose
}
{
list && list.length > 0 && list.map((i,k)=>{
console.log(i);
let c = copyList && copyList.length >0 && copyList.filter(j=>j.id === i.id).length !== 0;
return(
!c && <Checkbox value={i.id} disabled={disable && (value.filter(j=>j === i.id).length===0)}>{i.author && `${i.author.name}/`}{i.name}</Checkbox>
@ -174,7 +173,7 @@ function ConcentrateBox({ visible , onCancel , onSure , type , username , choose
<CheckProfile
showCompeleteDialog={showCompeleteDialog}
completeProfile={completeProfile}
sureFunc={()=>{history.push(`/projects/deposit/new`)}}
sureFunc={()=>{history.push(`/projects/deposit/new${type ? `/${username}`:""}`)}}
className="color-blue">新建项目</CheckProfile>
</div>
}

View File

@ -13,6 +13,7 @@ function ConcentrateProject({
history,
type,
title,
typeFlag,
btn
}) {
const [ list , setList ] = useState(undefined);
@ -71,7 +72,7 @@ function ConcentrateProject({
{
title || <span className="font-18">精选项目</span>
}
{ current &&
{ (current && ((btn && list && list.length > 0) || !btn)) &&
<a className="color-blue" onClick={()=>setVisible(true)}>
{btn || "自定义精选项目"}
</a>
@ -85,14 +86,14 @@ function ConcentrateProject({
list.map((i,k)=>{
return(
<li key={i.id}>
<Link to={`/${i.author && i.author.login}/${i.identifier}`} className="name">{i.name}</Link>
<Link to={`/${i.author && i.author.login}/${i.identifier}`} className="name task-hide">{i.name}</Link>
<p className="task-hide desc">{i.description}</p>
{/* 项目标签 */}
{i.topics && <div className='viewProListTopics mt10'>
{i.topics.map(item=><Link to={`/explore/topic/${item.id}/${encodeURIComponent(item.name)}`} className='viewProListTopic mr15 font-13 task-hide'>{item.name}</Link>)}
</div>}
<AlignCenter>
{ i.category && <span className="tagName">{i.category.name}</span> }
{ i.category && !typeFlag && <span className="tagName">{i.category.name}</span> }
<span className="pariseCount ml2"><i className="iconfont icon-xingzhuang"></i>{i.watchers_count}</span>
<span className="forkCount"><i className="iconfont icon-morenfuke_icon1"></i>{i.forked_count}</span>
</AlignCenter>