chore: 修改有效期结束时间国际化

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

@@ -30,8 +30,6 @@ export default {
     'merchantCoupon.denomination':'voucher denomination',
     'merchantCoupon.getWayName':'How to get coupons',
     'merchantCoupon.couponName':'Coupon name',
-    'merchantCoupon.receive':'Receive',
-    'merchantCoupon.failureAfterDays':'Failure after days',
     'merchantCoupon.enterCouponNameSearch':'Enter the coupon name to search',
     'merchantCoupon.Search':'Search',
     'merchantCoupon.CouponID':'Coupon ID',
@@ -55,8 +53,6 @@ export default {
     'merchantCoupon.ReceivingConditions':'Receiving Conditions',
     'merchantCoupon.zhang':'张',
     'merchantCoupon.daily':'Daily',
-    'merchantCoupon.acqiure':'Receive',
-    'merchantCoupon.FailureAfterDays':'Failure after days',
     'merchantCoupon.Vipname':'Member Name',
     'merchantCoupon.lfy':'Member Type',
     'merchantCoupon.roleName':'Member Role',
@@ -120,7 +116,6 @@ export default {
     "merchantCoupon.time": "Time",
     "merchantCoupon.reason": "Reason",
     "merchantCoupon.DealsCoupontype": "Coupon Type",
-    "merchantCoupon.effectiveTimeEnd": "Coupon Valid Period Deadline",
     "merchantCoupon.Quantity": "Coupon Issuance Quantity",
     "merchantCoupon.Restart": "Restart",
     "merchantCoupon.Pleasechoosethemallfirst": "Pleasechoosethemallfirst",
@@ -191,5 +186,7 @@ export default {
     "merchantCoupon.VipIDGiveMountDaily": "The total claimable for each member ID must be greater than the daily claimable",
     "merchantCoupon.giveCouponStartTimeValid": "The deadline for receiving (issuing) coupons should be less than the deadline for coupon validity",
     "merchantCoupon.giveCouponStartTimeValidUpto": "The expiration time of the coupon validity period should be greater than the coupon receipt (issuance) deadline",
-    "merchantCoupon.giveCouponEveryID": "The number of coupons issued should be greater than or equal to the total number of receivables per member ID"
+    "merchantCoupon.giveCouponEveryID": "The number of coupons issued should be greater than or equal to the total number of receivables per member ID",
+
+    "merchantCoupon.components.couponRules.effectiveTimeEnd": "It expires {days} days after receipt",
 }

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

@@ -30,8 +30,6 @@ export default {
     'merchantCoupon.denomination': '액면가',
     'merchantCoupon.getWayName': '상품권 수령 방식',
     'merchantCoupon.couponName': '쿠폰 이름',
-    'merchantCoupon.receive': '받다',
-    'merchantCoupon.failureAfterDays': '일후 실효',
     'merchantCoupon.enterCouponNameSearch': '쿠폰 명칭을 입력하여 검색하다',
     'merchantCoupon.Search': '수색하다',
     'merchantCoupon.CouponID': '쿠폰 ID',
@@ -55,8 +53,6 @@ export default {
     'merchantCoupon.ReceivingConditions': '수령 조건',
     'merchantCoupon.zhang': '벌리다',
     'merchantCoupon.daily': '날마다',
-    'merchantCoupon.acqiure': '받다',
-    'merchantCoupon.FailureAfterDays': '일후 실효',
     'merchantCoupon.Vipname': '회원명',
     'merchantCoupon.lfy': '회원 유형',
     'merchantCoupon.roleName': '회원 역할',
@@ -120,7 +116,6 @@ export default {
     "merchantCoupon.time": '타임',
     "merchantCoupon.reason": '까닭',
     "merchantCoupon.DealsCoupontype": '쿠폰 유형',
-    "merchantCoupon.effectiveTimeEnd": '쿠폰 유효기간 마감 시간',
     "merchantCoupon.Quantity": '발행 수량',
     "merchantCoupon.Restart": '재부팅',
     "merchantCoupon.Pleasechoosethemallfirst": '우선 상점을 선택하세요',
@@ -191,5 +186,7 @@ export default {
     "merchantCoupon.VipIDGiveMountDaily": '각 회원 ID 총 수령가능은 매일 수령가능보다 커야 합니다',
     "merchantCoupon.giveCouponStartTimeValid": '수령권 마감 시간은 권 유효기간 마감 시간보다 작아야 한다',
     "merchantCoupon.giveCouponStartTimeValidUpto": '쿠폰의 유효기간 마감 시간은 쿠폰의 수령 마감 시간보다 많을 것이다',
-    "merchantCoupon.giveCouponEveryID": '발권 수량은 매 회원 ID의 총 수령 수량보다 많아야 합니다'
+    "merchantCoupon.giveCouponEveryID": '발권 수량은 매 회원 ID의 총 수령 수량보다 많아야 합니다',
+
+    "merchantCoupon.components.couponRules.effectiveTimeEnd": "수령후 {days}일후에는 효력을 상실한다",
 }
\ No newline at end of file

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

@@ -30,8 +30,6 @@ export default {
     'merchantCoupon.denomination': '劵面额',
     'merchantCoupon.getWayName': '领劵方式',
     'merchantCoupon.couponName': '优惠劵名称',
-    'merchantCoupon.receive': '领取',
-    'merchantCoupon.failureAfterDays': '天后失效',
     'merchantCoupon.enterCouponNameSearch': '输入优惠劵名称进行搜索',
     'merchantCoupon.Search': '搜索',
     'merchantCoupon.CouponID': '优惠劵ID',
@@ -55,8 +53,6 @@ export default {
     'merchantCoupon.ReceivingConditions': '领取条件',
     'merchantCoupon.zhang': '张',
     'merchantCoupon.daily': '每日',
-    'merchantCoupon.acqiure': '领取',
-    'merchantCoupon.FailureAfterDays': '天后失效',
     'merchantCoupon.Vipname': '会员名称',
     'merchantCoupon.lfy': '会员类型',
     'merchantCoupon.roleName': '会员角色',
@@ -120,7 +116,6 @@ export default {
     "merchantCoupon.time": "时间",
     "merchantCoupon.reason": "原因",
     "merchantCoupon.DealsCoupontype": "优惠劵类型",
-    "merchantCoupon.effectiveTimeEnd": "劵有效期截止时间",
     "merchantCoupon.Quantity": "发劵数量",
     "merchantCoupon.Restart": "重启",
     "merchantCoupon.Pleasechoosethemallfirst": "请先选择商城",
@@ -191,5 +186,7 @@ export default {
     "merchantCoupon.VipIDGiveMountDaily": "每会员ID总共可领取必须大于每日可领取",
     "merchantCoupon.giveCouponStartTimeValid": "领(发)券截止时间应该小于券有效期截止时间",
     "merchantCoupon.giveCouponStartTimeValidUpto": "券有效期截止时间应该大于领(发)券截止时间",
-    "merchantCoupon.giveCouponEveryID": "发券数量应该大于等于每会员ID总共可领取数量"
+    "merchantCoupon.giveCouponEveryID": "发券数量应该大于等于每会员ID总共可领取数量",
+
+    "merchantCoupon.components.couponRules.effectiveTimeEnd": "领取{days}天后过期",
 }
\ No newline at end of file

src/pages/transaction/marketingAbility/merchantCoupon/common/columns/coupon.tsx

@@ -62,7 +62,7 @@ const columns = (target = '/memberCenter/marketingAbility/merchantCoupon/unsubmi
     title: intl.formatMessage({ id: 'merchantCoupon.effectiveTimeEnd' }),
     dataIndex: 'effectiveTimeEnd',
     align: 'center',
-    render: (text, record) => text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : `${intl.formatMessage({ id: 'merchantCoupon.receive' }) + record.invalidDay + intl.formatMessage({ id: 'merchantCoupon.failureAfterDays' })}`,
+    render: (text, record) => text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : `${intl.formatMessage({ id: 'merchantCoupon.components.couponRules.effectiveTimeEnd' }, { days: record.invalidDay || '' })}`,
   },
   {
     title: intl.formatMessage({ id: 'merchantCoupon.getWayName' }),

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

@@ -6,6 +6,7 @@
  * @Description: 优惠券规则
  */
 import React from 'react';
+import { getIntl} from 'umi';
 import moment from 'moment';
 import {
   MERCHANT_COUPON_RECEIVE_FRONT,
@@ -14,7 +15,7 @@ import {
   MERCHANT_COUPON_RECEIVE_OPERATE,
 } from '@/constants/marketing';
 import CustomizeColumn, { IProps as CustomizeColumnProps, DataItem } from '@/components/CustomizeColumn';
-import { getIntl} from 'umi'
+
 const intl = getIntl();
 
 export type PropsType = Omit<CustomizeColumnProps, 'data' | 'column'> & {
@@ -99,7 +100,7 @@ const CouponRules: React.FC<PropsType> = (props: PropsType) => {
     ),
     {
       title: intl.formatMessage({ id: 'merchantCoupon.ExpirationDate' }),
-      value: dataSource.effectiveTimeEnd ? moment(dataSource.effectiveTimeEnd).format('YYYY-MM-DD HH:mm:ss') : `${intl.formatMessage({ id: 'merchantCoupon.acqiure' }) + dataSource.invalidDay || '' + intl.formatMessage({ id: 'merchantCoupon.FailureAfterDays' })}`,
+      value: dataSource.effectiveTimeEnd ? moment(dataSource.effectiveTimeEnd).format('YYYY-MM-DD HH:mm:ss') : `${intl.formatMessage({ id: 'merchantCoupon.components.couponRules.effectiveTimeEnd' }, { days: dataSource.invalidDay || '' })}`,
     },
     {
       title: intl.formatMessage({ id: 'merchantCoupon.instructions' }),