+
+ {this.props.active.title}
+ {this.props.active.content}
+ {"活动开始时间:"+moment(this.props.active.activeStartTime).format("YYYY-MM-DD HH:mm:ss")}
+ {"活动结束时间:"+moment(this.props.active.activeStartTime).format("YYYY-MM-DD HH:mm:ss")}
+ {this.props.showButton?:null}
+
+ );
+ }
+}
diff --git a/src/Address.tsx b/src/ui/Address.tsx
similarity index 96%
rename from src/Address.tsx
rename to src/ui/Address.tsx
index 7db4054..fec031b 100644
--- a/src/Address.tsx
+++ b/src/ui/Address.tsx
@@ -1,5 +1,5 @@
import {Form, InputGroup} from "react-bootstrap";
-import {AddressProps, OnChangeAddress} from "./entity";
+import {AddressProps, OnChangeAddress} from "../entity";
import React from "react";
/**
diff --git a/src/my/CloseDialog.tsx b/src/ui/CloseDialog.tsx
similarity index 100%
rename from src/my/CloseDialog.tsx
rename to src/ui/CloseDialog.tsx
diff --git a/src/bootstrap/InputGroup.tsx b/src/ui/InputGroup.tsx
similarity index 97%
rename from src/bootstrap/InputGroup.tsx
rename to src/ui/InputGroup.tsx
index d46fe5a..9bbf129 100644
--- a/src/bootstrap/InputGroup.tsx
+++ b/src/ui/InputGroup.tsx
@@ -1,6 +1,6 @@
import React from "react";
import {FormControl, InputGroup} from 'react-bootstrap'
-import {FormInputProps} from "./LoginFormDesc";
+import {FormInputProps} from "../entity";
const defaultValid={
diff --git a/src/my/MyDialog.tsx b/src/ui/MyDialog.tsx
similarity index 100%
rename from src/my/MyDialog.tsx
rename to src/ui/MyDialog.tsx
diff --git a/src/Page.tsx b/src/ui/Page.tsx
similarity index 87%
rename from src/Page.tsx
rename to src/ui/Page.tsx
index 9ec9986..db951b2 100644
--- a/src/Page.tsx
+++ b/src/ui/Page.tsx
@@ -1,11 +1,11 @@
-import {PageProps} from "./entity";
+import {PageClickProps} from "../entity";
import React from "react";
import {Pagination} from "react-bootstrap";
/**
* 分页组件
*/
-export class Page extends React.Component