From 049dccd0866354b3c3b34238a472c9d0d9fd0900 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 1 Sep 2023 14:26:34 +0800
Subject: [PATCH 1/8] save

---
 package-lock.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 46e45a3dd..40436ecb6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -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": {

From 0a53c76e9c87afbc97c93c790a2ea99415491d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Fri, 8 Sep 2023 14:29:44 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E7=AE=80=E4=BB=8B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=A1=B9=E7=9B=AE=E7=AE=80=E4=BB=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/glcc/apply/editInfo.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/glcc/apply/editInfo.jsx b/src/glcc/apply/editInfo.jsx
index b9b836e43..cd037a6b6 100644
--- a/src/glcc/apply/editInfo.jsx
+++ b/src/glcc/apply/editInfo.jsx
@@ -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',

From 6ca7a3040cc6d67c1e8c9720938295802111ff4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Fri, 8 Sep 2023 14:30:26 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF?=
 =?UTF-8?q?=E6=88=AA=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Component/MemberCards.jsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/forge/Component/MemberCards.jsx b/src/forge/Component/MemberCards.jsx
index 48d90e136..a02efffb7 100644
--- a/src/forge/Component/MemberCards.jsx
+++ b/src/forge/Component/MemberCards.jsx
@@ -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;

From 51ba88809fa9a40f3b05fb50177b0120533b82c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Fri, 8 Sep 2023 14:31:46 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=88=86=E6=94=AF=E6=98=BE=E7=A4=BAtag?=
 =?UTF-8?q?=E5=8A=A0=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/MergeItem.js    | 4 ++--
 src/forge/Merge/MessageCount.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index 4c82bb392..373532f95 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -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>
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index d4a0b6fac..b12e73aae 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -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>

From 76c6e5d451c37ed137193e29b9d5f738c5bba01c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Fri, 8 Sep 2023 14:32:31 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8A=A5=E9=94=99=E8=BF=94=E5=9B=9E=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/loginRegister/Register.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/loginRegister/Register.jsx b/src/modules/loginRegister/Register.jsx
index 6c8251ae1..673ec33b9 100644
--- a/src/modules/loginRegister/Register.jsx
+++ b/src/modules/loginRegister/Register.jsx
@@ -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{

From 0ee61b17756eb2049eecc5592ab1d3d713c14b0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Mon, 11 Sep 2023 17:23:19 +0800
Subject: [PATCH 6/8] =?UTF-8?q?ccf=E4=B8=93=E5=8C=BA=E9=A6=96=E9=A1=B5-?=
 =?UTF-8?q?=E6=96=B0=E9=97=BBbanner=E5=9B=BA=E5=AE=9A=E9=AB=98=E5=AE=BD+?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=88=86=E7=B1=BB=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Information/Component/memberList.jsx      | 58 +++++++++++++++++++
 .../Information/Pages/headerPagebyCCF.jsx     | 33 +++++++----
 src/forge/Information/Pages/zoneVIP.jsx       | 55 +-----------------
 src/forge/Information/api.js                  |  3 +-
 src/forge/Information/indexZonebyCCF.scss     | 17 +++---
 5 files changed, 93 insertions(+), 73 deletions(-)
 create mode 100644 src/forge/Information/Component/memberList.jsx

diff --git a/src/forge/Information/Component/memberList.jsx b/src/forge/Information/Component/memberList.jsx
new file mode 100644
index 000000000..67faf6af4
--- /dev/null
+++ b/src/forge/Information/Component/memberList.jsx
@@ -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;
\ No newline at end of file
diff --git a/src/forge/Information/Pages/headerPagebyCCF.jsx b/src/forge/Information/Pages/headerPagebyCCF.jsx
index 43aef1d6f..ddc3f0bc4 100644
--- a/src/forge/Information/Pages/headerPagebyCCF.jsx
+++ b/src/forge/Information/Pages/headerPagebyCCF.jsx
@@ -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>
 			}
 
diff --git a/src/forge/Information/Pages/zoneVIP.jsx b/src/forge/Information/Pages/zoneVIP.jsx
index 4541c2c80..c9a37ae6a 100644
--- a/src/forge/Information/Pages/zoneVIP.jsx
+++ b/src/forge/Information/Pages/zoneVIP.jsx
@@ -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>
diff --git a/src/forge/Information/api.js b/src/forge/Information/api.js
index 80d2f30d5..0c8f02b00 100644
--- a/src/forge/Information/api.js
+++ b/src/forge/Information/api.js
@@ -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
   })
 }
 
diff --git a/src/forge/Information/indexZonebyCCF.scss b/src/forge/Information/indexZonebyCCF.scss
index 8a6874cfa..ff65cae09 100644
--- a/src/forge/Information/indexZonebyCCF.scss
+++ b/src/forge/Information/indexZonebyCCF.scss
@@ -20,19 +20,18 @@
 
         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: 585px;
+            position: relative;
+            z-index: 1;
+            object-fit: cover;
+          }
         }
       }
     }
@@ -82,7 +81,7 @@
         text-align: left;
         left: 50%;
         margin-left: -115px;
-        bottom: 20%;
+        bottom: 12%;
         position: absolute;
         display: flex !important;
         z-index: 2;

From 5bf692f3d43f1787df79ef0656ddd27f921adff1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Tue, 12 Sep 2023 09:19:03 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E4=B8=BA=E6=A0=87=E5=87=86=E7=9A=844=E6=AF=943?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Information/indexZonebyCCF.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/forge/Information/indexZonebyCCF.scss b/src/forge/Information/indexZonebyCCF.scss
index ff65cae09..15355993d 100644
--- a/src/forge/Information/indexZonebyCCF.scss
+++ b/src/forge/Information/indexZonebyCCF.scss
@@ -27,7 +27,7 @@
           }
           .newsImg{
             width: 785px;
-            height: 585px;
+            height: 590px;
             position: relative;
             z-index: 1;
             object-fit: cover;
@@ -157,7 +157,7 @@
     li {
       background-color: #fff;
       width: 385px;
-      padding: 20px !important;
+      padding: 22px 20px 19px;
       border-radius: 4px;
       margin-bottom: 25px !important;
       position: relative;

From 09c7f3bd0226c2fa037264cec7b33bce5784d957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Tue, 12 Sep 2023 09:39:35 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=AD=89=E6=AF=94?=
 =?UTF-8?q?=E6=8B=89=E4=BC=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Information/indexZonebyCCF.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/forge/Information/indexZonebyCCF.scss b/src/forge/Information/indexZonebyCCF.scss
index 15355993d..1259c54af 100644
--- a/src/forge/Information/indexZonebyCCF.scss
+++ b/src/forge/Information/indexZonebyCCF.scss
@@ -30,7 +30,6 @@
             height: 590px;
             position: relative;
             z-index: 1;
-            object-fit: cover;
           }
         }
       }