Commit 67f6a9e4 authored by Aivs's avatar Aivs

fix:样式修改

parent 8882ed40
......@@ -221,12 +221,13 @@
.cancel{
font-size: 17px;
font-weight: 400;
color: #467DB9;
color: #8E8E93;
line-height: 24px;
margin-left:20px;
}
.searchInt{
width:80% !important;
margin-left:10px;
}
.content{
padding:10px 20px;
......
......@@ -55,15 +55,15 @@ const [orderList,setOrderList] = useState<any>(
[
{
name:'戈有好物',
price:"2345.23"
price:""
},
{
name:'纷享销客',
price:"12.09万"
price:""
},
{
name:'客户中心',
price:"12.09万"
price:""
}
]
)
......
......@@ -11,6 +11,7 @@ const Order: React.FC = () => {
const [openFlag, setOpenFlag] = useState<any>([true,false,false,false])
const [customData, setCustomData] = useState<any>([])
const [orderInfo,setOrderInfo]=useState<any>([])
const [userId, setUserId] = useState<any>('');
const open = async (index:any)=>{
let arr = [...openFlag]
arr[index] = !arr[index]
......@@ -23,6 +24,7 @@ const Order: React.FC = () => {
// setOrderInfo(history.location.state.orderInfo)
// setCustomData(history.location.state.orderInfo.clientOrderInfos)
let userId = history.location.state.userId
setUserId(userId)
getorderInfo(userId)
}
//获取订单信息
......@@ -38,7 +40,7 @@ const Order: React.FC = () => {
}
const Goto = async (userItem:any)=>{
// // 页面跳转方法
history.push({pathname: '/Person', state: { userItem,orderInfo }})
history.push({pathname: '/Person', state: { userItem,userId }})
}
const back=async ()=>{
// history.back()
......
......@@ -2,9 +2,10 @@ import * as React from 'react'
import {useCallback,useEffect, useState} from 'react'
import {jsSdk} from "../index";
import {Button, Input,Table,Tabs,Space} from "antd";
import {SearchOutlined } from '@ant-design/icons';
import {SearchOutlined,LeftOutlined,CloseCircleOutlined } from '@ant-design/icons';
import {selectUserBase,linkData,unlinkData} from "../api";
import creatHistory from 'history/createHashHistory' //返回上一页这段代码
const history = creatHistory();
const {TextArea} = Input
......@@ -140,11 +141,11 @@ const Actions: React.FC = () => {
return (
<div>
<Button type='primary' className='back' onClick={back.bind(this)}>返回</Button>
{/* <Button type='primary' className='back' onClick={back.bind(this)}>返回</Button> */}
<div className="flex search">
<Input className='searchInt' allowClear placeholder="请输入客户信息" prefix={<SearchOutlined />} onChange={inputChange} onKeyDown={getInput}/>
<LeftOutlined onClick={back.bind(this)}/><Input className='searchInt' allowClear placeholder="请输入客户信息" prefix={<SearchOutlined />} onChange={inputChange} onKeyDown={getInput}/>
{/* <Button size='small'>取消</Button> */}
<div className="cancel">取消</div>
{/* <div className="cancel"><CloseCircleOutlined /></div> */}
</div>
<Tabs defaultActiveKey={tabIndex} onChange={callback.bind(this)}>
{
......
......@@ -12,16 +12,16 @@ const Person: React.FC = () => {
const [customData, setCustomData] = useState<any>({
id:33599
})
const [orderInfo,setOrderInfo]=useState<any>([])
const [userId,setUserId]=useState<any>([])
const back=async ()=>{
// location.back()
location.push({pathname: '/Order', state: { orderInfo }})
location.push({pathname: '/Order', state: { userId }})
}
//路由跳转过来携带的数据
const GetRouterData = async ()=>{
console.log(location, 'props')
setCustomData(location.location.state.userItem)
setOrderInfo(location.location.state.orderInfo)
setUserId(location.location.state.userId)
}
useEffect(() => {
GetRouterData()
......
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