Merge branch 'fix-v2-220418' into 'v2-220418'

src/pages/marketingManage/platformCoupon/platformCouponQuery/index.tsx

@@ -110,56 +110,47 @@ const PlatformCouponQuery: React.FC = () => {
       title: '优惠劵类型',
       dataIndex: 'typeName',
       align: 'center',
-      filters: [],
     },
     {
       title: '领(发)劵起始时间',
       dataIndex: 'releaseTimeStart',
       align: 'center',
-      sorter: (a, b) => a.releaseTimeStart - b.releaseTimeStart,
       render: (text) => text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : '',
     },
     {
       title: '领(发)劵截止时间',
       dataIndex: 'releaseTimeEnd',
       align: 'center',
-      sorter: (a, b) => a.releaseTimeEnd - b.releaseTimeEnd,
       render: (text) => text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : '',
     },
     {
       title: '劵有效期起始时间',
       dataIndex: 'effectiveTimeStart',
       align: 'center',
-      sorter: (a, b) => a.effectiveTimeStart - b.effectiveTimeStart,
       render: (text) => text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : '-',
     },
     {
       title: '劵有效期截止时间',
       dataIndex: 'effectiveTimeEnd',
       align: 'center',
-      sorter: (a, b) => a.effectiveTimeEnd - b.effectiveTimeEnd,
       render: (text, record) => text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : `领取${record.invalidDay}天后失效`,
     },
     {
       title: '领劵方式',
       dataIndex: 'getWayName',
       align: 'center',
-      filters: [],
     },
     {
       title: '劵面额',
       dataIndex: 'denomination',
-      sorter: (a, b) => a.denomination - b.denomination,
     },
     {
       title: '发劵数量',
       dataIndex: 'quantity',
-      sorter: (a, b) => a.quantity - b.quantity,
     },
     {
       title: '内部状态',
       dataIndex: 'statusName',
-      filters: [],
     },
     {
       title: '操作',

src/pages/memberManage/memberMaintain/components/MemberForm/index.tsx

@@ -81,6 +81,7 @@ const MemberForm: React.FC<MemberFormProps> = ({
         outerStatusName,
         roleName,
         verifySteps,
+        level,
         ...rest
       }: any = infoRes.data;
       // 注册资料处理
@@ -99,6 +100,7 @@ const MemberForm: React.FC<MemberFormProps> = ({
         memberTypeId: memberTypeEnum,
         ...rest,
         ...detail,
+        level: level || undefined,
       });
 
       setInfoLoading(false);