积分兑换

src/pages/SystemManagement/Point/ActiveOption.jsx

@@ -90,8 +90,8 @@ class ActiveOption extends React.Component {
               id: record.id,
               productImg: values.productImg,
               productName: values.productName,
-              startTime: values.effectiveTime[0].format('YYYY-MM-DD HH:mm:ss'),
-              endTime: values.effectiveTime[1].format('YYYY-MM-DD HH:mm:ss'),
+              startTime: values.effectiveTime[0],
+              endTime: values.effectiveTime[1],
               point: values.point,
             },
             '',
@@ -107,8 +107,8 @@ class ActiveOption extends React.Component {
             {
               productImg: values.productImg,
               productName: values.productName,
-              startTime: values.effectiveTime[0].format('YYYY-MM-DD HH:mm:ss'),
-              endTime: values.effectiveTime[1].format('YYYY-MM-DD HH:mm:ss'),
+              startTime: values.effectiveTime[0],
+              endTime: values.effectiveTime[1],
               point: values.point,
             },
             { pageNo: current, pageSize: pageSize },
@@ -160,12 +160,22 @@ class ActiveOption extends React.Component {
         key: "point",
       },
       {
-        title: "创建时间",
-        dataIndex: "createTime",
-        key: "createTime",
+        title: "兑换开始时间",
+        dataIndex: "startTime",
+        key: "startTime",
         render: (text, record) => {
           return (
-            <span>{moment(record.createTime).format("YYYY-MM-DD HH:mm:ss")}</span>
+            <span>{moment(record.startTime).format("YYYY-MM-DD HH:mm:ss")}</span>
+          );
+        },
+      },
+      {
+        title: "兑换截止时间",
+        dataIndex: "endTime",
+        key: "endTime",
+        render: (text, record) => {
+          return (
+            <span>{moment(record.endTime).format("YYYY-MM-DD HH:mm:ss")}</span>
           );
         },
       },

src/pages/SystemManagement/Point/CurrencyOption.jsx

@@ -142,8 +142,8 @@ class CurrencyOption extends React.Component {
       },
       {
         title: "姓名",
-        dataIndex: "name",
-        key: "name",
+        dataIndex: "fullName",
+        key: "fullName",
       },
       {
         title: "兑换商品",