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

src/pages/editor/ownMallEdit/index.tsx

@@ -114,7 +114,8 @@ const OwnMallEdit: React.FC<ShopEditPropsType> = (props) => {
         templateId: id,
         categoryId,
         memberId,
-        roleId: memberRoleId
+        roleId: memberRoleId,
+        shopId,
       }
 
       getTemplateAdornWebSelfMemberCategoryAdorn(param).then(res => {

src/pages/editor/ownMallEdit/preview.tsx

@@ -112,7 +112,8 @@ const OwnMallEdit: React.FC<ShopEditPropsType> = (props) => {
         templateId: id,
         categoryId,
         memberId,
-        roleId: memberRoleId
+        roleId: memberRoleId,
+        shopId,
       }
 
       getTemplateAdornWebSelfMemberCategoryAdorn(param).then(res => {

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/marketingActivitiesManagement/activePage/add/index.tsx

@@ -73,7 +73,6 @@ const Add = () => {
       message.error(intl.formatMessage({ id: 'activityPage.inputActivityTemplate' }));
       return;
     }
-    console.log(startTime);
     const startTimeStamp = startTime?.valueOf();
     const endTimeStamp = endTime?.valueOf();
     setLoading(true);
@@ -149,7 +148,7 @@ const Add = () => {
     async function setMall() {
       const data = await fetchMallData({environment: initialValue.environment.toString(), siteId: GlobalConfig.global.siteInfo.id} as any);
       actions.setFieldState("shopId", state => {
-        state.props.enum = data;
+        state.props.enum = [...data, { label: initialValue.shopName, value: initialValue.shopId }];
       });
     }
     setMall();

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

@@ -23,7 +23,7 @@ interface Iprops {
   /** 商城子域名 */
   url: string,
   // 是否是自营商城
-  self: 1 | 0,
+  self: 1 | 0 | number,
   /**  1.WEB 2.H5 3.小程序 4.APP */
   environment: 1 | 2 | 3 | 4 | number,
   onRemove?: ((id: number) => void )| null,

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/ActivityAreaSetting/activityProductDrawer.tsx

@@ -71,10 +71,7 @@ const columns: ColumnsType<GetMarketingAdornMerchantActivityListAdornResponseDet
     title: `${intl.formatMessage({ id: 'activePage.brand' })}`,
     dataIndex: 'brand'
   },
-  {
-    title: `${intl.formatMessage({ id: 'activePage.Merchantname' })}`,
-    dataIndex: 'memberName',
-  },
+ 
   {
     title: `${intl.formatMessage({ id: 'activePage.UnitPrice' })}`,
     dataIndex: 'unit',
@@ -297,7 +294,9 @@ const ActivityProductDrawer: React.FC<Iprops> = (props: Iprops) => {
             rowSelection={rowSelection as any}
             rowKey={(_record) => `${_record.activityId!}-${_record.id!}`}
             loading={loading}
-            columns={columns} dataSource={selectedActivityProductList}></Table>
+            columns={columns} 
+            dataSource={selectedActivityProductList}
+          />
         </div>
         <div className={styles.pagination}>
           <Pagination pageSize={currentPageSize} current={current} showQuickJumper total={totalCount} onChange={onChange} />

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'})}`,