diff --git a/src/locales/en_US/pages.ts b/src/locales/en_US/pages.ts index 18144db..34cb6a7 100644 --- a/src/locales/en_US/pages.ts +++ b/src/locales/en_US/pages.ts @@ -95,8 +95,10 @@ export default { 'pages.company.expireTitle': 'Company Subscription Expired', 'pages.company.expireSubTitle': "Your company's license has expired. All features are temporarily locked. Please contact your sales representative to renew.", - 'pages.company.expireInDays': 'Subscription expires in {days} days', + 'pages.company.expireInDays': + 'Subscription expires in {days} days', 'pages.company.expireToday': 'Subscription expiring soon; it expires today.', + 'pages.company.expireInfo': 'Subscription expires on: ', 'pages.totalDataSourceCount': 'Total Data Sources', 'pages.activeDataSourceCount': 'Active Data Sources', 'pages.mt4DataSourceCount': 'MT4 Data Sources', @@ -342,6 +344,10 @@ export default { 'form.company.validityEndTime': 'Expiry At (UTC+0)', 'form.company.validityEndTime.placeholder': 'Select expiry date', 'form.company.validityEndTime.tips': 'Blank for Permanent', + 'form.company.validityEndTime.preset.7days': '7 days later', + 'form.company.validityEndTime.preset.30days': '30 days later', + 'form.company.validityEndTime.preset.60days': '60 days later', + 'form.company.validityEndTime.preset.90days': '90 days later', 'form.role.permissionGuide': 'Permission Guide', 'form.role.otherPermissions': 'Other Menu Permissions', diff --git a/src/locales/zh_CN/pages.ts b/src/locales/zh_CN/pages.ts index 28bfc3c..9508bde 100644 --- a/src/locales/zh_CN/pages.ts +++ b/src/locales/zh_CN/pages.ts @@ -95,8 +95,9 @@ export default { 'pages.company.expireTitle': '公司订阅已过期', 'pages.company.expireSubTitle': '您的公司在该系统的使用授权已到期,各项功能已暂时锁定。请联系商务代表进行续费操作以恢复访问。', - 'pages.company.expireInDays': '订阅即将到期,剩余 {days}天', + 'pages.company.expireInDays': '订阅即将到期,剩余 {days} 天', 'pages.company.expireToday': '订阅即将到期,今天到期', + 'pages.company.expireInfo': '订阅到:', 'pages.totalDataSourceCount': '数据源总数', 'pages.activeDataSourceCount': '活跃数据源', 'pages.mt4DataSourceCount': 'MT4 数据源', @@ -334,6 +335,10 @@ export default { 'form.company.validityEndTime': '到期时间(UTC+0)', 'form.company.validityEndTime.placeholder': '请选择到期时间', 'form.company.validityEndTime.tips': '留空为永久有效', + 'form.company.validityEndTime.preset.7days': '7天后', + 'form.company.validityEndTime.preset.30days': '30天后', + 'form.company.validityEndTime.preset.60days': '60天后', + 'form.company.validityEndTime.preset.90days': '90天后', 'form.role.permissionGuide': '权限怎么选', 'form.role.otherPermissions': '其他菜单权限', diff --git a/src/pages/company/Popup.tsx b/src/pages/company/Popup.tsx index cb64839..359cd7f 100644 --- a/src/pages/company/Popup.tsx +++ b/src/pages/company/Popup.tsx @@ -132,12 +132,29 @@ export default (props: { fieldProps={{ style: { width: '100%' }, disabledDate: (current: Dayjs) => { - // return current?.isBefore(dayjs().startOf('day')); - return ( - current?.format('YYYY-MM-DD') < - dayjs.utc().format('YYYY-MM-DD') + return current?.isBefore( + dayjs.utc().subtract(2, 'day').startOf('day'), ); + // return current < dayjs.utc(); }, + presets: [ + { + label: $t('form.company.validityEndTime.preset.7days'), + value: dayjs.utc().add(7, 'day'), + }, + { + label: $t('form.company.validityEndTime.preset.30days'), + value: dayjs.utc().add(30, 'day'), + }, + { + label: $t('form.company.validityEndTime.preset.60days'), + value: dayjs.utc().add(60, 'day'), + }, + { + label: $t('form.company.validityEndTime.preset.90days'), + value: dayjs.utc().add(90, 'day'), + }, + ], }} /> )}