From d13aab8aa4d3b521597a6ea07e9537e782515acc Mon Sep 17 00:00:00 2001
From: vance <1143350292@qq.com>
Date: Tue, 16 Aug 2022 14:46:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataBoard/ActiveAnalysis/List/index.tsx   |  4 +--
 src/pages/DataBoard/CoreData/List/index.tsx   | 36 ++++++++-----------
 .../DataBoard/RechargeAnalysis/List/index.tsx | 35 +++++++-----------
 .../List/components/TableModal.tsx            |  2 +-
 .../RetentionAnalysis/List/index.tsx          | 36 +++++++------------
 .../List/components/AddNftContract.tsx        |  2 +-
 src/pages/Nft/NftContract/List/index.tsx      |  7 ----
 src/pages/Nft/NftToken/List/index.tsx         |  9 ++---
 src/utils/Nft/nftContract.ts                  |  1 -
 src/widget/Work/PaySelectModal.tsx            | 21 +++++------
 10 files changed, 58 insertions(+), 95 deletions(-)

diff --git a/src/pages/DataBoard/ActiveAnalysis/List/index.tsx b/src/pages/DataBoard/ActiveAnalysis/List/index.tsx
index 648a64c..200cf69 100644
--- a/src/pages/DataBoard/ActiveAnalysis/List/index.tsx
+++ b/src/pages/DataBoard/ActiveAnalysis/List/index.tsx
@@ -6,7 +6,7 @@ import {
   getOldUserData,
   getTodayUserData,
   getWeekUserData,
-} from '@/services/DataBorad/activeanalysis';
+} from '@/services/dataBorad/activeanalysis';
 import MoreData from '@/pages/DataBoard/ActiveAnalysis/List/components/MoreData';
 import ReactEcharts from 'echarts-for-react';
 import { Card, Col, Row, Select } from 'antd';
@@ -75,7 +75,7 @@ const ActiveAnalysis: React.FC = () => {
       <Card style={{ width: '100%' }}>
         <Row gutter={32} style={{ marginBottom: 10 }}>
           <Col span={6}>
-            <h1>DAU</h1>
+            <h1>登陆人数数据图</h1>
             <Select
               defaultValue="lucy"
               value={timeType}
diff --git a/src/pages/DataBoard/CoreData/List/index.tsx b/src/pages/DataBoard/CoreData/List/index.tsx
index 8b88a57..ee93382 100644
--- a/src/pages/DataBoard/CoreData/List/index.tsx
+++ b/src/pages/DataBoard/CoreData/List/index.tsx
@@ -9,18 +9,12 @@ import {
   getTodayUserData,
   getMonthPayData,
   getNewUserData,
-} from '@/services/DataBorad/coredata';
+} from '@/services/dataBorad/coredata';
 import MoreData from '@/pages/DataBoard/ActiveAnalysis/List/components/MoreData';
-import { Card, Col, Row, DatePicker, Select } from 'antd';
+import { Card, Col, Row, Select } from 'antd';
 const CoreData: React.FC = () => {
   const tableRef = useRef<ActionType>();
-  const [startTimeValue, setStartTimeValue] = useState(Number);
-  const [endTimeValue, setEndTimeValue] = useState(Number);
   const [timeType, setTimeType] = useState(TimeType.DAY);
-  const getTimedata = (data: any) => {
-    setStartTimeValue(moment(data[0]).valueOf());
-    setEndTimeValue(moment(data[1]).valueOf());
-  };
 
   // const [date, setDate] = useState(getData);
   const [userDate, setUserDate] = useState(getData(getTodayUserData));
@@ -60,18 +54,16 @@ const CoreData: React.FC = () => {
     {
       title: '日期',
       dataIndex: 'time',
+      hideInSearch: true,
       width: '10%',
-      renderFormItem: (item, { type, defaultRender, ...rest }, form) => {
-        return (
-          <DatePicker.RangePicker
-            style={{ width: '300px' }}
-            format={'YYYY-MM-DD'}
-            onChange={(vaw: any) => {
-              getTimedata(vaw);
-            }}
-          />
-        );
-      },
+    },
+    {
+      title: '时间',
+      dataIndex: 'select_time',
+      valueType: 'dateRange',
+      width: '20%',
+      hideInTable: true,
+      ellipsis: true,
     },
     {
       title: '活跃用户数',
@@ -139,8 +131,10 @@ const CoreData: React.FC = () => {
         rowKey="id"
         actionRef={tableRef}
         request={async (params) => {
-          params.start_time = startTimeValue;
-          params.end_time = endTimeValue;
+          if ((params.select_time ?? '') !== '') {
+            params.start_time = moment(params.select_time[0]).valueOf() / 1000;
+            params.end_time = moment(params.select_time[1]).valueOf() / 1000;
+          }
           return getCoreData(params);
         }}
       />
diff --git a/src/pages/DataBoard/RechargeAnalysis/List/index.tsx b/src/pages/DataBoard/RechargeAnalysis/List/index.tsx
index 383c1be..392d384 100644
--- a/src/pages/DataBoard/RechargeAnalysis/List/index.tsx
+++ b/src/pages/DataBoard/RechargeAnalysis/List/index.tsx
@@ -6,13 +6,7 @@ import moment from 'moment';
 import TimeType from '@/constants/enum/timeType';
 const Address: React.FC = () => {
   const tableRef = useRef<ActionType>();
-  const [startTimeValue, setStartTimeValue] = useState(Number);
-  const [endTimeValue, setEndTimeValue] = useState(Number);
   const [timeType, setTimeType] = useState(TimeType.DAY);
-  const getTimedata = (data: any) => {
-    setStartTimeValue(moment(data[0]).valueOf());
-    setEndTimeValue(moment(data[1]).valueOf());
-  };
 
   const columns: ProColumns<any>[] = [
     {
@@ -55,17 +49,14 @@ const Address: React.FC = () => {
       dataIndex: 'timeData',
       hideInTable: true,
       width: '20%',
-      renderFormItem: (item, { type, defaultRender, ...rest }, form) => {
-        return (
-          <DatePicker.RangePicker
-            style={{ width: '300px' }}
-            format={'YYYY-MM-DD'}
-            onChange={(vaw: any) => {
-              getTimedata(vaw);
-            }}
-          />
-        );
-      },
+    },
+    {
+      title: '时间',
+      dataIndex: 'select_time',
+      valueType: 'dateRange',
+      width: '20%',
+      hideInTable: true,
+      ellipsis: true,
     },
     {
       title: '付费次数',
@@ -112,12 +103,10 @@ const Address: React.FC = () => {
       actionRef={tableRef}
       // search={false}
       request={async (params) => {
-        console.log(params);
-
-        params.start_time = startTimeValue;
-        params.end_time = endTimeValue;
-        console.log(params.data.timeData);
-        console.log(params.time_type);
+        if ((params.select_time ?? '') !== '') {
+          params.start_time = moment(params.select_time[0]).valueOf() / 1000;
+          params.end_time = moment(params.select_time[1]).valueOf() / 1000;
+        }
         return getRententionData(params);
       }}
     />
diff --git a/src/pages/DataBoard/RetentionAnalysis/List/components/TableModal.tsx b/src/pages/DataBoard/RetentionAnalysis/List/components/TableModal.tsx
index 95e5f8f..7ca1471 100644
--- a/src/pages/DataBoard/RetentionAnalysis/List/components/TableModal.tsx
+++ b/src/pages/DataBoard/RetentionAnalysis/List/components/TableModal.tsx
@@ -3,7 +3,7 @@ import Modal, { ModalProps } from '@/components/Modal';
 import { fetchTableData } from '@/utils/table';
 import Table, { ProColumns, ActionType } from '@/components/Table';
 import TimeText from '@/components/Typography/TimeText';
-import { getChannelData } from '@/services/DataBorad/retentionAnalysis';
+import { getChannelData } from '@/services/dataBorad/retentionAnalysis';
 
 interface TableModalPropsType extends ModalProps {
   modalData: any;
diff --git a/src/pages/DataBoard/RetentionAnalysis/List/index.tsx b/src/pages/DataBoard/RetentionAnalysis/List/index.tsx
index f877861..5a90881 100644
--- a/src/pages/DataBoard/RetentionAnalysis/List/index.tsx
+++ b/src/pages/DataBoard/RetentionAnalysis/List/index.tsx
@@ -3,21 +3,12 @@ import Table, { ProColumns, ActionType } from '@/components/Table';
 import { DatePicker } from 'antd';
 import moment from 'moment';
 import { fetchTableData } from '@/utils/table';
-import { getRententionData } from '@/services/DataBorad/retentionAnalysis';
+import { getRententionData } from '@/services/dataBorad/retentionAnalysis';
 import TableModal from '@/pages/DataBoard/RetentionAnalysis/List/components/TableModal';
 
 const RetentionAnalysis = () => {
-  const [startTimeValue, setStartTimeValue] = useState(Number);
-  const [endTimeValue, setEndTimeValue] = useState(Number);
-
   const [visible, setVisible] = useState(false);
   const [requestData, setRequestData] = useState();
-  const getTimedata = (data) => {
-    setStartTimeValue(moment(data[0]).valueOf());
-    setEndTimeValue(moment(data[1]).valueOf());
-    console.log(startTimeValue, endTimeValue);
-    console.log(visible);
-  };
   const sendData = (row: any) => {
     setVisible(true);
     setRequestData(row.time);
@@ -28,17 +19,14 @@ const RetentionAnalysis = () => {
     {
       title: '时间',
       dataIndex: 'time',
-      // width: '20%',
-      renderFormItem: (item, { type, defaultRender, ...rest }, form) => {
-        return (
-          <DatePicker.RangePicker
-            value={requestData}
-            style={{ width: '200px' }}
-            format={'YYYY-MM-DD'}
-            onChange={getTimedata}
-          />
-        );
-      },
+    },
+    {
+      title: '时间',
+      dataIndex: 'select_time',
+      valueType: 'dateRange',
+      width: '20%',
+      hideInTable: true,
+      ellipsis: true,
     },
     {
       title: '登录用户数',
@@ -99,8 +87,10 @@ const RetentionAnalysis = () => {
         rowKey="id"
         actionRef={tableRef}
         request={async (params) => {
-          params.start_time = startTimeValue;
-          params.end_time = endTimeValue;
+          if ((params.select_time ?? '') !== '') {
+            params.start_time = moment(params.select_time[0]).valueOf() / 1000;
+            params.end_time = moment(params.select_time[1]).valueOf() / 1000;
+          }
           return await fetchTableData(getRententionData, params);
         }}
       />
diff --git a/src/pages/Nft/NftContract/List/components/AddNftContract.tsx b/src/pages/Nft/NftContract/List/components/AddNftContract.tsx
index 4bb4242..473de75 100644
--- a/src/pages/Nft/NftContract/List/components/AddNftContract.tsx
+++ b/src/pages/Nft/NftContract/List/components/AddNftContract.tsx
@@ -49,7 +49,7 @@ const AddNftContractModal = ({ onOk, onCancel, ...rest }: AddNftContractModalPro
           />
           <SchemaField.Number
             name="description"
-            title="gas费"
+            title=""
             required
             x-decorator="FormItem"
             x-component="NumberPicker"
diff --git a/src/pages/Nft/NftContract/List/index.tsx b/src/pages/Nft/NftContract/List/index.tsx
index 216576b..a129255 100644
--- a/src/pages/Nft/NftContract/List/index.tsx
+++ b/src/pages/Nft/NftContract/List/index.tsx
@@ -37,13 +37,6 @@ const Address: React.FC = () => {
         rowKey="id"
         actionRef={tableRef}
         toolBarActions={[
-          {
-            type: 'add',
-            text: '添加NFT',
-            onConfirm: () => {
-              setVisible(true);
-            },
-          },
           {
             type: 'add',
             text: '新建NFT合约',
diff --git a/src/pages/Nft/NftToken/List/index.tsx b/src/pages/Nft/NftToken/List/index.tsx
index 8325513..ccf2aa5 100644
--- a/src/pages/Nft/NftToken/List/index.tsx
+++ b/src/pages/Nft/NftToken/List/index.tsx
@@ -3,13 +3,14 @@ import Table, { ProColumns, ActionType } from '@/components/Table';
 import { message } from 'antd';
 // import { fetchTableData } from '@/utils/table';
 
-// import AddNftModal from '@/pages/Nft/NftToken/List/components/AddNftModel';
+import AddNftModal from '@/pages/Nft/NftToken/List/components/AddNftModel';
 import PaySelectModal from '@/widget/Work/PaySelectModal';
 
 const Address: React.FC = () => {
   const tableRef = useRef<ActionType>();
   const [NftModal, setNftModal] = useState(false);
   const [visible, setVisible] = useState(false);
+  const [payVisible, setPayVisible] = useState(false);
 
   const columns: ProColumns<any>[] = [
     {
@@ -58,7 +59,7 @@ const Address: React.FC = () => {
         //   // return fetchTableData(, params);
         // }}
       />
-      {/* <AddNftModal
+      <AddNftModal
         visible={visible}
         onCancel={function () {
           setVisible(false);
@@ -74,9 +75,9 @@ const Address: React.FC = () => {
             setVisible(false);
           }
         }}
-      /> */}
+      />
       <PaySelectModal
-        visible={visible}
+        visible={payVisible}
         onCancel={function () {
           setVisible(false);
         }}
diff --git a/src/utils/Nft/nftContract.ts b/src/utils/Nft/nftContract.ts
index 77ac143..02db782 100644
--- a/src/utils/Nft/nftContract.ts
+++ b/src/utils/Nft/nftContract.ts
@@ -22,7 +22,6 @@ export async function initWeb3() {
     const accounts = await provider.request({
       method: 'eth_requestAccounts',
     });
-    //如果用户同意了登录请求，你就可以拿到用户的账号
     web3.eth.defaultAccount = accounts[0];
     return true;
   } catch (reason) {
diff --git a/src/widget/Work/PaySelectModal.tsx b/src/widget/Work/PaySelectModal.tsx
index 6a3789d..511025a 100644
--- a/src/widget/Work/PaySelectModal.tsx
+++ b/src/widget/Work/PaySelectModal.tsx
@@ -49,18 +49,15 @@ const PaySelectModal = ({ onOk, onCancel, ...rest }: PaySelectModalPropsType) =>
               { label: '小狐狸钱包支付', value: 2 },
             ]}
           />
-
-          {send == true && (
-            <SchemaField.String
-              name="key"
-              title="秘钥"
-              x-decorator="FormItem"
-              x-component="Input"
-              x-component-props={{
-                placeholder: '请输入秘钥，若使用小狐狸支付则不需要输入',
-              }}
-            />
-          )}
+          <SchemaField.String
+            name="key"
+            title="秘钥"
+            x-decorator="FormItem"
+            x-component="Input"
+            x-component-props={{
+              placeholder: '请输入秘钥，若使用小狐狸支付则不需要输入',
+            }}
+          />
         </SchemaField>
       </Form>
     </Modal>