merge

package.json

@@ -30,6 +30,7 @@
     "@umijs/hooks": "^1.9.3",
     "@umijs/preset-react": "1.x",
     "@umijs/test": "^3.2.0",
+    "bizcharts": "^4.0.13",
     "braft-editor": "^2.3.9",
     "classnames": "^2.2.6",
     "core-js": "^3.6.5",

src/pages/member/components/auditList.tsx

@@ -196,7 +196,22 @@ const auditList: React.FC<PageProps> = props => {
 
   // 初始化高级筛选选项
   const fetchSearchItems = async () => {
-    const { data } = await PublicApi.getMemberValidateCommitPageitems();
+    let result;
+    switch (pageType) {
+      case '1':
+        result = await PublicApi.getMemberValidateCommitPageitems();
+        break;
+      case '2':
+        result = await PublicApi.getMemberValidateStep1Pageitems();
+        break;
+      case '3':
+        result = await PublicApi.getMemberValidateStep2Pageitems();
+        break;
+      case '4':
+        result = await PublicApi.getMemberValidateConfirmPageitems();
+        break;
+    }
+    const { data } = result;
     defaultColumns.find(target => {
       switch (target.key) {
         case 'memberStatus':

src/pages/member/memberMaintain/component/levelDetail.tsx

@@ -2,6 +2,7 @@ import React, { useState } from 'react';
 import { Row, Col, Progress, Form, Input } from 'antd';
 import { StandardTable } from 'god';
 import { ColumnType } from 'antd/lib/table/interface';
+import { Chart, LineAdvance } from 'bizcharts';
 import styles from '../index.less';
 
 interface PageProps {
@@ -11,6 +12,70 @@ interface PageProps {
 const LevelDetail: React.FC<PageProps> = props => {
   const { detailData } = props;
 
+  // 数据源
+  const data = [
+    {
+      month: 'Jan',
+      city: 'Tokyo',
+      temperature: 7,
+    },
+    {
+      month: 'Feb',
+      city: 'Tokyo',
+      temperature: 13,
+    },
+    {
+      month: 'Mar',
+      city: 'Tokyo',
+      temperature: 16.5,
+    },
+    {
+      month: 'Apr',
+      city: 'Tokyo',
+      temperature: 14.5,
+    },
+    {
+      month: 'May',
+      city: 'Tokyo',
+      temperature: 10,
+    },
+    {
+      month: 'Jun',
+      city: 'Tokyo',
+      temperature: 7.5,
+    },
+    {
+      month: 'Jul',
+      city: 'Tokyo',
+      temperature: 9.2,
+    },
+    {
+      month: 'Aug',
+      city: 'Tokyo',
+      temperature: 14.5,
+    },
+    {
+      month: 'Sep',
+      city: 'Tokyo',
+      temperature: 9.3,
+    },
+    {
+      month: 'Oct',
+      city: 'Tokyo',
+      temperature: 8.3,
+    },
+    {
+      month: 'Nov',
+      city: 'Tokyo',
+      temperature: 8.9,
+    },
+    {
+      month: 'Dec',
+      city: 'Tokyo',
+      temperature: 5.6,
+    },
+  ];
+
   return (
     <Row>
       <Col className={styles['mainCol']} span={24}>
@@ -57,7 +122,22 @@ const LevelDetail: React.FC<PageProps> = props => {
             </div>
           </div>
           <div className={styles['mainCol-chart-main']}>
-            <div className={styles['mainCol-chart-main-line']}>line</div>
+            <div className={styles['mainCol-chart-main-line']}>
+              <Chart
+                padding={[10, 20, 50, 40]}
+                autoFit
+                height={300}
+                data={data}
+              >
+                <LineAdvance
+                  shape="smooth"
+                  point
+                  area
+                  position="month*temperature"
+                  color="city"
+                />
+              </Chart>
+            </div>
           </div>
         </div>
       </Col>

src/pages/member/memberMaintain/index.less

@@ -149,8 +149,7 @@
       width: 30%;
 
       &:nth-last-of-type(1) {
-        width           : 70%;
-        background-color: greenyellow
+        width: 70%;
       }
 
       &-card1 {

src/utils/request.ts

@@ -47,7 +47,11 @@ const errorHandler = (error: ResponseError): IRequestError => {
 
 const defaultHeaders = {
   'Content-Type': 'Application/json',
+<<<<<<< HEAD
   'token': 'dc588fc8816f473441354aa61d90212e',
+=======
+  'token': 'lingxineverexpireadmintoken',
+>>>>>>> 7d27ce179393a31fe2f94b1ca72d2be760b3674d
   'source': '99'
 }