Commit 6e386a63 authored by Aivs's avatar Aivs

fix:完善组件,去除戈友圈跳转操作

parent e8c25237
import React, {FC} from "react";
import {Menu} from "antd";
import {HomeOutlined, SettingOutlined, UsergroupAddOutlined, UserOutlined} from "@ant-design/icons";
import {Link} from "react-router-dom";
import {LeftOutlined,DownOutlined,RightOutlined } from '@ant-design/icons';
import {LeftOutlined} from '@ant-design/icons';
import { useHistory} from 'react-router-dom'
// type selfProps = {
// text: string;
// };
const Top: FC = () => {
type selfProps = {
text: string,
goBack: Function
};
const Top: FC<selfProps> = (props) => {
const { text,goBack } = props;
const location = useHistory()
const back=async ()=>{
location.goBack()
goBack(text)
// location.goBack()
}
return (
<div className="orderItem" ><LeftOutlined onClick={back}/></div>
<div className="orderItem" ><LeftOutlined onClick={back}/>{text}</div>
// <Menu mode="horizontal">
// <Menu.Item key="home" icon={<HomeOutlined/>}>
......
......@@ -122,6 +122,9 @@ const layout = {
setCustomInfoEdit(!customInfoEdit)
setOpen(true)
}
const gotoGyq=():void=>{
console.log('戈友圈相关操作')
}
const labelAdd=(e:any)=>{
// console.log(e.target.value)
setlabelValue(e.target.value)
......@@ -444,7 +447,7 @@ const layout = {
<div className="flex spaceBetween customitem">
<p className='word'>戈友圈</p>
{/* <img src={jt} alt="" className="more" onClick={testClick}/> */}
<div className="more" onClick={testClick}><RightOutlined /></div>
<div className="more" onClick={gotoGyq}><RightOutlined /></div>
</div>
<div className="order">
<div className="noData">暂无数据</div>
......
......@@ -5,6 +5,7 @@ import {Button, Input,Table,Tabs,Space} from "antd";
import {SearchOutlined,LeftOutlined,CloseCircleOutlined } from '@ant-design/icons';
import {selectUserBase,linkData,unlinkData} from "../api";
import creatHistory from 'history/createHashHistory' //返回上一页这段代码
import Top from '../components/Top'
const history = creatHistory();
......@@ -13,6 +14,7 @@ const { TabPane } = Tabs;
const Actions: React.FC = () => {
const [msg, setMsg] = useState<string>('')
const [text] = useState<string>('whhhhhh')
const [scroll, setScroll] = useState<any>(undefined)
const [cheight,setCheight] = useState<number>(0)
const [columns]=useState<any>([
......@@ -154,6 +156,10 @@ const Actions: React.FC = () => {
}
}
};
const goBack = ()=>{
console.log("返回返回哇哈哈哈哈哈")
history.goBack()
}
useEffect(() => {
//getUserBase()
setCheight(window.innerHeight-120) //获取屏幕的高度-120,为content高度
......@@ -167,6 +173,8 @@ const Actions: React.FC = () => {
{/* <Button size='small'>取消</Button> */}
{/* <div className="cancel"><CloseCircleOutlined /></div> */}
</div>
{/* <Top text={text} goBack={goBack}></Top> */}
<Tabs defaultActiveKey={tabIndex} onChange={callback.bind(this)}>
{
tabs.map((item:any,idx:number)=>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment