fix: 营销活动修复bug

src/pages/marketingManage/marketing/components/activityUserLayout/index.tsx

@@ -77,7 +77,7 @@ const ActivityUserLayout: React.FC<ActivityUserLayoutProps> = (props: any) => {
                   <Col span={6}>
                     <div className={style.cell}>
                       <h5 className={style.label}>会员角色: </h5>
-                      <h5 className={style.content}>{item.roleTypeName}</h5>
+                      <h5 className={style.content}>{item.roleName}</h5>
                     </div>
                   </Col>
                   <Col span={6}>

src/pages/marketingManage/marketing/detail/constants.tsx

@@ -124,13 +124,13 @@ export const GeneralEffect = (int, data) => {
                   {!isEmpty(data.ladderList) && data.ladderList.map(item => (<div>{`满 ${item.key} 个, 减 ${Number(item.value).toFixed(2)} 元`}</div>))}
                 </Space>}
                 {(int === 4 && data.type === 2) && <Space direction='vertical'>
-                  {!isEmpty(data.ladderList) && data.ladderList.map(item => (<div>{`满 ${item.key} 个, 打 ${item.value} 折`}</div>))}
+                  {!isEmpty(data.ladderList) && data.ladderList.map(item => (<div>{`满 ${item.key} 个, 打 ${item.value / 10} 折`}</div>))}
                 </Space>}
                 {(int === 5 && data.type === 1) && <Space direction='vertical'>
                   {!isEmpty(data.ladderList) && data.ladderList.map(item => (<div>{`满 ${Number(item.key).toFixed(2)} 元, 减 ${Number(item.value).toFixed(2)} 元`}</div>))}
                 </Space>}
                 {(int === 5 && data.type === 2) && <Space direction='vertical'>
-                  {!isEmpty(data.ladderList) && data.ladderList.map(item => (<div>{`满 ${Number(item.key).toFixed(2)} 元, 打 ${item.value} 折`}</div>))}
+                  {!isEmpty(data.ladderList) && data.ladderList.map(item => (<div>{`满 ${Number(item.key).toFixed(2)} 元, 打 ${item.value / 10} 折`}</div>))}
                 </Space>}
               </>
             },
@@ -196,7 +196,7 @@ export const GeneralEffect = (int, data) => {
           col: [
             {
               label: '优惠规则', extra: <Space direction='vertical'>
-                {!isEmpty(data.ladderList) && data.ladderList.map(item => (<div>{`满 ${item.discount} 件, 打 ${item.num} 折`}</div>))}
+                {!isEmpty(data.ladderList) && data.ladderList.map(item => (<div>{`满 ${item.num} 件, 打 ${item.discount / 10} 折`}</div>))}
               </Space>
             },
             {

src/pages/marketingManage/marketing/waitAddedMarketing/add.tsx

@@ -14,7 +14,7 @@ import ApplyMemberLayout from './components/applyMember';
 import { useEventEmitter } from '@umijs/hooks';
 import PrizeListLayout from './components/prizeListLayout';
 import { isEmpty } from '@antv/util';
-import { getMarketingPlatformActivityDetail, getMarketingPlatformMerchantActivityGetActivityTypeList, postMarketingPlatformActivitySave, postMarketingPlatformActivityUpdate } from '@/services/MarketingV2Api';
+import { getMarketingMerchantActivityGetActivityTypeList, getMarketingPlatformActivityDetail, getMarketingPlatformMerchantActivityGetActivityTypeList, postMarketingPlatformActivitySave, postMarketingPlatformActivityUpdate } from '@/services/MarketingV2Api';
 
 const layout: any = {
   colon: false,
@@ -162,7 +162,7 @@ const AddedMarketing = (props: any) => {
   }
 
   useEffect(() => {
-    getMarketingPlatformMerchantActivityGetActivityTypeList().then(res => {
+    getMarketingMerchantActivityGetActivityTypeList().then(res => {
       if (res.code !== 1000) {
         return
       }

src/pages/marketingManage/marketing/waitAddedMarketing/components/rulesLayout/index.tsx

@@ -500,7 +500,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
               name={['activityDefined', 'assembleNum']}
               rules={[{
                 required: true, validator: (_rule, value) => {
-                  const pattern = /^-?[1-9]\d*$/;
+                  const pattern = /^\+?[1-9]\d*$/;
                   if (!value) {
                     return Promise.reject(new Error('请输入成团人数'));
                   }
@@ -541,7 +541,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
                       initialValue={24}
                       rules={[{
                         required: true, validator: (_rule, value) => {
-                          const pattern = /^(0?\.[1-9]|1\d|2[0-3])(\.\d{1,1})?$/;
+                          const pattern = /^(0?\.[1-9]|1\d|2[0-4])(\.\d{1,1})?$/;
                           if (!value) {
                             return Promise.reject(new Error('请输入成团时间'));
                           }