merge to 7bee6f

This commit is contained in:
caishi 2022-04-12 14:30:57 +08:00
parent eae91a7f4f
commit e8b1dcb037
1 changed files with 2 additions and 6 deletions

View File

@ -277,12 +277,8 @@ class Index extends Component {
const { current_user } = this.props;
const { projectsList , recommendList , languageList , languageId ,
<<<<<<< HEAD
isSpin, total, search, limit, page, typeList, CategoryList , category_id , recommendOriList } = this.state;
=======
isSpin, total, search, limit, page, typeList, categoryList ,
recommendOriList , CategoryList , category_id } = this.state;
>>>>>>> 721fe6679 (explore/all 筛选)
const setting={
dots: true,
@ -300,11 +296,11 @@ class Index extends Component {
<img src={banner} width="100%" height="100%" alt=""/>
<div class="bannerBox">
<div class="subjectleft">
<span>头歌开源</span>
<span>大学开源</span>
<span>
<span>
<span class="words">让大学绽放开源之花</span>
<p class="font-13" style={{color: "rgb(204, 204, 204)"}}>Powered by Trustie</p>
<p class="font-13" style={{color: "rgb(204, 204, 204)"}}>Powered by Trustie and GitLink</p>
</span>
</span>
</div>