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

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/add/schema.tsx

@@ -27,7 +27,15 @@ const schema: ISchema = {
             name: {
               type: 'string',
               title: `${intl.formatMessage({ id: 'activePage.activityPageName'})}`,
-              required: true,
+              "x-rules": [
+                {
+                  required: true
+                },
+                {
+                  limitByte: true,
+                  maxByte: 60,
+                }
+              ]
             },
             environment: {
               type: 'string',

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Layouts/CommodityList/tabFooter.tsx

 import React, { useMemo } from 'react';
 import styles from './tabFooter.less';
-import { useIntl} from 'umi'
+import { getIntl } from 'umi'
 
+const intl = getIntl()
 
 interface Iprops {
   originalPrice: number,
@@ -9,7 +10,7 @@ interface Iprops {
 }
 
 const TabFooter: React.FC<Iprops> = (props: Iprops) => {
-  const intl = useIntl();
+  // const intl = useIntl();
   const { discountPrice, originalPrice } = props;
   const cacheDiscountPrice = useMemo(() => discountPrice?.toString().split("."), [discountPrice])
   return (

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/index.less

@@ -5,7 +5,7 @@
   flex-direction: row;
 
   .searchPannel {
-    width: 320px;
+    width: 236px;
     background-color: #fff;
     border-radius: 8px;
   }

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/index.tsx

@@ -65,14 +65,14 @@ const ActivePage = () => {
   };
 
   useEffect(() => {
-    getData({ ...debouncedValue, name: searchInput });
+    getData({ ...debouncedValue, name: searchInput } as unknown as GetTemplateWebActivityPagePageRequest);
 
   }, [debouncedValue]);
 
   const handleRemove = async (id: number) => {
     const { data, code } = await postTemplateWebActivityPageDelete({ id });
     if (code === 1000) {
-      getData({ ...debouncedValue, name: searchInput });
+      getData({ ...debouncedValue, name: searchInput } as unknown as GetTemplateWebActivityPagePageRequest );
     }
   };
 
@@ -82,7 +82,7 @@ const ActivePage = () => {
       status,
     });
     if (code === 1000) {
-      getData({ ...debouncedValue, name: searchInput });
+      getData({ ...debouncedValue, name: searchInput } as unknown as GetTemplateWebActivityPagePageRequest);
     }
   };
 
@@ -91,7 +91,7 @@ const ActivePage = () => {
   };
 
   const handleSearch = () => {
-    getData({ ...debouncedValue, name: searchInput });
+    getData({ ...debouncedValue, name: searchInput } as any);
   };
 
   return (
@@ -104,12 +104,9 @@ const ActivePage = () => {
           <div className={styles.search}>
             <Search placeholder={intl.formatMessage({ id: 'activityPage.searchshousuo' })} onChange={(e) => onChange(e.target.value)} onSearch={handleSearch} />
           </div>
-
           <Link to='/memberCenter/marketingAbility/activityPages/management/add'>
             <Button icon={<PlusOutlined />} type="primary">{intl.formatMessage({ id: 'activityPage.add' })}</Button>
           </Link>
-
-
         </div>
         <Spin spinning={loading} wrapperClassName={styles.body}>
           <div className={styles.table}>

src/pages/transaction/marketingAbility/selfManagement/detail/index.tsx

@@ -48,7 +48,7 @@ const DetialLayout = () => {
       {
         col: [
           { label: `${intl.formatMessage({ id: 'selfManagement.activityID'})}`, extra: data.id },
-          { label: `${intl.formatMessage({ id: 'selfManagement.externalState'})}`, extra: data.outerStatusName },
+          // { label: `${intl.formatMessage({ id: 'selfManagement.externalState'})}`, extra: data.outerStatusName },
           { label: `${intl.formatMessage({ id: 'selfManagement.internalState'})}`, extra: data.innerStatusName },
         ]
       },

src/pages/transaction/purchaseAbility/purchaseInquiry/addInquiry/components/condition.tsx

@@ -125,7 +125,9 @@ const Condition: React.FC<Iprops> = (props: any) => {
               rules={[{ required: true, message: intl.formatMessage({ id: 'detail.purchase.message38' }) }]}
             >
               <DatePicker
+                showTime={{ format: 'HH:mm' }}
                 style={{ width: '100%' }}
+                format={"YYYY-MM-DD HH:mm"}
                 disabledDate={(current) => current && current < moment().startOf('day')}
                 onChange={(val) => deliveryTimeChange(val)}
               />
@@ -149,6 +151,7 @@ const Condition: React.FC<Iprops> = (props: any) => {
               rules={[{ required: true, message: intl.formatMessage({ id: 'detail.purchase.message39' }) }]}
             >
               <DatePicker
+                showTime={{ format: 'HH:mm' }}
                 style={{ width: '100%' }}
                 format={"YYYY-MM-DD HH:mm"}
                 disabledDate={(current) => current && current < moment().startOf('day')}