Merge branch 'v2-220518' into 'v2-220518'

src/locales/en-US/marketingAbility/selfManagement.ts

@@ -271,4 +271,5 @@ export default {
     "selfManagement.bixudayu0zuiduobaoliu3wei": "Keep a maximum of 3 decimal places, which is greater than 0 and cannot be empty",
     "selfManagement.rejectmin1":"Keep a maximum of 1 decimal place, greater than 0 and less than 100, and cannot be empty",
     "selfManagement.di": 'The First',
+    'selfManagement.jietijiagejiaoyan': '{data} ladders must be greater or less than other {data} ladders'
 }

src/locales/ko-KR/marketingAbility/selfManagement.ts

@@ -271,4 +271,5 @@ export default {
   "selfManagement.bixudayu0zuiduobaoliu3wei": "최대 3자리의 소수를 0보다 크게 유지하며 비워둘 수 없습니다.",
   "selfManagement.rejectmin1": "0보다 크고 100보다 작은 소수 자릿수를 최대 1자리까지 유지하며 null이 될 수 없습니다.",
   "selfManagement.di": '제',
+  'selfManagement.jietijiagejiaoyan': '{data}래더는 다른 {data} 래더보다 크거나 작아야 합니다.'
 }

src/locales/zh-CN/marketingAbility/selfManagement.ts

@@ -271,4 +271,5 @@ export default {
     "selfManagement.bixudayu0zuiduobaoliu3wei": "最多保留3位小数，大于0，不可为空",
     "selfManagement.rejectmin1":"最多保留1位小数，大于0且小于100，不可为空",
     "selfManagement.di": '第',
+    'selfManagement.jietijiagejiaoyan': '{data}阶梯必须大于或小于其他{data}阶梯'
 }

src/pages/transaction/marketingAbility/components/listModalLayout/index.tsx

@@ -145,10 +145,17 @@ const ListModalLayout: React.FC<ListModalLayoutProps> = (props: any) => {
       }
       let limitValue: number[] = [];
       dataSource.forEach(_item => {
+        // 15：套餐活动
+        if (isGift === 15) {
+          limitValue.push(_item.groupPrice)
+        } else {
           limitValue.push(_item.limitValue)
+        }
+
       })
+      console.log(isGift, 'limitValue', dataSource)
       if ((new Set(limitValue)).size !== limitValue.length) {
-        message.error( `${remind.label[1]}阶梯必须大于或小于其他${remind.label[1]}阶梯`)
+        message.error(intl.formatMessage({ id: 'selfManagement.jietijiagejiaoyan', defaultMessage: '{data}阶梯必须大于或小于其他{data}阶梯' }, { data: remind.label[1] }))
       } else {
         onConfirm(dataSource)
       }

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

@@ -10,7 +10,7 @@ import { format } from '@/pages/transaction/common/dateFormat';
 import StatusTag from '@/components/StatusTag';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { useLinkageUtils } from '@/utils/formEffectUtils';
-import { FormEffectHooks } from '@formily/react';
+import { FormEffectHooks } from '@formily/antd';
 import { InnerStatusColor, OuterStatusColor } from '../../common/tagColor';
 import { getMarketingMerchantActivityGetActivityTypeList, getMarketingMerchantActivityPageExamineStep1, postMarketingMerchantActivityExamineStep1Batch } from '@/services/MarketingV2Api';
 import { PATTERN_MAPS } from '@/constants/regExp';

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

@@ -9,7 +9,7 @@ import { format } from '@/pages/transaction/common/dateFormat';
 import StatusTag from '@/components/StatusTag';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { useLinkageUtils } from '@/utils/formEffectUtils';
-import { FormEffectHooks } from '@formily/react';
+import { FormEffectHooks } from '@formily/antd';
 import { InnerStatusColor, OuterStatusColor } from '../../common/tagColor';
 import { getMarketingMerchantActivityGetActivityTypeList, getMarketingMerchantActivityPageExamineStep2, postMarketingMerchantActivityExamineStep2Batch } from '@/services/MarketingV2Api';
 import { PATTERN_MAPS } from '@/constants/regExp';

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

@@ -8,7 +8,7 @@ import { format } from '@/pages/transaction/common/dateFormat';
 import StatusTag from '@/components/StatusTag';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { useLinkageUtils } from '@/utils/formEffectUtils';
-import { FormEffectHooks } from '@formily/react';
+import { FormEffectHooks } from '@formily/antd';
 import { InnerStatusColor, OuterStatusColor } from '../../common/tagColor';
 import { getMarketingMerchantActivityGetActivityTypeList, getMarketingMerchantActivityPageTobeOnline, postMarketingMerchantActivityOnline, postMarketingMerchantActivityOnlineBatch } from '@/services/MarketingV2Api';
 import { PATTERN_MAPS } from '@/constants/regExp';

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

@@ -8,7 +8,7 @@ import { format } from '@/pages/transaction/common/dateFormat';
 import StatusTag from '@/components/StatusTag';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { useLinkageUtils } from '@/utils/formEffectUtils';
-import { FormEffectHooks } from '@formily/react';
+import { FormEffectHooks } from '@formily/antd';
 import { InnerStatusColor, OuterStatusColor } from '../../common/tagColor';
 import { getMarketingMerchantActivityGetActivityTypeList, getMarketingMerchantActivityPageTobeSubmit, postMarketingMerchantActivitySubmit, postMarketingMerchantActivitySubmitBatch } from '@/services/MarketingV2Api';
 import { PATTERN_MAPS } from '@/constants/regExp';

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

@@ -10,7 +10,7 @@ import { format } from '@/pages/transaction/common/dateFormat';
 import StatusTag from '@/components/StatusTag';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { useLinkageUtils } from '@/utils/formEffectUtils';
-import { FormEffectHooks } from '@formily/react';
+import { FormEffectHooks } from '@formily/antd';
 const { onFormMount$ } = FormEffectHooks;
 import {
   DeleteOutlined,

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

@@ -9,7 +9,7 @@ import { format } from '@/pages/transaction/common/dateFormat';
 import StatusTag from '@/components/StatusTag';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { useLinkageUtils } from '@/utils/formEffectUtils';
-import { FormEffectHooks } from '@formily/react';
+import { FormEffectHooks } from '@formily/antd';
 import DateModalLayout from '../../components/dateModal';
 import { InnerStatusColor, OuterStatusColor } from '../../common/tagColor';
 import { getMarketingMerchantActivityGetActivityTypeList, getMarketingMerchantActivityGetInnerStatusList, getMarketingMerchantActivityGetOuterStatusList, getMarketingMerchantActivityPage, postMarketingMerchantActivityRestart, postMarketingMerchantActivityStop } from '@/services/MarketingV2Api';