diff --git a/src/App.css b/src/App.css
index e9e982f..1acdfbf 100644
--- a/src/App.css
+++ b/src/App.css
@@ -34,3 +34,10 @@
 .p-s1{
     padding: .5em;
 }
+
+.sticky-top{
+    margin: -16px -8px .5em -8px;
+    position: sticky;
+    top: 0;
+    z-index: 100;
+}
diff --git a/src/charts/Customer_care_inchina.jsx b/src/charts/Customer_care_inchina.jsx
index 2240454..135492c 100644
--- a/src/charts/Customer_care_inchina.jsx
+++ b/src/charts/Customer_care_inchina.jsx
@@ -17,7 +17,7 @@ const Customer_care_inchina = () => {
 
     return (
         <div>
-        <Row gutter={16} style={{ margin: '-16px -8px', position: 'relative', top: 0, zIndex: 10 }}>
+        <Row gutter={16} className='sticky-top'>
           <Col className="gutter-row" span={24}>
             <SearchForm
               defaultValue={{
@@ -39,6 +39,8 @@ const Customer_care_inchina = () => {
               }}
             />
           </Col>
+          </Row>
+          <Row gutter={16} >
                 <Col span={24}>
                     <h2>在华客人</h2>
                 </Col>
diff --git a/src/charts/Customer_care_potential.jsx b/src/charts/Customer_care_potential.jsx
index 48955a8..7a10c4b 100644
--- a/src/charts/Customer_care_potential.jsx
+++ b/src/charts/Customer_care_potential.jsx
@@ -16,9 +16,9 @@ const Customer_care_potential = () => {
 
     return (
         <div>
-        <Row gutter={16} style={{ margin: '-16px -8px', position: 'relative', top: 0, zIndex: 10 }}>
+        <Row gutter={16} className='sticky-top'>
           <Col className="gutter-row" span={24}>
-            <SearchForm
+            <SearchForm className='sticky-top'
               defaultValue={{
                 initialValue: {
                   ...date_picker_store.formValues,
@@ -38,6 +38,8 @@ const Customer_care_potential = () => {
               }}
             />
           </Col>
+          </Row>
+        <Row gutter={16} >
                 <Col span={24}>
                     <h2>潜力客户</h2>
                 </Col>
diff --git a/src/charts/Customer_care_regular.jsx b/src/charts/Customer_care_regular.jsx
index 2f11da0..9032bff 100644
--- a/src/charts/Customer_care_regular.jsx
+++ b/src/charts/Customer_care_regular.jsx
@@ -1,175 +1,184 @@
-import React, {useContext, useEffect} from 'react';
-import {Row, Col, Divider, Table} from 'antd';
-import {utils, writeFileXLSX} from 'xlsx';
-import {stores_Context} from '../config';
-import {observer} from 'mobx-react';
+import React, { useContext, useEffect } from 'react';
+import { Row, Col, Divider, Table } from 'antd';
+import { utils, writeFileXLSX } from 'xlsx';
+import { stores_Context } from '../config';
+import { observer } from 'mobx-react';
 import SearchForm from './../components/search/SearchForm';
 
 const Customer_care_regular = () => {
+  const { orders_store, date_picker_store, customer_store } = useContext(stores_Context);
+  const regular_data = customer_store.regular_data;
 
-    const {orders_store, date_picker_store, customer_store} = useContext(stores_Context);
-    const regular_data = customer_store.regular_data;
+  useEffect(() => {}, []);
 
-    useEffect(() => {
-
-    }, []);
-
-
-    return (
-        <div>
-        <Row gutter={16} style={{ margin: '-16px -8px', position: 'relative', top: 0, zIndex: 10 }}>
-          <Col className="gutter-row" span={24}>
-            <SearchForm
-              defaultValue={{
-                initialValue: {
-                  ...date_picker_store.formValues,
-                  ...regular_data.searchValues,
-                },
-                shows: ['DateType', 'DepartmentList', 'WebCode', 'dates'],
-                fieldProps: {
-                  DepartmentList: { show_all: false, mode: 'multiple' },
-                  WebCode: { show_all: false, mode: 'multiple' },
-                  dates: { hide_vs: true },
-                },
-              }}
-              onSubmit={(_err, obj, form, str) => {
-                customer_store.setSearchValues(obj, form, 'regular_data');
-                customer_store.regular_customer_order();
-                customer_store.regular_customer_order(true);
+  return (
+    <div>
+      <Row gutter={16} className="sticky-top">
+        <Col className="gutter-row" span={24}>
+          <SearchForm
+            defaultValue={{
+              initialValue: {
+                ...date_picker_store.formValues,
+                ...regular_data.searchValues,
+              },
+              shows: ['DateType', 'DepartmentList', 'WebCode', 'dates'],
+              fieldProps: {
+                DepartmentList: { show_all: false, mode: 'multiple' },
+                WebCode: { show_all: false, mode: 'multiple' },
+                dates: { hide_vs: true },
+              },
+            }}
+            onSubmit={(_err, obj, form, str) => {
+              customer_store.setSearchValues(obj, form, 'regular_data');
+              customer_store.regular_customer_order();
+              customer_store.regular_customer_order(true);
+            }}
+          />
+        </Col>
+      </Row>
+      <Row gutter={16}>
+        <Col span={24}>
+          <h2>老客户</h2>
+        </Col>
+        <Col span={24}>
+          <Table
+            dataSource={regular_data.data}
+            loading={regular_data.loading}
+            columns={[
+              {
+                title: '统计条目',
+                dataIndex: 'ItemName',
+                key: 'ItemName',
+              },
+              {
+                title: '订单数',
+                dataIndex: 'OrderNum',
+                key: 'OrderNum',
+              },
+              {
+                title: '成行数',
+                dataIndex: 'SUCOrderNum',
+                key: 'SUCOrderNum',
+              },
+              {
+                title: '成行率',
+                dataIndex: 'SUCRate',
+                key: 'SUCRate',
+                render: (text, record) => <span>{Math.round(text * 100)}%</span>,
+              },
+              {
+                title: '毛利',
+                dataIndex: 'ML',
+                key: 'ML',
+              },
+              {
+                title: '人数（含成人+儿童）',
+                dataIndex: 'PersonNum',
+                key: 'PersonNum',
+              },
+            ]}
+            size="small"
+            pagination={false}
+            rowKey={(record) => record.ItemName}
+          />
+        </Col>
+        <Col span={24}>
+          <Divider orientation="right" plain>
+            <a
+              onClick={() => {
+                const wb = utils.table_to_book(document.getElementById('table_to_xlsx').getElementsByTagName('table')[0]);
+                writeFileXLSX(wb, '老客户.xlsx');
               }}
-            />
-          </Col>
-                <Col span={24}>
-                    <h2>老客户</h2>
-                </Col>
-                <Col span={24}>
-                    <Table dataSource={regular_data.data} loading={regular_data.loading} columns={
-                        [
-                            {
-                                title: '统计条目',
-                                dataIndex: 'ItemName',
-                                key: 'ItemName',
-                            },
-                            {
-                                title: '订单数',
-                                dataIndex: 'OrderNum',
-                                key: 'OrderNum',
-                            },
-                            {
-                                title: '成行数',
-                                dataIndex: 'SUCOrderNum',
-                                key: 'SUCOrderNum',
-                            },
-                            {
-                                title: '成行率',
-                                dataIndex: 'SUCRate',
-                                key: 'SUCRate',
-                                render: (text, record) => <span>{Math.round(text * 100)}%</span>
-                            },
-                            {
-                                title: '毛利',
-                                dataIndex: 'ML',
-                                key: 'ML',
-                            },
-                            {
-                                title: '人数（含成人+儿童）',
-                                dataIndex: 'PersonNum',
-                                key: 'PersonNum',
-                            },
-                        ]
-                    } size="small" pagination={false} rowKey={record => record.ItemName}
-                    />
-                </Col>
-                <Col span={24}>
-                    <Divider orientation="right" plain><a
-                        onClick={() => {
-                            const wb = utils.table_to_book(document.getElementById("table_to_xlsx").getElementsByTagName('table')[0]);
-                            writeFileXLSX(wb, "老客户.xlsx");
-                        }}>导出excel</a></Divider>
-                    <Table id="table_to_xlsx" pagination={false} loading={regular_data.loading} dataSource={regular_data.data_detail} scroll={{x: 1200 }} columns={
-                        [
-                            {
-                                title: '订单号',
-                                dataIndex: 'COLI_ID',
-                                key: 'COLI_ID',
-                            },
-                            {
-                                title: '预定日期',
-                                dataIndex: 'COLI_ApplyDate',
-                                key: 'COLI_ApplyDate',
-                            },
-                            {
-                                title: '订单状态',
-                                dataIndex: 'OrderState',
-                                key: 'OrderState',
-                                render: (text, record) => <span>{text == 1 ? '成行' : '未成行'}</span>,
-                                sorter: (a, b) => b.OrderState - a.OrderState,
-                            },
-                            {
-                                title: '毛利',
-                                dataIndex: 'ML',
-                                key: 'ML',
-                            },
-                            {
-                                title: '人数',
-                                dataIndex: 'PersonNum',
-                                key: 'PersonNum',
-                            },
-                            {
-                                title: '天数',
-                                dataIndex: 'COLI_Days',
-                                key: 'COLI_Days',
-                            },
-                            {
-                                title: '人天数',
-                                dataIndex: 'CGI_PersonDays',
-                                key: 'CGI_PersonDays',
-                            },
-                            {
-                                title: '走团日期',
-                                dataIndex: 'COLI_OrderStartDate',
-                                key: 'COLI_OrderStartDate',
-                            },
-                            {
-                                title: '小组',
-                                dataIndex: 'Department',
-                                key: 'Department',
-                            },
-                            {
-                                title: '老客户',
-                                dataIndex: 'COLI_IsOld',
-                                key: 'COLI_IsOld',
-                            },
-                            {
-                                title: '老客户推荐',
-                                dataIndex: 'COLI_IsCusCommend',
-                                key: 'COLI_IsCusCommend',
-                            },
-                            {
-                                title: '网站',
-                                dataIndex: 'COLI_WebCode',
-                                key: 'COLI_WebCode',
-                            },
-                            {
-                                title: '来源',
-                                dataIndex: 'SourceType',
-                                key: 'SourceType',
-                            },
-                            {
-                                title: '在华',
-                                dataIndex: 'ZH',
-                                key: 'ZH',
-                            },
-                        ]
-                    } size="small"
-                           rowKey={record => record.COLI_ID}
-                    />
-                </Col>
-            </Row>
-
-        </div>
-    );
-
+            >
+              导出excel
+            </a>
+          </Divider>
+          <Table
+            id="table_to_xlsx"
+            pagination={false}
+            loading={regular_data.loading}
+            dataSource={regular_data.data_detail}
+            scroll={{ x: 1200 }}
+            columns={[
+              {
+                title: '订单号',
+                dataIndex: 'COLI_ID',
+                key: 'COLI_ID',
+              },
+              {
+                title: '预定日期',
+                dataIndex: 'COLI_ApplyDate',
+                key: 'COLI_ApplyDate',
+              },
+              {
+                title: '订单状态',
+                dataIndex: 'OrderState',
+                key: 'OrderState',
+                render: (text, record) => <span>{text == 1 ? '成行' : '未成行'}</span>,
+                sorter: (a, b) => b.OrderState - a.OrderState,
+              },
+              {
+                title: '毛利',
+                dataIndex: 'ML',
+                key: 'ML',
+              },
+              {
+                title: '人数',
+                dataIndex: 'PersonNum',
+                key: 'PersonNum',
+              },
+              {
+                title: '天数',
+                dataIndex: 'COLI_Days',
+                key: 'COLI_Days',
+              },
+              {
+                title: '人天数',
+                dataIndex: 'CGI_PersonDays',
+                key: 'CGI_PersonDays',
+              },
+              {
+                title: '走团日期',
+                dataIndex: 'COLI_OrderStartDate',
+                key: 'COLI_OrderStartDate',
+              },
+              {
+                title: '小组',
+                dataIndex: 'Department',
+                key: 'Department',
+              },
+              {
+                title: '老客户',
+                dataIndex: 'COLI_IsOld',
+                key: 'COLI_IsOld',
+              },
+              {
+                title: '老客户推荐',
+                dataIndex: 'COLI_IsCusCommend',
+                key: 'COLI_IsCusCommend',
+              },
+              {
+                title: '网站',
+                dataIndex: 'COLI_WebCode',
+                key: 'COLI_WebCode',
+              },
+              {
+                title: '来源',
+                dataIndex: 'SourceType',
+                key: 'SourceType',
+              },
+              {
+                title: '在华',
+                dataIndex: 'ZH',
+                key: 'ZH',
+              },
+            ]}
+            size="small"
+            rowKey={(record) => record.COLI_ID}
+          />
+        </Col>
+      </Row>
+    </div>
+  );
 };
 export default observer(Customer_care_regular);
-
diff --git a/src/components/DateGroupRadio/date.js b/src/components/DateGroupRadio/date.js
index c45e03f..8b249a1 100644
--- a/src/components/DateGroupRadio/date.js
+++ b/src/components/DateGroupRadio/date.js
@@ -154,5 +154,5 @@ export const resultDataCb = (dataRaw, dateGroup, { data1, data2 }, fieldMapper,
   const retData = [].concat(parseData1, reindexData2 ).map(ele => ({...ele, [fieldMapper.dateKey]: data1KeyMappedStr[ele[fieldMapper.dateKey]] || data2KeyMappedStr[ele[fieldMapper.dateKey]]}));
   const avg1 = parse1.avgVal;
   // console.log('callback', dateGroup, retData, data1KeyMappedStr, data2KeyMappedStr);
-  cb(dateGroup, retData, avg1);
+  cb(dateGroup, retData, avg1, parse2.avgVal);
 };
diff --git a/src/views/AgentGroupCount.jsx b/src/views/AgentGroupCount.jsx
index f685e2e..07b6e69 100644
--- a/src/views/AgentGroupCount.jsx
+++ b/src/views/AgentGroupCount.jsx
@@ -19,7 +19,7 @@ const AgentGroupCount = () => {
   return (
     <>
       <Space direction="vertical" style={{ width: '100%' }}>
-        <Row gutter={16} style={{ margin: '-16px -8px', position: 'relative', top: 0, zIndex: 10 }}>
+        <Row gutter={16} className='sticky-top' >
           <Col className="gutter-row" span={24}>
             <SearchForm
               defaultValue={{
diff --git a/src/views/DestinationGroupCount.jsx b/src/views/DestinationGroupCount.jsx
index 818266b..4688ab9 100644
--- a/src/views/DestinationGroupCount.jsx
+++ b/src/views/DestinationGroupCount.jsx
@@ -15,7 +15,7 @@ const DestinationGroupCount = () => {
   return (
     <>
       <Space direction="vertical" style={{ width: '100%' }}>
-        <Row gutter={16} style={{ margin: '-16px -8px', position: 'relative', top: 0, zIndex: 10 }}>
+        <Row gutter={16} className='sticky-top'>
           <Col className="gutter-row" span={24}>
             <SearchForm
               defaultValue={{
diff --git a/src/views/Distribution.jsx b/src/views/Distribution.jsx
index b7477b3..44dddc6 100644
--- a/src/views/Distribution.jsx
+++ b/src/views/Distribution.jsx
@@ -174,7 +174,7 @@ export default observer(() => {
   };
   return (
     <>
-      <Row gutter={16} style={{ margin: '-16px -8px' }}>
+      <Row gutter={16} className='sticky-top' >
         <Col className="gutter-row" span={24}>
           <SearchForm
             defaultValue={{
diff --git a/src/views/Home.jsx b/src/views/Home.jsx
index 0f0987b..22d87b2 100644
--- a/src/views/Home.jsx
+++ b/src/views/Home.jsx
@@ -162,8 +162,7 @@ export default observer(() => {
   };
   return (
     <>
-      <Row gutter={16} style={{ margin: '-16px -8px', position: 'sticky', top: 0, zIndex: 10 }}>
-        {/* style={{ margin: '-16px -8px', padding: 0 }} */}
+      <Row gutter={16} className='sticky-top' >
         <Col className="gutter-row" span={24}>
           <SearchForm
             defaultValue={{
diff --git a/src/views/Orders.jsx b/src/views/Orders.jsx
index aecbc1b..01b3f32 100644
--- a/src/views/Orders.jsx
+++ b/src/views/Orders.jsx
@@ -323,7 +323,7 @@ class Orders extends Component {
 
     return (
       <div>
-        <Row gutter={16} style={{ margin: '-16px -8px', position: 'relative', top: 0, zIndex: 10 }}>
+        <Row gutter={16} className='sticky-top' >
           <Col className="gutter-row" span={24}>
             <SearchForm
               defaultValue={{
@@ -345,6 +345,8 @@ class Orders extends Component {
               }}
             />
           </Col>
+        </Row>
+        <Row gutter={[16, { sm: 16, lg: 32 }]}>
           <Col span={24} style={{ textAlign: 'right' }}>
             <DateGroupRadio
               visible={data_source.length !== 0}
@@ -355,9 +357,6 @@ class Orders extends Component {
               fieldMapper={orders_store.orderCountDataFieldMapper}
             />
           </Col>
-        </Row>
-
-        <Row gutter={[16, { sm: 16, lg: 32 }]}>
           <Col span={24}>
             <Spin spinning={orders_store.loading}>
               <Line {...config} />
diff --git a/src/views/Orders_sub.jsx b/src/views/Orders_sub.jsx
index f911fdd..5f24d28 100644
--- a/src/views/Orders_sub.jsx
+++ b/src/views/Orders_sub.jsx
@@ -262,7 +262,7 @@ const Orders_sub = () => {
   };
 	return (
     <div>
-      <Row gutter={{ sm: 16, lg: 32 }}>
+      <Row gutter={{ sm: 16, lg: 32 }} className="sticky-top">
         <Col md={24} lg={12} xxl={14}>
           <NavLink to={`/orders`}>返回</NavLink>
         </Col>
@@ -286,6 +286,9 @@ const Orders_sub = () => {
             }}
           />
         </Col>
+      </Row>
+
+      <Row gutter={[16, { xs: 8, sm: 16, md: 24, lg: 32 }]}>
         <Col span={24} style={{ textAlign: 'right' }}>
           <DateGroupRadio
             visible={data_source.length !== 0}
@@ -296,9 +299,6 @@ const Orders_sub = () => {
             fieldMapper={orders_store.orderCount_type_dateRadio.orderCountDataFieldMapper}
           />
         </Col>
-      </Row>
-
-      <Row gutter={[16, { xs: 8, sm: 16, md: 24, lg: 32 }]}>
         <Col className="gutter-row" span={24}>
           <Line {...line} />
         </Col>
diff --git a/src/views/Sale.jsx b/src/views/Sale.jsx
index 4375b67..8c1c564 100644
--- a/src/views/Sale.jsx
+++ b/src/views/Sale.jsx
@@ -205,7 +205,7 @@ const Sale = () => {
 
   return (
     <div>
-    <Row gutter={16} style={{ margin: '-16px -8px', position: 'relative', top: 0, zIndex: 10 }}>
+    <Row gutter={16} className='sticky-top' >
       <Col className="gutter-row" span={24}>
         <SearchForm
           defaultValue={{
diff --git a/src/views/Sale_KPI.jsx b/src/views/Sale_KPI.jsx
index 84caf2f..d8b48fd 100644
--- a/src/views/Sale_KPI.jsx
+++ b/src/views/Sale_KPI.jsx
@@ -105,7 +105,7 @@ const Sale_KPI = () => {
   const lineConfig = { appendPadding: 10, xField: 'groupDateVal', yField: 'SumML', seriesField: 'groupsLabel', isGroup: true, smooth: true, meta: comm.cloneDeep(dataFieldAlias), };
   return (
     <div>
-      <Row gutter={16} style={{ margin: '-16px -8px' }}>
+      <Row gutter={16} className='sticky-top' >
         <Col md={24} lg={24} xxl={24}>
           <SearchForm
             defaultValue={{