Merge branch 'feature/upgrade' of...

Merge branch 'feature/upgrade' of http://git.quantgroup.cn/ui/merchant-manage-ui into feature/upgrade
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

src/pages/cancelBillManage/Pending.jsx

@@ -10,6 +10,7 @@ import { column } from './data';
 import AuditModal from './components/auditModal';
 import DetailTable from './components/detailTable';
 import { dateDiff } from './common';
+import moment from 'moment';
 
 export default () => {
   const table = useRef();
@@ -20,7 +21,6 @@ export default () => {
   const [auditInfo, setAuditInfo] = useState({});
   const [timeString, setTimeString] = useState({});
   const [time, setTime] = useState({});
-  const [reslutData, setReslutData] = useState([]);
 
   const query = async (params, type) => {
     if (params.orderId) {
@@ -80,8 +80,8 @@ export default () => {
   };
   const renderContent = (record, index, action) => {
     if (!time[record.orderId]) {
-      const applyTime = new Date(record.applyTime).getTime() + 24 * 3600 * 1000;
-      const nowTime = new Date(record.nowTime).getTime();
+      const applyTime = moment(record.applyTime).valueOf() + 24 * 3600 * 1000;
+      const nowTime = moment(record.nowTime).valueOf();
       let timeNumber = (applyTime - nowTime) / 1000;
       time[record.orderId] = setInterval(() => {
         if (timeNumber > 0) {