Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

src/pages/contract/manage/editing/components/Information.tsx

@@ -30,6 +30,8 @@ const Information = (props: any) => {
             const rangePicker = [];
             let startTime = moment(basic.startTime)
             let endTime = moment(basic.endTime);
+            setstartTime(basic.startTime)
+            setendTime(basic.endTime)
             rangePicker.push(startTime, endTime);
             basic.rangePicker = rangePicker;
             attrValueForm.setFieldsValue(basic)
@@ -40,6 +42,8 @@ const Information = (props: any) => {
         const rangePicker = [];
         let startTime = moment(basic.startTime)
         let endTime = moment(basic.endTime);
+        setstartTime(basic.startTime)
+        setendTime(basic.endTime)
         rangePicker.push(startTime, endTime);
         basic.rangePicker = rangePicker;
         attrValueForm.setFieldsValue(basic)

src/pages/transaction/marketingAbility/merchantCoupon/merchantCouponAnalysis/deliver/index.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-06-28 17:51:33
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-08-02 16:49:28
+ * @LastEditTime: 2021-08-03 17:33:46
  * @Description: 商家优惠劵发劵
  */
 import React, { useState, useEffect, useRef } from 'react';
@@ -23,7 +23,7 @@ import { GetMarketingCouponWaiteExecuteGrantGetResponse } from '@/services/Marke
 import AnchorPage from '@/layouts/AnchorPage';
 import BacisInfo from '../../components/BacisInfo';
 import CouponRules from '../../components/CouponRules';
-import DeliverCoupon, { SuitableMemberType, ChangeValueItem } from '../../components/DeliverCoupon';
+import DeliverCoupon, { ChangeValueItem } from '../../components/DeliverCoupon';
 
 const MerchantCouponAnalysisDeliver: React.FC<{}> = () => {
   const { id } = usePageStatus();
@@ -53,7 +53,7 @@ const MerchantCouponAnalysisDeliver: React.FC<{}> = () => {
     getBasicInfo();
   }, []);
 
-  const handleDeliverChange = (value: SuitableMemberType[]) => {
+  const handleDeliverChange = (value: ChangeValueItem[]) => {
     deliverRef.current = value;
   };
 

src/pages/transaction/marketingAbility/merchantCoupon/merchantCouponQuery/schema.ts

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-06-22 14:37:24
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-07-01 16:48:15
+ * @LastEditTime: 2021-08-03 18:29:16
  * @Description: 
  */
 import { ISchema } from '@formily/antd';
@@ -26,11 +26,12 @@ export const querySchema: ISchema = {
         },
         [FORM_FILTER_PATH]: {
           type: 'object',
-          'x-component': 'flex-layout',
+          'x-component': 'mega-layout',
           'x-component-props': {
-            colStyle: {
-              marginLeft: 20,
-            },
+            grid: true,
+            full: true,
+            columns: 4,
+            autoRow: true,
           },
           properties: {
             id: {
@@ -43,7 +44,7 @@ export const querySchema: ISchema = {
                 },
               },
             },
-            '[releaseTimeStart, releaseTimeStart]': {
+            '[releaseTimeStart, releaseTimeEnd]': {
               type: 'object',
               'x-component': 'RangePicker',
               'x-component-props': {
@@ -51,7 +52,7 @@ export const querySchema: ISchema = {
                 showTime: true,
               },
             },
-            '[effectiveTimeStart, effectiveTimeStart]': {
+            '[effectiveTimeStart, effectiveTimeEnd]': {
               type: 'object',
               'x-component': 'RangePicker',
               'x-component-props': {