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

src/locales/en-US/member.ts

@@ -544,6 +544,9 @@ export default {
   'member.components.MemberDocCategory.title':'Category Information',
   'member.components.MemberDocCategory.edit':'Modify',
   'member.components.MemberDocCategory.edit.message':'Submitting, please wait...',
+  'member.components.MemberDocCategory.month': '{month} months',
+  'member.components.MemberDocCategory.monthDay': '{monthDay} date',
+  'member.components.MemberDocCategory.days': '{days} days',
   'member.components.MemberDocIncomingInfo.title':'Incoming Information',
   'member.components.MemberDocIncomingInfo.before':'Before change',
   'member.components.MemberDocIncomingInfo.new':'NEW',

src/locales/ko-KR/member.ts

@@ -536,6 +536,9 @@ export default {
   'member.components.MemberDocCategory.title': '분류 정보',
   'member.components.MemberDocCategory.edit': '수정',
   'member.components.MemberDocCategory.edit.message': '커밋 중입니다. 잠시 기다려 주십시오...',
+  'member.components.MemberDocCategory.month': '{month} 개월',
+  'member.components.MemberDocCategory.monthDay': '{monthDay} 날짜',
+  'member.components.MemberDocCategory.days': '{days} 일',
   'member.components.MemberDocIncomingInfo.title': '입고 정보',
   'member.components.MemberDocIncomingInfo.before': '변경 전',
   'member.components.MemberDocIncomingInfo.new': 'NEW',

src/locales/zh-CN/member.ts

@@ -540,6 +540,9 @@ export default {
   'member.components.MemberDocCategory.title': '分类信息',
   'member.components.MemberDocCategory.edit': '修改',
   'member.components.MemberDocCategory.edit.message': '正在提交，请稍候...',
+  'member.components.MemberDocCategory.month': '{month}个月',
+  'member.components.MemberDocCategory.monthDay': '{monthDay}号',
+  'member.components.MemberDocCategory.days': '{days}天',
   'member.components.MemberDocIncomingInfo.title': '入库信息',
   'member.components.MemberDocIncomingInfo.before': '变更前',
   'member.components.MemberDocIncomingInfo.new': 'NEW',

src/pages/member/components/MemberDocCategory/index.tsx

@@ -221,9 +221,9 @@ const MemberDocCategory: React.FC<DocCategoryProps> = (props: DocCategoryProps)
                 </Descriptions.Item>
                 <Descriptions.Item label={intl.formatMessage({ id: 'member.components.MemberDocCategory.category.paymentDay' })}>
                   {`${item.payTypeName} `}
-                  {item.month ? `${item.month}个月` : ''}
-                  {item.monthDay ? `${item.monthDay}号` : ''}
-                  {item.days ? `${item.days}天` : ''}
+                  {item.month ? `${intl.formatMessage({ id: 'member.components.MemberDocCategory.month' }, { month: item.month })}` : ''}
+                  {item.monthDay ? `${intl.formatMessage({ id: 'member.components.MemberDocCategory.monthDay' }, { monthDay: item.monthDay })}` : ''}
+                  {item.days ? `${intl.formatMessage({ id: 'member.components.MemberDocCategory.days' }, { days: item.days })}` : ''}
                 </Descriptions.Item>
                 <Descriptions.Item label={intl.formatMessage({ id: 'member.components.MemberDocCategory.category.invoiceTypeName' })}>{item.invoiceTypeName}</Descriptions.Item>
                 <Descriptions.Item label={intl.formatMessage({ id: 'member.components.MemberDocCategory.category.taxPoint' })}>{item.taxPoint}%</Descriptions.Item>

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

@@ -22,6 +22,8 @@ interface Iprops {
   id: number,
   /** 商城子域名 */
   url: string,
+  // 是否是自营商城
+  self: 1 | 0,
   /**  1.WEB 2.H5 3.小程序 4.APP */
   environment: 1 | 2 | 3 | 4 | number,
   onRemove?: ((id: number) => void )| null,
@@ -33,7 +35,6 @@ interface Iprops {
 const APP_FIXTURE_LINK = `/memberCenter/marketingAbility/activityPages/management/fixtures`
 const WEB_FIXTURE_LINK = `/memberCenter/marketingAbility/activityPages/management/webFixtures`
 
-
 const PENDIGN_ONLINE = 1;
 const ONLINE = 2;
 /** 进行中 */
@@ -61,6 +62,7 @@ const ActiveItem: React.FC<Iprops> = (props: Iprops) => {
     onChangeStatus, 
     environment,
     url,
+    self,
   } = props;
 
   const handleRemove = () => {
@@ -110,7 +112,7 @@ const ActiveItem: React.FC<Iprops> = (props: Iprops) => {
               {
                 environment === WEB && status !== END && (
                   <div className={styles.copyLink}>
-                    <Paragraph copyable={{ text: `${REQUEST_HEADER}${url}.${TOP_DOMAIN}/activity/${id}` }} />
+                    <Paragraph copyable={{ text: (self ? url : `${REQUEST_HEADER}${url}.${TOP_DOMAIN}`) + `/activity/${id}` }} />
                   </div>
                 )
               }

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

@@ -115,20 +115,14 @@ const ActivePage = () => {
           <div className={styles.table}>
             {
               dataSource.map((_item, key) => {
+
                 return (
                   <div className={styles.tableItem} key={key} >
                     <ActivityItem
-                      id={_item.id}
-                      templatePicUrl={_item.templatePicUrl}
+                      {..._item}
                       title={_item.name}
-                      templateName={_item.templateName}
-                      statusName={_item.statusName}
-                      shopName={_item.shopName}
                       startTime={_item.startTime as unknown as string}
                       endTime={_item.endTime as unknown as string}
-                      environment={_item.environment}
-                      status={_item.status}
-                      url={_item.url}
                       onRemove={handleRemove}
                       onChangeStatus={onChangeStatus}
                     />