From 9ade437a76462102008f131b9ac57113fc3117ab Mon Sep 17 00:00:00 2001 From: Zgna <1258430687@qq.com> Date: Mon, 18 Sep 2023 16:16:37 +0800 Subject: [PATCH 01/19] =?UTF-8?q?CCF=E6=96=B0=E9=97=BB=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E9=AB=98=E4=BA=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Information/Pages/headerPagebyCCF.jsx | 34 ++++++++++--------- src/forge/Information/indexZonebyCCF.scss | 3 ++ 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/forge/Information/Pages/headerPagebyCCF.jsx b/src/forge/Information/Pages/headerPagebyCCF.jsx index 0b290100..a6abe47a 100644 --- a/src/forge/Information/Pages/headerPagebyCCF.jsx +++ b/src/forge/Information/Pages/headerPagebyCCF.jsx @@ -14,20 +14,6 @@ import Slider from 'react-slick'; import Left from '../../../home/Img/left.png'; import Right from '../../../home/Img/right.png'; -const setting = { - dots: true, - infinite: true, - speed: 2000, - slidesToShow: 1, - slidesToScroll: 1, - pauseOnDotsHover: true, - autoplaySpeed: 5000, - pauseOnFocus: true, - autoplay: true, - arrows: true, - prevArrow: , - nextArrow: -} function HeaderPageCCF(props) { const [projectList, setProjectList] = useState(undefined); @@ -37,6 +23,22 @@ function HeaderPageCCF(props) { const { deptId, cateId } = props.match.params; const { data, id, temp } = props; const [mainList, setMainList] = useState(undefined); + const [tag,setTag] = useState(0); + const setting = { + dots: true, + infinite: true, + speed: 2000, + slidesToShow: 1, + slidesToScroll: 1, + pauseOnDotsHover: true, + autoplaySpeed: 5000, + pauseOnFocus: true, + autoplay: true, + arrows: true, + prevArrow: , + nextArrow: , + afterChange: (index)=> setTag(index) + } useEffect(() => { if (id||cateId) { @@ -128,7 +130,7 @@ function HeaderPageCCF(props) { newsList.map((i, k) => { return (
  • - {i.name} + {i.name}

    @@ -153,7 +155,7 @@ function HeaderPageCCF(props) {

    {i.name} - {window.location.href=`/zone/${deptId}/news/${i.id}`}}>

    +

    { i.cmsDocList && i.cmsDocList.length > 0 ? i.cmsDocList.map((j, k) => { diff --git a/src/forge/Information/indexZonebyCCF.scss b/src/forge/Information/indexZonebyCCF.scss index d100e33d..4a43793f 100644 --- a/src/forge/Information/indexZonebyCCF.scss +++ b/src/forge/Information/indexZonebyCCF.scss @@ -174,6 +174,9 @@ display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; + &:hover{ + color:#466aff !important; + } } } From 5ef4d6aef618223bf496bb6a80afbb9a7d93c740 Mon Sep 17 00:00:00 2001 From: Zgna <1258430687@qq.com> Date: Mon, 18 Sep 2023 16:26:41 +0800 Subject: [PATCH 02/19] =?UTF-8?q?CCF=E6=96=B0=E9=97=BB=E9=AB=98=E4=BA=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Information/Pages/headerPagebyCCF.jsx | 2 +- src/forge/Information/indexZonebyCCF.scss | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/forge/Information/Pages/headerPagebyCCF.jsx b/src/forge/Information/Pages/headerPagebyCCF.jsx index a6abe47a..896194f5 100644 --- a/src/forge/Information/Pages/headerPagebyCCF.jsx +++ b/src/forge/Information/Pages/headerPagebyCCF.jsx @@ -130,7 +130,7 @@ function HeaderPageCCF(props) { newsList.map((i, k) => { return (
  • - {i.name} + {i.name}

    diff --git a/src/forge/Information/indexZonebyCCF.scss b/src/forge/Information/indexZonebyCCF.scss index 4a43793f..d100e33d 100644 --- a/src/forge/Information/indexZonebyCCF.scss +++ b/src/forge/Information/indexZonebyCCF.scss @@ -174,9 +174,6 @@ display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; - &:hover{ - color:#466aff !important; - } } } From a67ea1731c3464ee7e9ea1c4de7c891948ecec3f Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 21 Sep 2023 17:16:50 +0800 Subject: [PATCH 03/19] post method --- src/forge/Information/Pages/apply.jsx | 7 ------ src/forge/Information/Pages/selfList.jsx | 27 ++++++++++++++++++------ src/forge/Information/api.js | 2 ++ 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/forge/Information/Pages/apply.jsx b/src/forge/Information/Pages/apply.jsx index 2c07bb12..89e674ed 100644 --- a/src/forge/Information/Pages/apply.jsx +++ b/src/forge/Information/Pages/apply.jsx @@ -39,13 +39,6 @@ console.log(props); callback(); } - - // function checkIndentity(rule, value, callback){ - // if(value && !idenReg.test(value)){ - // callback("专区标识长度2-20，只能以字母开头结尾，可包含数字、下划线、中划线"); - // } - // callback(); - // } return(

    diff --git a/src/forge/Information/Pages/selfList.jsx b/src/forge/Information/Pages/selfList.jsx index dbce4ccd..f6b9312a 100644 --- a/src/forge/Information/Pages/selfList.jsx +++ b/src/forge/Information/Pages/selfList.jsx @@ -25,14 +25,27 @@ function SelfList(props){ useEffect(()=>{ if(id){ setIsSpin(true); - if(source===true){ - getSource(); - } - if(source===false){ - getNew(); - } + getFunc(source); } - },[status, page , id,source]) + },[id,source,page]) + + function getFunc(s){ + if(s===true){ + getSource(); + } + if(s===false){ + getNew(); + } + } + + useEffect(()=>{ + if(page===1){ + setIsSpin(true); + getFunc(source); + }else{ + setPage(1); + } + },[status]) useEffect(()=>{ diff --git a/src/forge/Information/api.js b/src/forge/Information/api.js index 2496268c..1dcdea4d 100644 --- a/src/forge/Information/api.js +++ b/src/forge/Information/api.js @@ -172,6 +172,8 @@ export function delSourceMyList(id){ export function postCreateZone(data) { return fetch({ url: `/zone/application`, + method: 'post', + data: data }) } From 479534c49fe00589836877797e307fe3cd2a3678 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 21 Sep 2023 17:32:48 +0800 Subject: [PATCH 04/19] btn color --- src/forge/Information/Pages/selfList.jsx | 20 ++++++++++---------- src/forge/Information/index.scss | 4 ++++ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/forge/Information/Pages/selfList.jsx b/src/forge/Information/Pages/selfList.jsx index f6b9312a..54e1a6b3 100644 --- a/src/forge/Information/Pages/selfList.jsx +++ b/src/forge/Information/Pages/selfList.jsx @@ -29,14 +29,6 @@ function SelfList(props){ } },[id,source,page]) - function getFunc(s){ - if(s===true){ - getSource(); - } - if(s===false){ - getNew(); - } - } useEffect(()=>{ if(page===1){ @@ -47,6 +39,14 @@ function SelfList(props){ } },[status]) + function getFunc(s){ + if(s===true){ + getSource(); + } + if(s===false){ + getNew(); + } + } useEffect(()=>{ if(pathname){ @@ -126,8 +126,8 @@ function SelfList(props){
    - - + +
    diff --git a/src/forge/Information/index.scss b/src/forge/Information/index.scss index ef5c0f61..b7fa790e 100644 --- a/src/forge/Information/index.scss +++ b/src/forge/Information/index.scss @@ -1723,6 +1723,10 @@ .ant-btn{ width: 95px; margin:0px 20px; + &.ant-btn-primary{ + color: var(--primary-color); + border-color: var(--primary-color); + } } } } From 4fbd69ba1abea6d41675401611a0a21fcaec6578 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 22 Sep 2023 09:35:29 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E8=BF=9B?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=88=9B=E5=BB=BA=E5=85=A5=E5=8F=A3=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E8=87=B3403?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Information/Pages/apply.jsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/forge/Information/Pages/apply.jsx b/src/forge/Information/Pages/apply.jsx index 89e674ed..52986e51 100644 --- a/src/forge/Information/Pages/apply.jsx +++ b/src/forge/Information/Pages/apply.jsx @@ -6,13 +6,18 @@ const { TextArea } = Input; const phonereg = /^([1][3456789])\d{9}$/ function Apply(props){ - const { form } = props; + const { form , current_user } = props; const { getFieldDecorator , validateFields } = form; -console.log(props); useEffect(()=>{ document.title = '申请创建专区'; },[]) + useEffect(()=>{ + if(!(current_user && current_user.login)){ + props.history.push("/403"); + } + },[current_user]) + function submitFunc(){ validateFields((error,values)=>{ if(!error){ From 321437e8c046bf69f438b33ae356ad0bcc3dd775 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 22 Sep 2023 10:14:15 +0800 Subject: [PATCH 06/19] =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=97=B6=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Information/Pages/apply.jsx | 5 +++++ src/forge/Information/fetch.js | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/forge/Information/Pages/apply.jsx b/src/forge/Information/Pages/apply.jsx index 52986e51..f38773e8 100644 --- a/src/forge/Information/Pages/apply.jsx +++ b/src/forge/Information/Pages/apply.jsx @@ -2,6 +2,7 @@ import React, { useEffect } from 'react'; import { Form , Input , Row , Col, Button } from 'antd'; import '../index.scss'; import { postCreateZone } from '../api'; +import cookie from 'react-cookies'; const { TextArea } = Input; const phonereg = /^([1][3456789])\d{9}$/ @@ -19,6 +20,10 @@ function Apply(props){ },[current_user]) function submitFunc(){ + console.log(window.location.port !== "3007",window.location.port); + if(window.location.port !== "3007" && !cookie.load("autologin_trustie")){ + props.history.push("/403"); + } validateFields((error,values)=>{ if(!error){ const zoneApplication = {...values}; diff --git a/src/forge/Information/fetch.js b/src/forge/Information/fetch.js index ddb0df2b..29cc15d2 100644 --- a/src/forge/Information/fetch.js +++ b/src/forge/Information/fetch.js @@ -7,7 +7,6 @@ function beforeFetch(actionUrl){ } const service = axios.create({ - headers:{Authorization:"0cd46d63363af9205eb7ccecff574309ce069a97"}, baseURL: actionUrl, timeout: 1800000, // 请求超时时间 }); From a51f0625a68ce81eb710231b6d431bcc5b435a37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 22 Sep 2023 10:35:38 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E5=BB=BA=E7=AB=99=E7=9B=B8=E5=85=B3=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/SecuritySetting/Index.jsx | 4 ++-- src/forge/Server/List.jsx | 4 ++-- src/forge/users/Material/Index.jsx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/forge/SecuritySetting/Index.jsx b/src/forge/SecuritySetting/Index.jsx index d88cd370..4a76ded8 100644 --- a/src/forge/SecuritySetting/Index.jsx +++ b/src/forge/SecuritySetting/Index.jsx @@ -158,10 +158,10 @@ function Index(props){
  • 我的Bot
  • Bot安装
    • - */} diff --git a/src/forge/Server/List.jsx b/src/forge/Server/List.jsx index 14677090..c83c00e4 100644 --- a/src/forge/Server/List.jsx +++ b/src/forge/Server/List.jsx @@ -64,7 +64,7 @@ function Main(props){ 查看详情 */} - {projectDetail && projectDetail.author.type === "User" &&
  • + {/* {projectDetail && projectDetail.author.type === "User" &&
  • 个人建站服务 @@ -73,7 +73,7 @@ function Main(props){ 查看详情 -
    • } + } */} ) diff --git a/src/forge/users/Material/Index.jsx b/src/forge/users/Material/Index.jsx index c1503684..1cf63196 100644 --- a/src/forge/users/Material/Index.jsx +++ b/src/forge/users/Material/Index.jsx @@ -55,7 +55,7 @@ function Index(props){ {props.history.push('/settings/phone')}}>手机号管理 {props.history.push('/settings/emails')}}>邮箱管理 {props.history.push('/settings/password')}}>密码管理 - {props.history.push('/settings/verification')}}>实名认证 + {/* {props.history.push('/settings/verification')}}>实名认证 */} {props.history.push('/settings/cancel')}}>账号注销 } From 13c27554abc9d34b4a5a329d90409774ce4c88c6 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 22 Sep 2023 10:44:50 +0800 Subject: [PATCH 08/19] build --- src/forge/Information/Pages/apply.jsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/forge/Information/Pages/apply.jsx b/src/forge/Information/Pages/apply.jsx index f38773e8..77851a71 100644 --- a/src/forge/Information/Pages/apply.jsx +++ b/src/forge/Information/Pages/apply.jsx @@ -20,10 +20,6 @@ function Apply(props){ },[current_user]) function submitFunc(){ - console.log(window.location.port !== "3007",window.location.port); - if(window.location.port !== "3007" && !cookie.load("autologin_trustie")){ - props.history.push("/403"); - } validateFields((error,values)=>{ if(!error){ const zoneApplication = {...values}; @@ -32,7 +28,7 @@ function Apply(props){ props.showNotification("提交成功！"); setTimeout(() => { window.location.href="/"; - }, 200); + }, 100); } }).catch(error=>{}) } From 16781d81d3616c1fd9b4c6452378a0e0e984ca34 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 22 Sep 2023 10:49:46 +0800 Subject: [PATCH 09/19] =?UTF-8?q?=E6=97=A0=E6=95=B0=E6=8D=AE=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Information/Pages/selfList.jsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/forge/Information/Pages/selfList.jsx b/src/forge/Information/Pages/selfList.jsx index 54e1a6b3..ab69589d 100644 --- a/src/forge/Information/Pages/selfList.jsx +++ b/src/forge/Information/Pages/selfList.jsx @@ -4,6 +4,8 @@ import { Link } from 'react-router-dom'; import { getNewsMyList , getSourceMyList , delNewsMyList , delSourceMyList } from '../api'; import moment from 'moment'; import nodata from '../img/nodata.png'; +import { tempEnum } from '../tempInfo'; +import emptydata from '../../Images/nodata.png'; import '../index.scss'; @@ -131,7 +133,7 @@ function SelfList(props){ - {source ? "资源发布": temp==="zone1" ? "新闻资讯":"领域资讯"} + {source ? "资源发布": temp === tempEnum.zone1 ? "新闻资讯":"领域资讯"} 我的{source ? "资源":"文章"} { !IsPC() && } diff --git a/src/forge/Information/Pages/sourceCreate.jsx b/src/forge/Information/Pages/sourceCreate.jsx index 526df0e1..14c63033 100644 --- a/src/forge/Information/Pages/sourceCreate.jsx +++ b/src/forge/Information/Pages/sourceCreate.jsx @@ -68,7 +68,7 @@ function SourceCreate(props){ }).catch(error=>{}) } - // 新建文章 + // 新建/编辑资源 function submit(e){ e.preventDefault(); validateFields((err, fieldsValue)=>{ @@ -89,21 +89,21 @@ function SourceCreate(props){ updateMyResource(params).then((res)=>{ const {data:{code, msg}} = res; if(code === 200){ - message.success("编辑成功"); - history.push(`/zone/${deptId}/source/self`); + message.success("提交成功"); + history.push(`/zone/${deptId}/source/${sourceid}`); }else{ - message.error(msg || '编辑失败，请联系管理员！') + message.error(msg || '提交失败，请联系管理员！') } }) return; } addResource(params).then((res)=>{ - const {data:{code, msg}} = res; + const {data:{code, msg, data}} = res; if(code === 200){ - message.success("新增成功"); - history.push(`/zone/${deptId}/source/self`); + message.success("提交成功"); + history.push(`/zone/${deptId}/source/${data.id}`); }else{ - message.error(msg || '新增失败，请联系管理员！') + message.error(msg || '提交失败，请联系管理员！') } }) }) @@ -203,8 +203,8 @@ function SourceCreate(props){ {getFieldDecorator("fileList", { rules:[{ required:true,message:"请上传资源附件！" }] })( - - diff --git a/src/forge/Information/Pages/sourceDetail.jsx b/src/forge/Information/Pages/sourceDetail.jsx index cd50906f..eae707ff 100644 --- a/src/forge/Information/Pages/sourceDetail.jsx +++ b/src/forge/Information/Pages/sourceDetail.jsx @@ -1,11 +1,8 @@ import React , { useEffect , useState } from 'react'; -import { Breadcrumb } from 'antd'; +import { Badge, Breadcrumb } from 'antd'; import SourceFile from '../img/sourceFile.png'; -import RenderHtml from '../../../components/render-html'; import { getSourceDetail } from '../api'; import { Link } from 'react-router-dom'; -import axios from 'axios'; -import { Base64 } from 'js-base64'; import { httpUrl } from '../fetch'; import { AlignCenter, FlexAJ } from '../../Component/layout'; import SourceIcon from '../img/sourceIcon.png'; @@ -16,6 +13,7 @@ function SourceDetail(props){ const { deptId , sourceid } = props.match.params; const [ detail , setDetail ] = useState(undefined); const zonedetail = props.data; + const {temp} = props; useEffect(()=>{ if(sourceid){ @@ -69,7 +67,9 @@ function SourceDetail(props){ {detail.createUser && detail.createUser.avatar && } {detail.createUser && {detail.createUser.nickName}} - 发布于{detail.updateTime || detail.createTime} + 发布于{detail.updateTime || detail.createTime} + {detail.auditStatus === '0' && } + {detail.auditStatus === '2' && }
    {detail.summary}
    { diff --git a/src/forge/Information/fetch.js b/src/forge/Information/fetch.js index ddb0df2b..29cc15d2 100644 --- a/src/forge/Information/fetch.js +++ b/src/forge/Information/fetch.js @@ -7,7 +7,6 @@ function beforeFetch(actionUrl){ } const service = axios.create({ - headers:{Authorization:"0cd46d63363af9205eb7ccecff574309ce069a97"}, baseURL: actionUrl, timeout: 1800000, // 请求超时时间 }); diff --git a/src/forge/Information/index.scss b/src/forge/Information/index.scss index ef5c0f61..78db4134 100644 --- a/src/forge/Information/index.scss +++ b/src/forge/Information/index.scss @@ -28,6 +28,12 @@ background-color: var(--primary-color); } } +.hoverThemeColorBut{ + &:hover, &:active, &:focus{ + border-color: var(--light-color); + color: var(--light-color); + } +} .information_main{ background-color:#f3f5f8; @@ -1547,7 +1553,7 @@ button{ border-color: var(--primary-color); color: var(--primary-color); - &:hover{ + &:hover, &:active, &:focus{ border-color: var(--light-color); color: var(--light-color); } @@ -1562,6 +1568,12 @@ padding: 30px 35px 50px; } } +.editNewsMd .editormd-dialog-header{ + padding: 5px 20px; +} +.editNewsMd .number-input{ + width: 60px !important; +} // 新增资源 .sourceCreateBox{ .sourceFilesBox{ @@ -1580,6 +1592,13 @@ color: var(--primary-color)!important; } +.failed .ant-badge-status-text{ + color: #eb1212; +} +.pass .ant-badge-status-text{ + color: var(--primary-color); +} + // --------------新建专区 .applyBox{ background-color: #fff; From 0b0dcb9eda25e647cfe4255f4277aed604eef7b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 22 Sep 2023 11:40:06 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Information/Pages/newsDetail.jsx | 2 +- src/forge/Information/index.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/forge/Information/Pages/newsDetail.jsx b/src/forge/Information/Pages/newsDetail.jsx index 3947f4cb..e625080b 100644 --- a/src/forge/Information/Pages/newsDetail.jsx +++ b/src/forge/Information/Pages/newsDetail.jsx @@ -107,7 +107,7 @@ function NewsDetail(props){
      { cmsDir &&
    • { detail.publishUserNickname }
      • } { cmsDir &&
    • { detail.isFirstPublish ? '创建于' : '更新于' }{detail.publishTime}
      • } - { detail.visits &&
    • {detail.visits}
      • } + { !!detail.visits &&
    • {detail.visits}
      • } { detail.auditStatus === '2' &&
      • } { detail.auditStatus === '0' &&
      • }
    diff --git a/src/forge/Information/index.scss b/src/forge/Information/index.scss index 3c259b20..6ba07f0f 100644 --- a/src/forge/Information/index.scss +++ b/src/forge/Information/index.scss @@ -574,7 +574,7 @@ align-items: center; height: 20px; overflow: visible; - color: #466aff; + color: var(--primary-color); } .headimg { width: 26px; From efe0abf196b4f805a5891fd8cf1c4b144fe49afa Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 22 Sep 2023 11:52:41 +0800 Subject: [PATCH 12/19] =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Information/Pages/apply.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Information/Pages/apply.jsx b/src/forge/Information/Pages/apply.jsx index 77851a71..9f3515ea 100644 --- a/src/forge/Information/Pages/apply.jsx +++ b/src/forge/Information/Pages/apply.jsx @@ -28,7 +28,7 @@ function Apply(props){ props.showNotification("提交成功！"); setTimeout(() => { window.location.href="/"; - }, 100); + }, 70); } }).catch(error=>{}) } From 57f5e6e569e3e316bd75fd74b13efea7a7ca6911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 22 Sep 2023 15:20:26 +0800 Subject: [PATCH 13/19] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=BB=BA=E7=AB=99?= =?UTF-8?q?=E5=85=A5=E5=8F=A3=E6=94=BE=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/SecuritySetting/Index.jsx | 4 ++-- src/forge/Server/List.jsx | 4 ++-- src/forge/users/Material/Index.jsx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/forge/SecuritySetting/Index.jsx b/src/forge/SecuritySetting/Index.jsx index 4a76ded8..d88cd370 100644 --- a/src/forge/SecuritySetting/Index.jsx +++ b/src/forge/SecuritySetting/Index.jsx @@ -158,10 +158,10 @@ function Index(props){
  • 我的Bot
  • Bot安装
    • - {/*
      +
      • 个人建站
      • 我的站点
        • -
      */} +
    diff --git a/src/forge/Server/List.jsx b/src/forge/Server/List.jsx index c83c00e4..14677090 100644 --- a/src/forge/Server/List.jsx +++ b/src/forge/Server/List.jsx @@ -64,7 +64,7 @@ function Main(props){ 查看详情 */} - {/* {projectDetail && projectDetail.author.type === "User" &&
  • + {projectDetail && projectDetail.author.type === "User" &&
  • 个人建站服务 @@ -73,7 +73,7 @@ function Main(props){ 查看详情 -
    • } */} + } ) diff --git a/src/forge/users/Material/Index.jsx b/src/forge/users/Material/Index.jsx index 1cf63196..c1503684 100644 --- a/src/forge/users/Material/Index.jsx +++ b/src/forge/users/Material/Index.jsx @@ -55,7 +55,7 @@ function Index(props){ {props.history.push('/settings/phone')}}>手机号管理 {props.history.push('/settings/emails')}}>邮箱管理 {props.history.push('/settings/password')}}>密码管理 - {/* {props.history.push('/settings/verification')}}>实名认证 */} + {props.history.push('/settings/verification')}}>实名认证 {props.history.push('/settings/cancel')}}>账号注销 } From 58cb847a13c2b11cf3021af5d7f56ca13af3f3d4 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 22 Sep 2023 15:33:46 +0800 Subject: [PATCH 14/19] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8F=90=E7=A4=BA-?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=9C=80=E8=A6=81=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Information/Pages/selfList.jsx | 7 +++---- src/forge/Information/fetch.js | 1 + src/forge/Information/index.jsx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/forge/Information/Pages/selfList.jsx b/src/forge/Information/Pages/selfList.jsx index ab69589d..9f87a96d 100644 --- a/src/forge/Information/Pages/selfList.jsx +++ b/src/forge/Information/Pages/selfList.jsx @@ -21,7 +21,7 @@ function SelfList(props){ const [ deleId , setDeleId] = useState(undefined); const pathname = props.location.pathname; const { deptId} = props.match.params; - const { id , temp } = props; + const { id , temp , data } = props; const limit = 15; useEffect(()=>{ @@ -100,8 +100,7 @@ function SelfList(props){ delNewsMyList(deleId).then(response=>{ setVisible(false); if(status ===1){ - props.history.push(`/zone/${deptId}/newdetail/${deleId}`); - props.showNotification("已提交删除申请，待管理员审核通过后改文章将被删除"); + props.showNotification("提交成功！"); }else{ props.showNotification("删除成功！"); getNew(); @@ -124,7 +123,7 @@ function SelfList(props){

    确定删除该{source?"资源":"文章"}?

    - {(source || (!source && status === 1)) &&

    {source?"删除后所有资源文件将被清除，请谨慎操作":"此操作将提交删除申请，管理员同意申请后该文章将被删除"}

    } + {(source || (!source && status === 1 && (data && data.docNeedAudit===1))) &&

    {source?"删除后所有资源文件将被清除，请谨慎操作":"此操作将提交删除申请，管理员同意申请后该文章将被删除"}

    }
    diff --git a/src/forge/Information/fetch.js b/src/forge/Information/fetch.js index 29cc15d2..c9057bca 100644 --- a/src/forge/Information/fetch.js +++ b/src/forge/Information/fetch.js @@ -7,6 +7,7 @@ function beforeFetch(actionUrl){ } const service = axios.create({ + headers:{Authorization:"fb55fcaae60bb0c341078dade4b37c965e285394"}, baseURL: actionUrl, timeout: 1800000, // 请求超时时间 }); diff --git a/src/forge/Information/index.jsx b/src/forge/Information/index.jsx index e8b70855..e82f0c35 100644 --- a/src/forge/Information/index.jsx +++ b/src/forge/Information/index.jsx @@ -159,7 +159,7 @@ function Index(props){ ( - + )} > ( - + )} > Date: Fri, 22 Sep 2023 15:57:47 +0800 Subject: [PATCH 15/19] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E4=B8=93=E5=8C=BA=E4=BB=A5=E5=8F=8A=E4=BC=9A=E5=91=98=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=B5=84=E6=BA=90/=E6=96=87=E7=AB=A0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Head/Header.js | 5 +++-- src/forge/Information/Pages/main.jsx | 4 ++-- src/forge/Information/Pages/source.jsx | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index f6ead1b6..e11ead32 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -364,13 +364,14 @@ class NewHeader extends Component { onMouseOut={ () => { this.setState( {showSubMenu: false }) } } > { this.setState( {showSubMenu: true }) } }>特色专区 -
      + {/* 放开申请创建专区 需要修改height 登录状态length+1 */} +
        { zoneList.map((e, k) => { return
      • { e.name }
        • }) } - {current_user && current_user.login &&
      • +申请创建
        • } + {/* {current_user && current_user.login &&
      • +申请创建
        • } */}
      } diff --git a/src/forge/Information/Pages/main.jsx b/src/forge/Information/Pages/main.jsx index a1027ccc..d4a306f5 100644 --- a/src/forge/Information/Pages/main.jsx +++ b/src/forge/Information/Pages/main.jsx @@ -122,14 +122,14 @@ function Main(props){

      {tempConfig[temp].mainTitle}

      - {role && role.role !== "None" &&
      + {/* {role && role.role !== "None" &&
      {role.role === "Member" && } {role.role === "Member" ? : } -
      } +
      } */}
      { mainList && mainList.length>0 && diff --git a/src/forge/Information/Pages/source.jsx b/src/forge/Information/Pages/source.jsx index eed911c1..74341f61 100644 --- a/src/forge/Information/Pages/source.jsx +++ b/src/forge/Information/Pages/source.jsx @@ -91,12 +91,12 @@ function Source(props){ allowClear enterButton={temp === "zone" ? 搜索 :undefined} /> - {role && role.role !== "None" &&
      + {/* {role && role.role !== "None" &&
      {role.role === "Member" && } -
      } +
      } */}
    From f40aa56f9224a0c3b207717c7a58977750e31fa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 22 Sep 2023 16:20:08 +0800 Subject: [PATCH 16/19] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Information/Pages/headerPagebyCCF.jsx | 20 ++++++++++++------- src/forge/Information/indexZonebyCCF.scss | 8 ++++++++ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/forge/Information/Pages/headerPagebyCCF.jsx b/src/forge/Information/Pages/headerPagebyCCF.jsx index bad44760..1160ba0e 100644 --- a/src/forge/Information/Pages/headerPagebyCCF.jsx +++ b/src/forge/Information/Pages/headerPagebyCCF.jsx @@ -245,23 +245,29 @@ function HeaderPageCCF(props) { // 核心贡献者 data && data.memberShow === 1 && personList && personList.length > 0 &&
    -

    {data.homepageMemberTitle}

    - - {/* { -
      +

      {data.homepageMemberTitle}

      + {/* */} + {personList && personList.map(item=>{ + return
      +

      {item.typeName}

      +
        { - personList.map((i, k) => { + item.zoneMemberList.map((i, k) => { return (
      • - {i.name} +
        + {i.name} + {i.memberLevel && {i.memberLevel} } +

        {i.introduction || "暂无~"}

        • ) }) }
      - } */} +
      + })}
    } diff --git a/src/forge/Information/indexZonebyCCF.scss b/src/forge/Information/indexZonebyCCF.scss index 1259c54a..c6c7478f 100644 --- a/src/forge/Information/indexZonebyCCF.scss +++ b/src/forge/Information/indexZonebyCCF.scss @@ -258,4 +258,12 @@ font-size: 32px; text-align: center; margin-top: 40px; +} + +.memberLevel_tag{ + padding: 0px 5px; + line-height: 25px; + display: inline-block; + border: 1px solid var(--primary-color); + color: var(--primary-color); } \ No newline at end of file From cbce5d10cdaaffae41f09f88d2c918f08c732cd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 22 Sep 2023 16:32:56 +0800 Subject: [PATCH 17/19] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E7=BB=93=E6=9D=9Floading=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Team/Component/UploadImage.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Team/Component/UploadImage.jsx b/src/forge/Team/Component/UploadImage.jsx index eb1d4a68..8db17f10 100644 --- a/src/forge/Team/Component/UploadImage.jsx +++ b/src/forge/Team/Component/UploadImage.jsx @@ -30,11 +30,11 @@ function UploadImage({ getImage , url, getImageId, maxSize = 2, action = getUplo if (!isLt2M) { message.error(`上传的图片不能超过${maxSize}MB!`); } + isJpgOrPng && isLt2M && setLoading(true); return isJpgOrPng && isLt2M; } // 上传完成后 function handleChange(info){ - setLoading(true); if(info && info.file && info.file.status === "done"){ setLoading(false); getImageId && getImageId(info.file.response.id); From 7625991735aeae807e9cfe9ea5104985914405eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 22 Sep 2023 16:34:19 +0800 Subject: [PATCH 18/19] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=8A=B6=E6=80=81=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/SecuritySetting/website/mySiteList.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/SecuritySetting/website/mySiteList.jsx b/src/forge/SecuritySetting/website/mySiteList.jsx index 338c7967..86c9159f 100644 --- a/src/forge/SecuritySetting/website/mySiteList.jsx +++ b/src/forge/SecuritySetting/website/mySiteList.jsx @@ -60,7 +60,7 @@ function MySiteList(props){
    {state && build_state ? {window.open(url)}}>{item.site_name} : {item.site_name}} - {state ? build_state ? "已部署" : "未部署" : '被关闭'} + {state ? build_state!== null ? build_state ? "已部署" : "部署失败" : "未部署" : '被关闭'}
    主题： {item.theme} | From 0741c49554ab44c00c6dcd1ddddad27c1c54ebdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 22 Sep 2023 16:35:49 +0800 Subject: [PATCH 19/19] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Information/Pages/headerPagebyCCF.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Information/Pages/headerPagebyCCF.jsx b/src/forge/Information/Pages/headerPagebyCCF.jsx index 1160ba0e..919320e5 100644 --- a/src/forge/Information/Pages/headerPagebyCCF.jsx +++ b/src/forge/Information/Pages/headerPagebyCCF.jsx @@ -256,7 +256,7 @@ function HeaderPageCCF(props) { return (
  • -
    +
    {i.name} {i.memberLevel && {i.memberLevel} }