Skip to content

J
jinfa-admin
Commit d2f0992f authored by Bill's avatar Bill
Browse files
Options

修改首页链接以及结算搜索bug

parent c836d775
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 31 deletions
src/pages/home/components/Settlement/index.tsx
View file @ d2f0992f
......@@ -13,6 +13,7 @@ import feeIcon4 from '@/asserts/home-icon-18.png'
import feeIcon5 from '@/asserts/home-icon-19.png'
import feeIcon6 from '@/asserts/home-icon-20.png'
import {useInViewport} from '@umijs/hooks';
import { Link } from 'umi';
const Settlement: React.FC = () => {
const [settlements, setSettlements] = useState<any>({});
......@@ -54,7 +55,7 @@ const Settlement: React.FC = () => {
<div className={styles.noteGap}></div>
<div className={styles.noteBody}>
<span className={styles.value}>{settlements.toBePay?.count}</span>
<a>查看 <RightOutlined /></a>
<Link to={settlements.toBePay?.link}>查看 <RightOutlined /></Link>
</div>
</div>
</div>
......@@ -69,7 +70,7 @@ const Settlement: React.FC = () => {
<div className={styles.noteGap}></div>
<div className={styles.noteBody}>
<span className={styles.value}>{settlements.complete?.count}</span>
<a>查看 <RightOutlined /></a>
<Link to={settlements.complete?.link}>查看</Link>
</div>
</div>
</div>
......@@ -85,7 +86,7 @@ const Settlement: React.FC = () => {
<p className={styles.lineDescTip}>待提现申请</p>
</div>
</div>
<a>查看&nbsp;<RightOutlined /></a>
<Link to={settlements.tobeValifyCashout?.link}>查看&nbsp;<RightOutlined /></Link>
</div>
</Col>
<Col span={24} style={{paddingBottom:0, marginTop: '12px'}}>
......@@ -97,7 +98,7 @@ const Settlement: React.FC = () => {
<p className={styles.lineDescTip}>待支付提现申请</p>
</div>
</div>
<a>查看&nbsp;<RightOutlined /></a>
<Link to={settlements.tobePayCashout?.link}>查看&nbsp;<RightOutlined /></Link>
</div>
</Col>
</Row>
......@@ -113,7 +114,7 @@ const Settlement: React.FC = () => {
<p className={styles.lineDescTip}>待付款积分结算</p>
</div>
</div>
<a key="list-loadmore-more">查看&nbsp;<RightOutlined /></a>
<Link to={settlements.scoreToBePay?.link}>查看&nbsp;<RightOutlined /></Link>
</div>
</Col>
<Col span={24} style={{paddingBottom:0, marginTop: '12px'}}>
......@@ -125,7 +126,7 @@ const Settlement: React.FC = () => {
<p className={styles.lineDescTip}>已完成积分结算</p>
</div>
</div>
<a key="list-loadmore-more">查看&nbsp;<RightOutlined /></a>
<Link to={settlements.scoreComplete?.link}>查看&nbsp;<RightOutlined /></Link>
</div>
</Col>
</Row>
......
src/pages/home/components/StatisticsColumn/index.tsx
View file @ d2f0992f
......@@ -40,7 +40,7 @@ const StatisticsColumn = (props) => {
<p className={styles.lineDescTip}>{data.addProduct?.name}</p>
</div>
</div>
<a key="list-loadmore-more">查看&nbsp;<RightOutlined /></a>
<Link to={data.addProduct?.link}>查看&nbsp;<RightOutlined /></Link>
</div>
</Col>
<Col xxl={12} xl={12} lg={24} md={12} sm={24} xs={24} className={styles.commodityTotalDesc} >
......@@ -52,7 +52,7 @@ const StatisticsColumn = (props) => {
<p className={styles.lineDescTip}>{data.toBeProductValify?.name}</p>
</div>
</div>
<a key="list-loadmore-more">查看&nbsp;<RightOutlined /></a>
<Link to={data.toBeProductValify?.link}>查看&nbsp;<RightOutlined /></Link>
</div>
</Col>
</Row>
......@@ -88,7 +88,7 @@ const StatisticsColumn = (props) => {
<p className={styles.lineDescTip}>{data.addBrand?.name}</p>
</div>
</div>
<a key="list-loadmore-more">查看&nbsp;<RightOutlined /></a>
<Link to={data.addBrand?.link}>查看&nbsp;<RightOutlined /></Link>
</div>
</Col>
<Col xxl={12} xl={12} lg={24} md={12} sm={24} xs={24} className={styles.commodityTotalDesc}>
......@@ -100,7 +100,7 @@ const StatisticsColumn = (props) => {
<p className={styles.lineDescTip}>{data.toBeBrandValify?.name}</p>
</div>
</div>
<a key="list-loadmore-more">查看&nbsp;<RightOutlined /></a>
<Link to={data.toBeBrandValify?.link}>查看&nbsp;<RightOutlined /></Link>
</div>
</Col>
</Row>
......
src/pages/home/components/TodayAdd/index.tsx
View file @ d2f0992f
......@@ -36,7 +36,7 @@ const TodayAdd: React.FC<Iprops> = (props) => {
percent: data.commodityGrowthRate
},
{
title: '今日新增品牌',
title: '今日新增店铺',
number: data.shopCount,
icon: brandIcon,
percent: data.shopGrowthRate
......
src/pages/home/index.tsx
View file @ d2f0992f
......@@ -13,6 +13,7 @@ import { PublicApi } from '@/services/api'
import sideIcon from '../../asserts/home-icon-28.png'
import { ImemberData, IorderData, ItodayAdd } from './common/interface';
import {useInViewport} from '@umijs/hooks';
import { Link } from 'umi';
const PROCESS_STATUS = ["default", "warning", "warning", "processing"];
......@@ -176,7 +177,7 @@ const Home: React.FC<{}> = () => {
<Badge status={PROCESS_STATUS[key]} text={item.name}></Badge>
</div>
</div>
<div><a key="list-loadmore-more">查看&nbsp;<RightOutlined /></a></div>
<div><Link to={item.url}>查看&nbsp;<RightOutlined /></Link></div>
</div>
</Col>
)
......@@ -229,7 +230,7 @@ const Home: React.FC<{}> = () => {
return (
<List.Item
key={row.name}
actions={[<a key="list-loadmore-more">查看&nbsp;<RightOutlined /></a>]}
actions={[<Link to={row.link}>查看&nbsp;<RightOutlined /></Link>]}
>
<List.Item.Meta
title={row.count.toString()}
......
src/pages/platformSettlement/accountPayable/index.tsx
View file @ d2f0992f
......@@ -49,7 +49,7 @@ const SettlementList = () => {
}
const columns: ColumnsType<any> = [
{
title: '结算单号',
title: '结算单号',
dataIndex: 'settlementNo',
render: (text, record) => {
const url = `/balanced/accountPayable/detail?id=${record.id}`;
......@@ -88,8 +88,8 @@ const SettlementList = () => {
title: '操作',
render: (text, record: any) => {
return (
<StatusActions
status={record.status <= 2 ? record.status : 4 }
<StatusActions
status={record.status <= 2 ? record.status : 4 }
id={record.id}
excludes={[1, 3]}
settlementId={record.memberId || 1}
......@@ -103,7 +103,7 @@ const SettlementList = () => {
/**
* 上传凭证
* @param params
* @param params
*/
const handleUploadVoucher = (params: any) => {
console.log(params);
......@@ -136,7 +136,7 @@ const SettlementList = () => {
currentRef={ref}
fetchTableData={(params: any) => fetchListData(params)}
controlRender={
<NiceForm
<NiceForm
components={{DatePicker}}
actions={formActions}
expressionScope={{}}
......@@ -149,6 +149,10 @@ const SettlementList = () => {
}}
schema={schema}
onSubmit={handleSearch}
onReset={() => {
formActions.setFieldValue('startTime', null);
formActions.setFieldValue('endTime', null);
}}
/>
}
/>
......
src/pages/platformSettlement/corporateAccount/index.tsx
View file @ d2f0992f
......@@ -157,7 +157,7 @@ const CorporateAccount = () => {
cacheValue: data && data.bankAccount || '',
isEdit: false,
canEdit: true,
pattern: /^([1-9]{1})(\d{14}|\d{18})$/,
pattern: /^([1-9]{1})(\d{15}|\d{18})$/,
message: '请输入正确的银行账号'
},
{
......
src/pages/platformSettlement/score/list/index.tsx
View file @ d2f0992f
......@@ -20,6 +20,7 @@ import { PublicApi } from '@/services/api'
import { Moment } from 'moment';
import { ColumnsType } from 'antd/es/table';
import EyePreview from '@/components/EyePreview';
import moment from 'moment';
interface SearchParams {
settlementName?: string,
......@@ -50,7 +51,7 @@ const SettlementList = () => {
}
const columns: ColumnsType<any> = [
{
title: '结算单号',
title: '结算单号',
dataIndex: 'settlementNo',
render: (text, record) => {
const url = `/balanced/scorePayable/detail?id=${record.id}`;
......@@ -67,10 +68,10 @@ const SettlementList = () => {
{title: '总单数', dataIndex: 'totalCount'},
{title: '结算积分', dataIndex: 'score'},
{
title: '兑换比率',
title: '兑换比率',
dataIndex: 'ratio',
render: (text, record) => {
return (record.ratio * 100) + "%";
return (record.ratio) + "%";
}
},
{title: '结算金额', dataIndex: 'amount'},
......@@ -95,8 +96,8 @@ const SettlementList = () => {
title: '操作',
render: (text, record: any) => {
return (
<StatusActions
status={record.status <= 2 ? record.status : 4 }
<StatusActions
status={record.status <= 2 ? record.status : 4 }
id={record.id}
excludes={[1, 3]}
settlementId={record.memberId || 1}
......@@ -110,7 +111,7 @@ const SettlementList = () => {
/**
* 上传凭证
* @param params
* @param params
*/
const handleUploadVoucher = (params: any) => {
console.log(params);
......@@ -128,8 +129,8 @@ const SettlementList = () => {
*/
const handleSearch = (values: SearchParams) => {
const format = 'YYYY-MM-DD'
const startTime = values.startTime?.format(format);
const endTime = values.endTime?.format(format);
const startTime = values.startTime && moment.isMoment(values.startTime) ? values.startTime.format(format) : '';
const endTime = values.endTime && moment.isMoment(values.endTime) ? values.endTime.format(format) : '';
ref.current.reload({...values, startTime, endTime});
}
return (
......@@ -143,7 +144,7 @@ const SettlementList = () => {
currentRef={ref}
fetchTableData={(params: any) => fetchListData(params)}
controlRender={
<NiceForm
<NiceForm
components={{DatePicker}}
actions={formActions}
expressionScope={{}}
......@@ -156,6 +157,10 @@ const SettlementList = () => {
}}
schema={schema}
onSubmit={handleSearch}
onReset={() => {
formActions.setFieldValue('startTime', null);
formActions.setFieldValue('endTime', null);
}}
/>
}
/>
......@@ -165,5 +170,4 @@ const SettlementList = () => {
}
export default SettlementList
\ No newline at end of file
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