Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

src/pages/activity/drainage/detailDrainage.jsx

@@ -1,27 +1,27 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import apis from '../../../services/apis';
+import { Form, Button } from 'antd';
+// import { FormattedMessage } from 'umi-plugin-react/locale';
 import moment from 'moment';
 import router from 'umi/router';
-import request from '../../../utils/request'
-import AuthButton from '@/components/AuthButton';
+// import AuthButton from '@/components/AuthButton';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
 
 const cancelPage = () => {
-  router.go(-1)
-}
+  router.go(-1);
+};
 
 const BasicForm = props => {
-  const { drainageId } = props.location.query
-  const [data, setData] = useState({})
+  const { drainageId } = props.location.query;
+  const [data, setData] = useState({});
 
   useEffect(() => {
-    request({...apis.activity.detailDrainage,urlData: { id: drainageId }}).then((data) => {
+    request({ ...apis.activity.detailDrainage, urlData: { id: drainageId } }).then(data => {
       setData(data);
-    })
-  }, [])
+    });
+  }, []);
+
 
-  const Basic = Form.create({ name: 'BasicForm' })(BasicForm);
   const formItemLayout = {
     labelCol: {
       xs: { span: 24 },
@@ -34,54 +34,60 @@ const BasicForm = props => {
   };
   return (
     <>
-      <Form  {...formItemLayout}>
+      <Form {...formItemLayout}>
         <Form.Item label="H5活动编号：">
           <span>{data.drainageId}</span>
         </Form.Item>
         <Form.Item label="是否投放小程序：">
-        <span>{data.isMiniapp ? "是" : "否"}</span>
+          <span>{data.isMiniapp ? '是' : '否'}</span>
         </Form.Item>
         <Form.Item label="H5活动名称：">
-        <span>{data.name}</span>
+          <span>{data.name}</span>
         </Form.Item>
-        {data.isMiniapp && <Form.Item label="链接地址：">
-        <span>{data.h5Address}</span>
-        </Form.Item>}
+        {data.isMiniapp && (
+          <Form.Item label="链接地址：">
+            <span>{data.h5Address}</span>
+          </Form.Item>
+        )}
         <Form.Item label="上架状态：">
-        <span>{data.status === 1 ? "已上架" : "未上架"}</span>
+          <span>{data.status === 1 ? '已上架' : '未上架'}</span>
         </Form.Item>
         <Form.Item label="新建时间：">
-        <span>{moment(data.createDate).format('YYYY-MM-DD HH:mm:ss')}</span>
+          <span>{moment(data.createDate).format('YYYY-MM-DD HH:mm:ss')}</span>
         </Form.Item>
         <Form.Item label="自动下架时间：">
-        <span>{moment(data.endDate).format('YYYY-MM-DD HH:mm:ss')}</span>
+          <span>{moment(data.endDate).format('YYYY-MM-DD HH:mm:ss')}</span>
         </Form.Item>
         <Form.Item label="appid：">
-        <span>{data.appid}</span>
+          <span>{data.appid}</span>
         </Form.Item>
         <Form.Item label="secret：">
-        <span>{data.appSecret}</span>
+          <span>{data.appSecret}</span>
         </Form.Item>
         <Form.Item label="参与人数：">
-        <span>{data.enlistNum}</span>
+          <span>{data.enlistNum}</span>
         </Form.Item>
-        {data.isMiniapp && <Form.Item label="分享语：">
-        <span>{data.shareTitle}</span>
-        </Form.Item>}
-        {data.isMiniapp && <Form.Item label="分享图：">
-        <img src={data.shareImg} width="75px" height="60px" alt="" />
-        </Form.Item>}
-        {data.isMiniapp && <Form.Item label="中间页飞机图：">
-        <img src={data.middleImg} width="75px" height="166.7px" alt="" />
-        </Form.Item>}
+        {data.isMiniapp && (
+          <Form.Item label="分享语：">
+            <span>{data.shareTitle}</span>
+          </Form.Item>
+        )}
+        {data.isMiniapp && (
+          <Form.Item label="分享图：">
+            <img src={data.shareImg} width="75px" height="60px" alt="" />
+          </Form.Item>
+        )}
+        {data.isMiniapp && (
+          <Form.Item label="中间页飞机图：">
+            <img src={data.middleImg} width="75px" height="166.7px" alt="" />
+          </Form.Item>
+        )}
         <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
-          <Button onClick={() => cancelPage()}>
-            取消
-          </Button>
+          <Button onClick={() => cancelPage()}>取消</Button>
         </Form.Item>
       </Form>
     </>
   );
-}
+};
 
-export default BasicForm
+export default BasicForm;

src/pages/indexEcharts/newUsers.jsx

@@ -38,9 +38,9 @@ const header = props => {
   useEffect(() => {
 
     setEndDate(new Date())
-    setStartDate(new Date())
+    setStartDate(moment().subtract(7, 'day').toDate())
     // setStartDate(moment().subtract(7, 'day').toDate())
-    userResource({startDate: new Date(), endDate: new Date()})
+    userResource({startDate: moment().subtract(7, 'day').toDate(), endDate: new Date()})
   }, [])
 
   const { RangePicker } = DatePicker;
@@ -152,8 +152,8 @@ const header = props => {
       borderRadius: '12px',
       minHeight: '60vh'
     }}>
-      <Radio.Group onChange={onChange} buttonStyle="solid" defaultValue="c"  style={{marginBottom:'20px'}}>
-        <Radio.Button value="c" onClick={getDataOf(0)}>今日</Radio.Button>
+      <Radio.Group onChange={onChange} buttonStyle="solid" defaultValue="a"  style={{marginBottom:'20px'}}>
+        {/* <Radio.Button value="c" onClick={getDataOf(0)}>今日</Radio.Button> */}
         <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
         <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
       </Radio.Group>