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

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

@@ -194,7 +194,7 @@ export const GeneralEffect = (int, data) => {
           col: [
             {
               label: `${intl.formatMessage({ id: 'marketingAbility.preferentialRules'})}`, extra: <Space direction='vertical'>
-                {!isEmpty(data.ladderList) && data.ladderList.map(item => (<div>{`${intl.formatMessage({ id: 'marketingAbility.man' })} ${item.num} ${intl.formatMessage({ id: 'marketingAbility.jiandelete' })}, ${intl.formatMessage({ id: 'marketingAbility.da' })} ${item.discount / 10} ${intl.formatMessage({ id: 'marketingAbility.zhe' })}`}</div>))}
+                {!isEmpty(data.ladderList) && data.ladderList.map(item => (<div>{`${intl.formatMessage({ id: 'selfManagement.di' })} ${item.num} ${intl.formatMessage({ id: 'marketingAbility.jian' })}, ${intl.formatMessage({ id: 'marketingAbility.da' })} ${item.discount / 10} ${intl.formatMessage({ id: 'marketingAbility.zhe' })}`}</div>))}
               </Space>
             },
             {
@@ -346,18 +346,18 @@ export const GeneralEffect = (int, data) => {
       return [
         {
           col: [
-            { label: `${intl.formatMessage({ id: 'marketingAbility.theDepositPaymentTime'})}`, extra: '' },
+            { label: `${intl.formatMessage({ id: 'marketingAbility.theDepositPaymentTime'})}`, extra: <>{format(data.depositPayStartTime, 'HH:mm:ss')}~{format(data.depositPayEndTime, 'HH:mm:ss')}</>  },
             { label: `${intl.formatMessage({ id: 'marketingAbility.activityDescription'})}`, extra: data.describe },
           ]
         },
         {
           col: [
-            { label: `${intl.formatMessage({ id: 'marketingAbility.balancePaymentPaymentTime'})}`, extra: '' },
+            { label: `${intl.formatMessage({ id: 'marketingAbility.balancePaymentPaymentTime'})}`, extra: <>{format(data.balancePaymentPayStartTime, 'HH:mm:ss')}~{format(data.balancePaymentPayEndTime, 'HH:mm:ss')}</> },
           ]
         },
         {
           col: [
-            { label: `${intl.formatMessage({ id: 'marketingAbility.startTheDeliveryTime'})}`, extra: '' },
+            { label: `${intl.formatMessage({ id: 'marketingAbility.startTheDeliveryTime'})}`, extra: format(data.deliverTime, 'HH:mm:ss') },
           ]
         }
       ]

src/pages/transaction/marketingAbility/components/couponsListLayout/components/productLayout/index.tsx

@@ -93,7 +93,7 @@ const ProductLayout: React.FC<ProductLayoutProps> = (props: any) => {
               return Promise.reject(new Error(remind.message[4]));
             }
             if (!pattern.test(value) && remind.label[2] !== '元') {
-              return Promise.reject(new Error(remind.label[1] + `${intl.formatMessage({ id: 'selfManagement.bixudayu0zuiduobaoliu3wei'})}`)); activityPage.yuan
+              return Promise.reject(new Error(remind.label[1] + `${intl.formatMessage({ id: 'selfManagement.bixudayu0zuiduobaoliu3wei'})}`));
             }
             if (!pattern1.test(value) && remind.label[2] === '元') {
               return Promise.reject(new Error(remind.label[1] + `${intl.formatMessage({ id: 'marketingAbility.bixudayu0zuiduobaoliu2weixiaoshu'})}`));
@@ -129,10 +129,10 @@ const ProductLayout: React.FC<ProductLayoutProps> = (props: any) => {
                     <Col flex='auto'>
                       <div className={style.productLayout_item_title}>{_item.productName}</div>
                       <div className={style.productLayout_item_price}>
-                        <span>¥ {_item.price.toFixed(2)}</span>/{_item.unit}
+                        <span>{intl.formatMessage({id: 'common.money', defaultMessage: '￥'})} {_item.price.toFixed(2)}</span>/{_item.unit}
                       </div>
-                      <div className={style.productLayout_item_info}>品类：{_item.category}</div>
-                      <div className={style.productLayout_item_info}>品牌：{_item.brand}L</div>
+                      <div className={style.productLayout_item_info}>{intl.formatMessage({id: 'paltformSign.category', defaultMessage: '品类'})}：{_item.category}</div>
+                      <div className={style.productLayout_item_info}>{intl.formatMessage({id: 'paltformSign.brand', defaultMessage: '品牌'})}：{_item.brand}L</div>
                     </Col>
                   </Row>
                 </div>
@@ -142,8 +142,8 @@ const ProductLayout: React.FC<ProductLayoutProps> = (props: any) => {
                   <Row style={{ height: '100%', marginLeft: 10 }} wrap={false}>
                     <Col flex='none'>
                       <div className={style.couponLayout_item_left}>
-                        <p>¥<span>{_item.denomination}</span></p>
-                        <p>满{_item.useConditionMoney}{intl.formatMessage({ id: 'marketingAbility.yuankeyong' })}</p>
+                        <p>{intl.formatMessage({id: 'common.money', defaultMessage: '￥'})}<span>{_item.denomination}</span></p>
+                        <p>{intl.formatMessage({id: 'paltformSign.full', defaultMessage: '满'})}{_item.useConditionMoney}{intl.formatMessage({ id: 'marketingAbility.yuankeyong' })}</p>
                       </div>
                     </Col>
                     <Col flex='auto' style={{ overflow: 'hidden' }}>

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

@@ -102,7 +102,7 @@ const ProductLayout: React.FC<ProductLayoutProps> = (props: any) => {
         <div key={`list_${_index + 1}`}>
           <div className={style.productLayout_title}>
             <span className={style.productLayout_arrow}>
-              {remind.label[3]}{_index + 1}
+              {remind.label[3]}
             </span>
             {!isPreview && <DeleteOutlined onClick={() => onDeletion(_index)} />}
           </div>
@@ -141,7 +141,7 @@ const ProductLayout: React.FC<ProductLayoutProps> = (props: any) => {
                   <Col flex='auto'>
                     <div className={style.productLayout_item_title}>{_item.productName}</div>
                     <div className={style.productLayout_item_price}>
-                      <span>¥ {_item.price.toFixed(2)}</span>/{_item.unit}
+                      <span>{intl.formatMessage({id: 'common.money', defaultMessage: '¥'})} {_item.price.toFixed(2)}</span>/{_item.unit}
                     </div>
                     <div className={style.productLayout_item_info}>{intl.formatMessage({ id: 'marketingAbility.category' })}：{_item.category}</div>
                     <div className={style.productLayout_item_info}>{intl.formatMessage({ id: 'marketingAbility.brand' })}：{_item.brand}L</div>

src/pages/transaction/marketingAbility/paltformSign/readySubmitExamine/components/productListLayout/remind.ts

@@ -30,8 +30,8 @@ export const remindLayout = (int, giveType?, giftType?) => {
         name: 'giveValue',
         value: giftType,
         type: 'limitValue',
-        modalTitle: `设置赠品-${give}赠${gift}`,
-        buttonTitle: `添加赠送${gift}`,
+        modalTitle: intl.formatMessage({id: 'paltformSign.MANE_ZENG', defaultMessage: `设置赠品-${give}赠${gift}`}, {data1: give, data2: gift}),
+        buttonTitle: intl.formatMessage({id: 'paltformSign.MANE_ZENG1', defaultMessage: `添加赠送${gift}`}, {data: gift}),
         listTitle: `${give}${gift}`,
         label: {
           1: `${intl.formatMessage({ id: 'paltformSign.preferentialThreshold'})}`,
@@ -54,9 +54,9 @@ export const remindLayout = (int, giveType?, giftType?) => {
         name: 'swapValue',
         value: FULL_EXCHANGE,
         type: 'limitValue',
-        modalTitle: `设置换购商品-${give}换购商品`,
+        modalTitle: intl.formatMessage({id: 'paltformSign.FULL_EXCHANGE', defaultMessage: `设置换购商品-${give}换购商品`}, {data: give}),
         buttonTitle: `${intl.formatMessage({ id: 'paltformSign.addBuyGoods'})}`,
-        listTitle: `${give}换购商品`,
+        listTitle: intl.formatMessage({id: 'paltformSign.FULL_EXCHANGE1', defaultMessage: `${give}换购商品`}, {data: give}),
         label: {
           1: `${intl.formatMessage({ id: 'paltformSign.redemptionThreshold'})}`,
           2: giveType === FULL_EXCHANGE ? `${intl.formatMessage({ id: 'paltformSign.yuan'})}` : `${intl.formatMessage({ id: 'paltformSign.a'})}`,

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

@@ -344,7 +344,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
                 required
               >
                 {fields.map(({ key, name, fieldKey, ...restField }) => (
-                  <Space key={key} style={{ display: 'flex', marginBottom: 8 }} align="center">{intl.formatMessage({ id: 'selfManagement.di' })}<Form.Item
+                  <Space key={key} style={{ display: 'flex', marginBottom: 8 }} align="center">{int === ACTIVITY_TYPE_7 ? intl.formatMessage({ id: 'selfManagement.di' }) : intl.formatMessage({ id: 'selfManagement.full' })}<Form.Item
                     {...restField}
                     style={{ margin: 0 }}
                     name={[name, `${int === ACTIVITY_TYPE_7 ? 'num' : 'key'}`]}

src/pages/transaction/purchaseAbility/confirmOffer/contrast/index.tsx

@@ -57,8 +57,8 @@ const ContrastPrice = () => {
         col: [
           { label: intl.formatMessage({ id: 'table.purchase.dementNo' }), extra: data.purchaseInquiryNo },
           { label: intl.formatMessage({ id: 'table.purchase.details' }), extra: data.details },
-          { label: intl.formatMessage({ id: 'table.purchase.externalStatus' }), extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState]}>{OFFTER_EXTERNALSTATE[data.externalState]}</Tag> },
-          { label: intl.formatMessage({ id: 'detail.purchase.innerStatus' }), extra: <Badge status={OFFTER_INTERNALSTATE_COLOR[data.interiorState]} text={OFFTER_INTERNALSTATE[data.interiorState]} /> },
+          { label: intl.formatMessage({ id: 'table.purchase.externalStatus' }), extra: <Tag color={OFFTER_EXTERNALSTATE_COLOR[data.externalState]}>{data.externalStateName}</Tag> },
+          { label: intl.formatMessage({ id: 'detail.purchase.innerStatus' }), extra: <Badge status={OFFTER_INTERNALSTATE_COLOR[data.interiorState]} text={data?.interiorStateName} /> },
         ]
       },
       {

src/pages/transaction/transactionRules/components/ruleSetting.tsx

@@ -18,7 +18,7 @@ import Submit from '@/components/NiceForm/components/Submit'
 import SelectProcesss from './selectProcesss'
 import { usePaymentTable } from '../model/usePaymentTable'
 import { help }  from '../../common'
-import { fectchShopListsSource } from '@/utils/type'
+import { fectchShopListsSourceTradeRule } from '@/utils/type'
 import { getProductCommodityCommonGetCommodityListBySeller, getProductSelectGetSelectBrand, getProductSelectGetSelectCustomerCategory } from '@/services/ProductV2Api'
 import { getOrderTradeProcessGet, getOrderTradeProcessProductPage } from '@/services/OrderNewV2Api'
 import { useIntl } from 'umi'
@@ -382,7 +382,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
         }}
         effects={($, { setFieldState, setFieldValue }) => {
           $('onFormMount').subscribe(async () => {
-            const data = await fectchShopListsSource()
+            const data = await fectchShopListsSourceTradeRule()
             if(data && data.length) {
               setFieldState('shopIds', state => {
                 state.props["x-component-props"].dataSource = data.sort((a, b)=>a.type-b.type)

src/pages/transaction/transactionRules/components/selectProcesss/index.tsx

@@ -78,7 +78,6 @@ const SelectProcesss = (props: ISchemaFieldComponentProps) => {
   }
 
   const renderProcessType = (v: any) => {
-    console.log(v)
     return <Tag color={ProcessTagColor[v.processType - 1]}>
       {v["processTypeName"]}
     </Tag>

src/utils/type.ts

 import { GlobalConfig } from '@/global/config';
-import { postManageWebShopWebAll } from '@/services/ManageV2Api';
+import { postManageWebShopWebAll, postManageWebShopWebAllShop } from '@/services/ManageV2Api';
 
 export function isString(str: any):str is string {
   return typeof str === 'string'
@@ -42,8 +42,20 @@ interface getShopListsParmasProps {
  * @param params 接口参数
  */
 export const fectchShopListsSource = async (params?: getShopListsParmasProps) => {
-  if (postManageWebShopWebAll) {
+  if (postManageWebShopWebAllShop) {
     const { data } = await postManageWebShopWebAll({ ...params, siteId: GlobalConfig.global.siteInfo.id }, { ctlType: 'none' })
     return data
   }
 }
+
+
+/**
+ * 同上 仅限交规规则模块适用
+ * @param params 接口参数
+ */
+ export const fectchShopListsSourceTradeRule = async (params?: getShopListsParmasProps) => {
+  if (postManageWebShopWebAllShop) {
+    const { data } = await postManageWebShopWebAllShop({ ...params, siteId: GlobalConfig.global.siteInfo.id }, { ctlType: 'none' })
+    return data
+  }
+}