Merge branch 'v2' into v2-220318

d5aec47b · Bill · 54cceb0f · 683b899f · d5aec47b · d5aec47b
Commit d5aec47b authored Mar 16, 2022 by Bill
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

index.tsx src/pages/memberManage/components/EquityInfo/index.tsx +1 -1

index.tsx ...tManage/platformSettlement/score/common/columns/index.tsx +1 -1

No files found.
--- a/src/pages/memberManage/components/EquityInfo/index.tsx
+++ b/src/pages/memberManage/components/EquityInfo/index.tsx
@@ -110,7 +110,7 @@ const EquityInfo: React.FC<EquityInfoProps> = ({
    },
    {
      title: '会员权益名称',
-      dataIndex: 'rightTypeName	',
+      dataIndex: 'rightTypeName',
      align: 'center',
    },
    {

--- a/src/pages/settlementManage/platformSettlement/score/common/columns/index.tsx
+++ b/src/pages/settlementManage/platformSettlement/score/common/columns/index.tsx
@@ -20,7 +20,7 @@ export const columns: ColumnsType<any> = [
    title: '本期结算金额',
    dataIndex: 'settlementAmount',
    render: (text, record) => (
-      "￥" + record.ratio
+      "￥" + record.settlementAmount
    )
  },