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

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

@@ -270,4 +270,5 @@ export default {
     'selfManagement.qingshuruId':'Please enter id',
     "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',
 }

src/locales/en-US/responseCode.ts

@@ -1139,5 +1139,5 @@ export default {
   "49114": "Sorting cannot be repeated",
   "49117": 'Sorting under the same recommendation label cannot be repeated',
   "21055": "The payment request amount of the document in the current payment request is greater than the remaining payment amount of the document",
-
+  "49116": "The sorting cannot be empty when the recommended label is selected"
 }

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

@@ -270,4 +270,5 @@ export default {
   'selfManagement.qingshuruId': 'id를 입력하십시오.',
   "selfManagement.bixudayu0zuiduobaoliu3wei": "최대 3자리의 소수를 0보다 크게 유지하며 비워둘 수 없습니다.",
   "selfManagement.rejectmin1": "0보다 크고 100보다 작은 소수 자릿수를 최대 1자리까지 유지하며 null이 될 수 없습니다.",
+  "selfManagement.di": '제',
 }

src/locales/ko-KR/responseCode.ts

@@ -1138,4 +1138,5 @@ export default {
   "49114": "정렬은 중복될 수 없습니다.",
   "49117": '같은 추천 탭 아래 정렬 중복 불가',
   "21055": "현재 청구서에 증빙서류가 존재하는 청구금액은 증빙서류의 남은 지불금액보다 크다",
+  "49116": "추천 태그를 선택한 경우 정렬이 비워둘 수 없습니다."
 }

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

@@ -270,4 +270,5 @@ export default {
     'selfManagement.qingshuruId': '请输入id',
     "selfManagement.bixudayu0zuiduobaoliu3wei": "最多保留3位小数，大于0，不可为空",
     "selfManagement.rejectmin1":"最多保留1位小数，大于0且小于100，不可为空",
+    "selfManagement.di": '第',
 }

src/locales/zh-CN/responseCode.ts

@@ -1139,4 +1139,5 @@ export default {
   "49114": "排序不能重复",
   "49117": "同一推荐标签下排序不能重复",
   "21055": "当前请款单中存在单据的请款金额大于单据剩余支付金额",
+  "49116": "选择推荐标签的情况下排序不能为空"
 }

src/pages/priceManage/priceStrategy/component/productModal.tsx

@@ -46,14 +46,12 @@ const ProductModal: React.FC<ProductModalProps> = (props) => {
 
   // 指定商品
   const fetchProductList = async (params) => {
-    const shopId = schemaAction.getFieldValue('shopId')
-    let shopInfo: any = GlobalConfig.web.shopInfo.filter(item => item.id === shopId)
-
+    const values = schemaAction.getFieldState('shopId')['values']
     const res = await getProductCommodityGetStrategyCommodityList({
       ...params,
-      type: shopInfo[0]["type"],
-      environment: shopInfo[0].environment,
-      shopId,
+      type: values[1]["type"],
+      environment: values[1]['environment'],
+      shopId: values[0],
       // priceTypeList: [1, 2],
     })
     return res.data

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

@@ -119,13 +119,13 @@ export const GeneralEffect = (int, data) => {
                 {(int === 5 && data.type === 2) && `${intl.formatMessage({ id: 'marketingAbility.fullFold'})}`}
               </>, extra: <>
                 {(int === 4 && data.type === 1) && <Space direction='vertical'>
-                  {data.ladderList.map(item => (<div>{`${intl.formatMessage({ id: 'marketingAbility.man' })} ${item.key} ${intl.formatMessage({ id: 'marketingAbility.ge' })}, ${intl.formatMessage({ id: 'marketingAbility.jian' })} ${Number(item.value).toFixed(2)} ${intl.formatMessage({ id: 'marketingAbility.yuan' })}`}</div>))}
+                  {data.ladderList.map(item => (<div>{`${intl.formatMessage({ id: 'marketingAbility.man' })} ${item.key} ${intl.formatMessage({ id: 'marketingAbility.ge' })}, ${intl.formatMessage({ id: 'marketingAbility.jiandelete' })} ${Number(item.value).toFixed(2)} ${intl.formatMessage({ id: 'marketingAbility.yuan' })}`}</div>))}
                 </Space>}
                 {(int === 4 && data.type === 2) && <Space direction='vertical'>
                   {data.ladderList.map(item => (<div>{`${intl.formatMessage({ id: 'marketingAbility.man' })} ${item.key} ${intl.formatMessage({ id: 'marketingAbility.ge' })}, ${intl.formatMessage({ id: 'marketingAbility.da' })} ${item.value / 10} ${intl.formatMessage({ id: 'marketingAbility.zhe' })}`}</div>))}
                 </Space>}
                 {(int === 5 && data.type === 1) && <Space direction='vertical'>
-                  {data.ladderList.map(item => (<div>{`${intl.formatMessage({ id: 'marketingAbility.man' })} ${Number(item.key).toFixed(2)} ${intl.formatMessage({ id: 'marketingAbility.yuan' })}, ${intl.formatMessage({ id: 'marketingAbility.jian' })} ${Number(item.value).toFixed(2)} ${intl.formatMessage({ id: 'marketingAbility.yuan' })}`}</div>))}
+                  {data.ladderList.map(item => (<div>{`${intl.formatMessage({ id: 'marketingAbility.man' })} ${Number(item.key).toFixed(2)} ${intl.formatMessage({ id: 'marketingAbility.yuan' })}, ${intl.formatMessage({ id: 'marketingAbility.jiandelete' })} ${Number(item.value).toFixed(2)} ${intl.formatMessage({ id: 'marketingAbility.yuan' })}`}</div>))}
                 </Space>}
                 {(int === 5 && data.type === 2) && <Space direction='vertical'>
                   {data.ladderList.map(item => (<div>{`${intl.formatMessage({ id: 'marketingAbility.man' })} ${Number(item.key).toFixed(2)} ${intl.formatMessage({ id: 'marketingAbility.yuan' })}, ${intl.formatMessage({ id: 'marketingAbility.da' })} ${item.value / 10} ${intl.formatMessage({ id: 'marketingAbility.zhe' })}`}</div>))}
@@ -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/marketingActivitiesManagement/activePage/fixtures/common/hooks/useGetLayout.ts

@@ -204,7 +204,7 @@ const createComponent = (
       props: isDept 
         ? omit(current, ['childrenData']) 
         : specialKey && specialKey === otherProps[floor - 1].type 
-          ? { label: labels[`${rest.join("-")}-${childProps.id}`] || [] , ...childProps } 
+          ? { label: labels[`${rest.join("-")}-${childProps?.id}`] || [] , ...childProps } 
           : childProps,
       otherProps: otherProps[floor - 1],
       childNodes: parentChildKeys,

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/EditPanel/editPanelForm.tsx

@@ -158,7 +158,8 @@ const EditPanelForm = () => {
       const isCombination = componentType === 'combinationItem';
       /** 如果是组合促销， 要是已经选择了一个组合促销数据，那么搜索活动商品列表时需要添加当前活动id */
       let withActivityId = {};
-      if (isCombination) {
+      if (isCombination && parentKey) {
+        console.log("combination_", `combination_${+(parentKey) - 1}`, sameKeys, parentKey, selectedInfo)
         const [,currentCombinationActivityId] = sameKeys[`combination_${+(parentKey) - 1}`][0].split('_');
         withActivityId = currentCombinationActivityId === 'undefined' ? {} : { id: currentCombinationActivityId } 
       }

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Layouts/CommodityList/index.less

@@ -68,8 +68,22 @@
   .commodityItem {
     flex-basis: 50%;
     padding-right: 8px;
+  }
 
+}
 
-  }
+.footer {
+  margin-top: auto;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
 
+  .btn {
+    font-size: 12px;
+    padding: 4px 8px;
+    background-color: rgb(239, 51, 70);
+    border-radius: 16px;
+    color: #fff;
+  }
 }

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

@@ -11,6 +11,7 @@ import SwapCoupon from './swapCoupon';
 import SwapProduct from './swapProduct';
 import { getIntl } from 'umi'
 import { GetMarketingAdornActivityGoodsAdornResponse } from '@/services/MarketingV2Api';
+import Price from '../../Price';
 
 const intl = getIntl();
 const { TabPane } = Tabs;
@@ -151,15 +152,25 @@ const CommodityItem: React.FC<Iprops> = (props: Iprops) => {
 
   const commodityProps = mode === 'horizontal' ? horizontalData : verticalData;
 
+  const renderFooter = () => {
+    return (
+      <div className={styles.footer}>
+        <Price originalPrice={commodityProps?.originalPrice!} discountPrice={commodityProps?.discountPrice} />
+        <div className={styles["btn"]}>
+          <div>{intl.formatMessage({id: 'activityPage.buyNow'})}</div>
+        </div>
+      </div>
+    )
+  }
+
   return (
     <div className={classNameStr} >
       <div {...divProps} className={className}>
         <Commodity
-
+          footer={renderFooter()}
           {...commodityProps}
         />
       </div>
-
     </div>
   );
 };

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Layouts/CommodityList/swapCoupon.less

@@ -54,3 +54,7 @@
     }
   }
 }
+
+.footer {
+  margin-top: auto;
+}

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

@@ -8,6 +8,7 @@ import styles from './swapCoupon.less';
 import Tabbar from './tabbar';
 import TabFooter from './tabFooter';
 import { getIntl } from 'umi'
+import Price from '../../Price';
 const intl = getIntl();
 
 const { TabPane } = Tabs;
@@ -19,7 +20,7 @@ const SwapCoupon = (props) => {
   const restProps = omit(other, ["getOperateState", "onClick", "onDrag", "onDragEnd", "onDragEnter", "onDragStart", "onMouseOver", "draggable"]);
   const isEmpty = typeof restProps['productName'] === 'undefined';
 
-  const { onClick, onDrag, onDragEnd, onDragEnter, onDragStart, onMouseOver, getOperateState } = other as any;
+  const { onClick,  onMouseOver, getOperateState } = other as any;
 
   const divProps = {
     onClick, onMouseOver,
@@ -38,6 +39,14 @@ const SwapCoupon = (props) => {
     );
   }
 
+  const renderFooter = () => {
+    return (
+      <div className={styles.footer}>
+        <Price originalPrice={price} discountPrice={price} />
+      </div>
+    )
+  }
+
   return (
     <div className={className} {...divProps}>
       <div className={styles.section}>
@@ -49,6 +58,7 @@ const SwapCoupon = (props) => {
             discountPrice={price}
             tags={[intl.formatMessage({ id: 'activityPage.giveCoupon' })]}
             buyBtn={false}
+            footer={renderFooter()}
           />
         </div>
         <div className={styles.tab}>

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Layouts/CommodityList/swapProduct.less

@@ -69,3 +69,8 @@
     }
   }
 }
+
+
+.footer {
+  margin-top: auto;
+}

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

@@ -9,6 +9,7 @@ import Tabbar from './tabbar';
 import TabFooter from './tabFooter';
 // import { useIntl} from 'umi'
 import { getIntl } from 'umi'
+import Price from '../../Price';
 const intl = getIntl();
 
 const { TabPane } = Tabs;
@@ -38,6 +39,14 @@ const SwapProduct = (props) => {
     );
   }
 
+  const renderFooter = () => {
+    return (
+      <div className={styles.footer}>
+        <Price originalPrice={price} discountPrice={price} />
+      </div>
+    )
+  }
+
   return (
     <div className={className} {...divProps}>
       <div className={styles.section}>
@@ -49,6 +58,7 @@ const SwapProduct = (props) => {
             discountPrice={price}
             tags={[intl.formatMessage({ id: 'activityPage.complimentaryGoods' })]}
             buyBtn={false}
+            footer={renderFooter()}
           />
         </div>
         <div className={styles.tab}>

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Layouts/CommodityWithProcess/index.less

@@ -11,6 +11,22 @@
   }
 }
 
+.footer {
+  margin-top: auto;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+
+  .btn {
+    font-size: 12px;
+    padding: 4px 8px;
+    background-color: rgb(239, 51, 70);
+    border-radius: 16px;
+    color: #fff;
+  }
+}
+
 
 
 .hide {

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Layouts/CommodityWithProcess/index.tsx

@@ -3,6 +3,7 @@ import { Commodity, Progress } from '@linkseeks/design-ui';
 import styles from './index.less';
 import classNames from 'classnames';
 import { getIntl } from 'umi';
+import Price from '../../Price';
 const intl = getIntl();
 interface IChildprops {
   className: string,
@@ -77,7 +78,17 @@ const Item: React.FC<IChildprops> = (props: IChildprops) => {
   const divProps = {
     onClick, onMouseOver,
   };
-  console.log(other, "other");
+
+  const renderFooter = () => {
+    return (
+      <div className={styles.footer}>
+        <Price originalPrice={other?.price!} discountPrice={other?.activityPrice} />
+        <div className={styles["btn"]}>
+          <div>{intl.formatMessage({id: 'activityPage.buyNow'})}</div>
+        </div>
+      </div>
+    )
+  }
 
   return (
     <div className={styles.item}>
@@ -86,9 +97,9 @@ const Item: React.FC<IChildprops> = (props: IChildprops) => {
           name={other.productName}
           image={other.productImgUrl}
           mode="horizontal"
-          discountPrice={other.activityPrice}
-          price={other.price}
-          buyBtnText={intl.formatMessage({id: 'activityPage.buyNow'})}
+          // discountPrice={other.activityPrice}
+          // price={other.price}
+          // buyBtnText={intl.formatMessage({id: 'activityPage.buyNow'})}
           progress={
             <Progress
               percent={50}
@@ -101,6 +112,7 @@ const Item: React.FC<IChildprops> = (props: IChildprops) => {
               }
             />
           }
+          footer={renderFooter()}
         />
       </div>
     </div>

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Layouts/Coupon/index.less

@@ -9,12 +9,23 @@
   flex-wrap: wrap;
 
   .item {
-    flex: 50%;
+    // flex-basis: 50%;
+    width: 50%;
     padding-right: 8px;
     margin-bottom: 12px;
 
     .couponItem {
       height: 84px;
+      color: #EF3346;
+      .right {
+        // writing-mode: vertical-rl;
+        width: 15px;
+        font-size: 12px;
+        line-height: 12px;
+        margin: 0 0 0 4px;
+        word-wrap: break-word;
+        
+      }
     }
   }
 }

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Layouts/Coupon/index.tsx

@@ -15,15 +15,11 @@ interface Iprops {
   status: boolean,
   // visible: 0 | 1,
   onClick: () => void,
-  // onDrag: () => void,
-  // onDragEnd: () => void,
-  // onDragEnter: () => void,
-  // onDragStart: () => void,
   onMouseOver: () => void,
   getOperateState: any,
 }
 
-const Coupon: React.FC<Iprops> & { Item: typeof CouponItem } = (props: Iprops) => {
+const Coupon: React.FC<Iprops> & { Item: typeof Item } = (props: Iprops) => {
   const { children, className, status = true, ...other } = props;
   const visible = status;
   const classNameStr = cx(
@@ -54,10 +50,6 @@ interface ItemIprops {
   children: React.ReactNode,
   className: string,
   onClick: () => void,
-  // onDrag: () => void,
-  // onDragEnd: () => void,
-  // onDragEnter: () => void,
-  // onDragStart: () => void,
   onMouseOver: () => void,
   draggable?: false
   getOperateState: any,
@@ -75,7 +67,6 @@ interface ItemIprops {
 }
 
 const Item: React.FC<ItemIprops> = (props: ItemIprops) => {
-  // const intl = useIntl();
   const { children, className, ...other} = props;
   const { onClick, onMouseOver, getOperateState, ...rest} = other;
   const { denomination, tag, useConditionMoney, typeName } = rest as any;
@@ -83,10 +74,21 @@ const Item: React.FC<ItemIprops> = (props: ItemIprops) => {
     onClick, onMouseOver,
   };
   const isNotNull = useMemo(() => rest?.id && true, [rest]);
+  const right = () => {
+    return (
+      <div className={styles.right}>
+        {getIntl().formatMessage({ id: 'activityPage.pickNow' })}
+      </div>
+    )
+  }
+
+
   return (
     <div  className={cx(styles.item)}>
       <div {...divProps} className={className}>
-        <CouponsItem 
+        <CouponsItem
+          currency={getIntl().formatMessage({ id: 'common.money' })}
+          rightRender={right()}
           money={denomination} 
           isnull={!isNotNull} 
           typeName={typeName} 

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Price/index.tsx

@@ -14,11 +14,16 @@ const Price: React.FC<Iprops> = (props: Iprops) => {
     <div className={styles.price}>
       <div className={styles.originalPrice}>
         <span className={styles.currency}>{getIntl().formatMessage({ id: 'common.money' })}</span>
-        <span>{originalPrice}/{unit}</span>
-      </div>
-      <div className={styles.discountPrice}>
-        {getIntl().formatMessage({ id: 'common.money' })}{discountPrice}/{unit}
+        <span>{originalPrice || discountPrice}/{unit}</span>
       </div>
+      {
+        (originalPrice !== discountPrice || !originalPrice) && (
+          <div className={styles.discountPrice}>
+            {getIntl().formatMessage({ id: 'common.money' })}{discountPrice}/{unit}
+          </div>
+        ) || null
+      }
+      
     </div>
   )
 }

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

@@ -11,7 +11,6 @@ import SearchPannel from './components/SearchPannel';
 import { getTemplateWebActivityPagePage, GetTemplateWebActivityPagePageRequest, GetTemplateWebActivityPagePageResponseDetail, postTemplateWebActivityPageDelete, postTemplateWebActivityPageOpenOffLine } from '@/services/TemplateV2Api';
 import { useIntl } from 'umi'
 
-
 const { Search } = Input;
 
 type SearchParamsType = {

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.full' })}<Form.Item
+                  <Space key={key} style={{ display: 'flex', marginBottom: 8 }} align="center">{intl.formatMessage({ id: 'selfManagement.di' })}<Form.Item
                     {...restField}
                     style={{ margin: 0 }}
                     name={[name, `${int === ACTIVITY_TYPE_7 ? 'num' : 'key'}`]}