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

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

@@ -51,7 +51,7 @@ export default {
     'merchantCoupon.useCondition':'Conditions of use',
     'merchantCoupon.use':'Use',
     'merchantCoupon.ReceivingConditions':'Receiving Conditions',
-    'merchantCoupon.zhang':'张',
+    'merchantCoupon.zhang':'Piece',
     'merchantCoupon.daily':'Daily',
     'merchantCoupon.Vipname':'Member Name',
     'merchantCoupon.lfy':'Member Type',

src/pages/commodity/products/constant/index.tsx

@@ -88,12 +88,11 @@ export enum CommodityImagesType {
 /** 商品的操作文本 */
 export const opeartionLabel = [
   '',
-  '提交审核',
-  '修改商品',
-  '审核商品'
+  getIntl().formatMessage({ id: 'commodity.products.constant.opeartionLabel.1' }),
+  getIntl().formatMessage({ id: 'commodity.products.constant.opeartionLabel.2' }),
+  getIntl().formatMessage({ id: 'commodity.products.constant.opeartionLabel.3' })
 ]
 
-
 /** 查看商品 审核历史列 */
 export const columns: ColumnType<any>[] = [
   {

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[`${childProps}-${rest.join("-")}`] || [] , ...childProps } 
+          ? { label: labels[`${rest.join("-")}-${childProps.id}`] || [] , ...childProps } 
           : childProps,
       otherProps: otherProps[floor - 1],
       childNodes: parentChildKeys,

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

@@ -109,7 +109,7 @@ const CombinationItem: React.FC<any> = (props: any) => {
        <div className={styles['simple-product-label']}>
          {activityList.map((_item) => {
            return (
-             <CustomizeTag>{_item.label}</CustomizeTag>
+             <CustomizeTag key={_item.label}>{_item.label}</CustomizeTag>
            )
          })}
        </div>

src/pages/transaction/marketingAbility/merchantCoupon/components/ApplicableGoods/index.tsx

@@ -101,7 +101,7 @@ const ApplicableGoods: React.FC<IProps> = (props) => {
         const unitPrice = normalizeUnitPrice(text);
         const start = unitPrice[0]?.price;
         const end = unitPrice[unitPrice.length - 1]?.price;
-        return start !== end ? `¥ ${start}~${end}` : `¥ ${start}`;
+        return start !== end ? `${intl.formatMessage({ id: 'common.money' }, { default: '¥' })} ${start}~${end}` : `${intl.formatMessage({ id: 'common.money' }, { default: '¥' })} ${start}`;
       },
     },
   ];

src/pages/transaction/marketingAbility/merchantCoupon/components/BacisInfo/index.tsx

@@ -98,7 +98,7 @@ const CouponBacisInfo: React.FC<PropsType> = (props: PropsType) => {
     },
     {
       title: intl.formatMessage({ id: 'merchantCoupon.moneySize' }),
-      value: `¥ ${dataSource.denomination || ''}`,
+      value: `${intl.formatMessage({ id: 'common.money' }, { default: '¥' })} ${dataSource.denomination || ''}`,
     },
     {
       title: intl.formatMessage({ id: 'merchantCoupon.couponEndTime' }),

src/pages/transaction/marketingAbility/merchantCoupon/merchantCouponUnsubmitted/components/ApplicableGoodsFormItem/index.tsx

@@ -75,7 +75,7 @@ const ApplicableGoodsFormItem = (props) => {
         const unitPrice = normalizeUnitPrice(text);
         const start = unitPrice[0]?.price;
         const end = unitPrice[unitPrice.length - 1]?.price;
-        return start !== end ? `¥ ${start}~${end}` : `¥ ${start}`;
+        return start !== end ? `${intl.formatMessage({ id: 'common.money' }, { default: '¥' })} ${start}~${end}` : `${intl.formatMessage({ id: 'common.money' }, { default: '¥' })} ${start}`;
       },
     },
     (

src/pages/transaction/marketingAbility/merchantCoupon/merchantCouponUnsubmitted/components/GoodsDrawer/index.tsx

@@ -184,7 +184,7 @@ const GoodsDrawer: React.FC<IProps> = (props) => {
         const unitPrice = normalizeUnitPrice(text);
         const start = unitPrice[0]?.price;
         const end = unitPrice[unitPrice.length - 1]?.price;
-        return start !== end ? `¥ ${start}~${end}` : `¥ ${start}`;
+        return start !== end ? `${intl.formatMessage({ id: 'common.money' }, { default: '¥' })} ${start}~${end}` : `${intl.formatMessage({ id: 'common.money' }, { default: '¥' })} ${start}`;
       },
     },
   ];