Commit 1842bf1d authored by 卢均锐's avatar 卢均锐
parents 586c1966 f50e80bb
......@@ -242,7 +242,7 @@ function useGetLayout() {
const props = _row.key === 'top' ? {
imageUrl: currentProps.imageUrl
} : {
visible: currentProps.visible || true,
visible: currentProps.visible ?? true,
theme: currentProps.theme || 0,
title: currentProps.title,
};
......
......@@ -91,9 +91,11 @@ const columns: ColumnsType<GetMarketingAdornMerchantActivityListAdornResponseDet
title: `${intl.formatMessage({ id: 'activePage.Activityprice' })}`,
dataIndex: 'activityPrice',
render: (_text, _record) => {
// const activityId = _record.activityId;
// const target = _record.activityList.find((_item: any) => _item.id === activityId)
return (
<div className={styles.priceInfo}>
<span>{_record.activityPrice}</span>
<span>{_record.activityPrice || _record?.plummetPrice || _record.deductionPrice || 0}</span>
<span className={styles.unit}>({_record.unit})</span>
</div>
);
......
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