Merge remote-tracking branch 'origin/main'

src/charts/Customer_care_regular.jsx

@@ -11,7 +11,6 @@ import { flow } from 'mobx';
 const Customer_care_regular = () => {
   const { orders_store, date_picker_store, customer_store } = useContext(stores_Context);
   const regular_data = customer_store.regular_data;
-  const [isCompareLine, setIsCompareLine] = useState(false);
 
   // useEffect(() => {}, []);
 
@@ -36,7 +35,7 @@ const Customer_care_regular = () => {
               customer_store.setSearchValues(obj, form, 'regular_data');
               regular_data.data_compare=[];
               if (obj.DateDiff1 && obj.DateDiff2){
-                setIsCompareLine(true);
+                regular_data.isCompareLine=true;
                 regular_data.showSum=false;
                 await customer_store.regular_customer_order();
                 customer_store.regular_customer_order(false,true);
@@ -44,7 +43,7 @@ const Customer_care_regular = () => {
                 customer_store.regular_customer_order(true,true,true);
               }
               else{
-                setIsCompareLine(false);
+                regular_data.isCompareLine=false;
                 regular_data.showSum=true;
                 customer_store.regular_customer_order();
                 customer_store.regular_customer_order(true);
@@ -117,7 +116,7 @@ const Customer_care_regular = () => {
 
         <Col span={24}>
           <LineWithAvg dataSource={regular_data.pivotData} loading={regular_data.detail_loading} xField={regular_data.pivotX} yField={regular_data.pivotY} 
-          seriesField='_ylabel' showSUM={regular_data.showSum} solidLineTime={regular_data.solidLineTime} solidLineDash={regular_data.solidLineDash} isCompareLine={isCompareLine}/>
+          seriesField='_ylabel' showSUM={regular_data.showSum} solidLineTime={regular_data.solidLineTime} solidLineDash={regular_data.solidLineDash} isCompareLine={regular_data.isCompareLine}/>
         </Col>
 
         <Col span={24}>

src/stores/CustomerStore.js

@@ -291,6 +291,7 @@ class CustomerStore {
         showSum:true,
         solidLineTime:'',
         solidLineDash:'老客户推荐',
+        isCompareLine:false,
         total_data_tips: '',
         webcode: 'ALL',
         site_select_mode: 'multiple',// 站点是否多选