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

src/pages/transaction/marketingAbility/common/constants.tsx

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

src/pages/transaction/marketingAbility/paltformSign/readySubmitExamine/add.tsx

@@ -15,7 +15,7 @@ import DemandLayout from '../../components/demandLayout';
 import { isEmpty } from 'lodash';
 import { SaveOutlined } from '@ant-design/icons';
 import ProductListLayout from '../../components/productListLayout';
-import { getMarketingPlatformActivitySignupDetail, postMarketingPlatformActivitySignupGetFilterSkuId, postMarketingPlatformActivitySignupSave, postMarketingPlatformActivitySignupUpdate } from '@/services/MarketingV2Api';
+import { getMarketingPlatformActivitySignupDetail, getMarketingPlatformActivitySignupDetailGoodsPage, postMarketingPlatformActivitySignupGetFilterSkuId, postMarketingPlatformActivitySignupSave, postMarketingPlatformActivitySignupUpdate } from '@/services/MarketingV2Api';
 
 const TABLINK = [
   { id: 'progressLayout', title: '流转进度' },

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

@@ -21,7 +21,7 @@ import ListModalLayout from '../../components/listModalLayout';
 import CouponsListLayout from '../../components/couponsListLayout';
 import { remindLayout, RemindLayoutProps } from '@/pages/transaction/marketingAbility/paltformSign/readySubmitExamine/components/productListLayout/remind';
 import PrizeList from './prizeList';
-import { getMarketingMerchantActivityDetail, postMarketingMerchantActivityExamineStep1, postMarketingMerchantActivityExamineStep2 } from '@/services/MarketingV2Api';
+import { getMarketingMerchantActivityDetail, getMarketingMerchantActivityDetailGoodsPage, postMarketingMerchantActivityExamineStep1, postMarketingMerchantActivityExamineStep2 } from '@/services/MarketingV2Api';
 
 const DetialLayout = () => {
   const { query: { id }, pathname } = history.location;

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

@@ -11,7 +11,7 @@ import ProductListLayout from '../../components/productListLayout';
 import PartakeUserLayout from './components/partakeUserLayout';
 import PrizeListLayout from './components/prizeListLayout';
 import moment from 'moment';
-import { getMarketingMerchantActivityDetail, postMarketingMerchantActivityGetFilterSkuId, postMarketingMerchantActivitySave, postMarketingMerchantActivityUpdate } from '@/services/MarketingV2Api';
+import { getMarketingMerchantActivityDetail, getMarketingMerchantActivityDetailGoodsPage, postMarketingMerchantActivityGetFilterSkuId, postMarketingMerchantActivitySave, postMarketingMerchantActivityUpdate } from '@/services/MarketingV2Api';
 
 const layout: any = {
   colon: false,