Merge branch 'devXie'

src/locales/en.ts

@@ -76,7 +76,6 @@ export default {
     addAttribute: 'Please add attributes!',
     addSpec: 'Please add specifications!',
     confirm: 'Confirm',
-
     delete: 'Delete',
     nextStep: 'Next',
     previousStep: 'Previous',
@@ -625,8 +624,7 @@ export default {
     pleaseEnterTheCourierBirdAppId: 'Please input the appId',
     pleaseEnterTheCourierBirdAppKey: 'Please input appKey',
     isPaidPackage: 'Whether to charge the package',
-    theThirdPartyTips:
-      'yshop-pro system uses the third-party courier bird api to achieve the courier query, registration address please click.',
+    theThirdPartyTips: 'yshop-pro system uses the third-party courier bird api to achieve the courier query, registration address please click.',
     iRegister: 'I register!',
     courierBirdAppIdCannotBeEmpty: 'ExpressBird appId can not be empty',
     courierBirdAppKeyCannotBeEmpty: 'CourierBird appKey cannot be empty',
@@ -728,10 +726,8 @@ export default {
     subsequentExecutionTime: 'Subsequent execution time',
     pleaseEnterATaskName: 'Please enter a task name',
     pleaseEnterTheParametersOfTheProcessor: 'Please enter the processor parameters',
-    pleaseEnterTheNumberOfRetriesWhenSetTo0NoRetriesArePerformed:
-      'Please enter the number of retries. When set to 0, no retries are performed',
-    pleaseEnterTheRetryIntervalInMillisecondsWhenSetTo0NoIntervalIsRequired:
-      'Please enter the retry interval in milliseconds. When set to 0, no interval is required',
+    pleaseEnterTheNumberOfRetriesWhenSetTo0NoRetriesArePerformed: 'Please enter the number of retries. When set to 0, no retries are performed',
+    pleaseEnterTheRetryIntervalInMillisecondsWhenSetTo0NoIntervalIsRequired: 'Please enter the retry interval in milliseconds. When set to 0, no interval is required',
     pleaseEnterTheMonitoringTimeoutInMilliseconds: 'Please enter the monitoring timeout in milliseconds',
     cronExpression: 'CRON expression',
     taskNameCannotBeNull: 'Task name cannot be empty',
@@ -779,8 +775,7 @@ export default {
     messageInputBox: 'Message input box',
     pleaseEnterMessageSend: 'Please enter the message you want to send',
     theTestPassedAndTheFileWasUploadedSuccessfullyAccessAddress: 'The test passed and the file was uploaded successfully! Access address:',
-    isItConfirmedToModifyTheConfigurationNumberOfTheDataItemIsTheMainConfiguration:
-      'Is it confirmed to modify the data item with the configuration number',
+    isItConfirmedToModifyTheConfigurationNumberOfTheDataItemIsTheMainConfiguration: 'Is it confirmed to modify the data item with the configuration number',
     theDataItemsInTheMainConfigurationOfThe: 'of the data item is the main configuration?',
     test: 'Test',
     masterConfiguration: 'Master Configuration',
@@ -879,8 +874,7 @@ export default {
     pleaseEnterAWarehouseName: 'Please enter a warehouse name',
     pleaseEnter: 'Please enter',
     entityClassName: 'Entity class name',
-    infraTips:
-      'The prefix of the table name is removed by default. If there are duplicates, you need to add the prefix manually to avoid MyBatis reporting Alias duplicates.',
+    infraTips: 'The prefix of the table name is removed by default. If there are duplicates, you need to add the prefix manually to avoid MyBatis reporting Alias duplicates.',
     author: 'Author',
     fieldColumnName: 'Field Column Name',
     fieldDescription: 'Field Description',
@@ -914,16 +908,13 @@ export default {
     moduleName: 'Module name',
     moduleNameIeFirstLevelDirectoryEgSystemInfraToolEtc: 'Module name, i.e. first-level directory, e.g. system, infra, tool, etc.',
     businessName: 'Business name',
-    businessNameIeSecondLevelDirectoryEgUserPermissionDictEtc:
-      'Business name, i.e. second level directory, e.g. user, permission, dict, etc.',
+    businessNameIeSecondLevelDirectoryEgUserPermissionDictEtc: 'Business name, i.e. second level directory, e.g. user, permission, dict, etc.',
     className: 'Class name',
-    classNameInitialCapitalizedEgSysUserSysMenuSysDictDataEtc:
-      'Class name (first letter uppercase), e.g. SysUser, SysMenu, SysDictData, etc.',
+    classNameInitialCapitalizedEgSysUserSysMenuSysDictDataEtc: 'Class name (first letter uppercase), e.g. SysUser, SysMenu, SysDictData, etc.',
     classDescription: 'Class Description',
     usedAsAClassDescriptionEgUser: 'Used as a class description, e.g. user',
     customPath: 'Custom path',
-    fillInTheAbsolutePathToTheDiskIfNotItWillBeGeneratedUnderTheCurrentWebProject:
-      'Fill in the absolute path to the disk, if not, it will be generated under the current web project.',
+    fillInTheAbsolutePathToTheDiskIfNotItWillBeGeneratedUnderTheCurrentWebProject: 'Fill in the absolute path to the disk, if not, it will be generated under the current web project.',
     quickSelectionOfTheNearestPath: 'Quick selection of the nearest path',
     restoreTheDefaultGeneratedBasePath: 'Restore the default generated base path',
     treeTableInformation: 'Tree table information',
@@ -960,13 +951,13 @@ export default {
     timedTaskXls: 'Timed Tasks.xls',
   },
   mall: {
-    paymentResult:'Payment results',
-    scanningTheCodeForReceivingPayment:'Sweep the code to collect money in...',
-    paymentSettlement:'Payment Settlement',
-    placeAnOrder:'Order',
-    neverPlacedAnOrder:'Never placed an order',
-    advertisementPictureManagementXls:'Advertisement Map Management.xls',
-    newAddCashWithdrawal:'New withdrawals',
+    paymentResult: 'Payment results',
+    scanningTheCodeForReceivingPayment: 'Sweep the code to collect money in...',
+    paymentSettlement: 'Payment Settlement',
+    placeAnOrder: 'Order',
+    neverPlacedAnOrder: 'Never placed an order',
+    advertisementPictureManagementXls: 'Advertisement Map Management.xls',
+    newAddCashWithdrawal: 'New withdrawals',
     orderNumber: 'Order Number',
     totalOrderPrice: 'Total Order Price',
     specification: 'Specification',
@@ -991,8 +982,7 @@ export default {
     pendingOrders: 'Pending Order',
     selectProductSpecification: 'Select Product Specification',
     pleaseAddAStoreOrSelectAStore: 'Please add a shop or select a shop',
-    pleaseUseTheScannerBoxOrScannerGunToScanTheMemberPaymentCode:
-      "Please use the scanner box or scanner gun to scan the member's payment code!",
+    pleaseUseTheScannerBoxOrScannerGunToScanTheMemberPaymentCode: "Please use the scanner box or scanner gun to scan the member's payment code!",
     scanTheCodeAndPrintTheTicket: 'Scan the code and print the ticket',
     successfulPayment: 'Payment successful',
     printTicket: 'Print Ticket',
@@ -1607,23 +1597,23 @@ export default {
     open: 'Enable'
   },
   mp: {
-    pleaseSelectTheWeChatOfficialAccount:'Please select public number',
-    clickToLoadMore:'Click to load more',
-    thereIsNoMore:'No more',
-    sends:'Send(S)',
-    theNumberofGraphicMessagesIsLimitedto1:'The number of graphic messages is limited to 1, the first one has been sent by default.',
-    pleaseEnterTheMusicLink:'Please enter a music link',
-    pleaseEnterTheHighQualityMusicLink:'Please enter a high quality music link',
-    selectThePublishedGraphic:'Select a published message',
-    selectTheGraphicintheDraftBox:'Select draft message',
-    selectTheVoice:'Select Voice',
-    text:'Text',
-    graphic:'Graphic',
-    music:'Music',
-    clickToPlayTheVideo:'Click to play video',
-    videoPlayback:'Video Playback',
-    voiceRecognition:'Speech Recognition',
-    abstract:'Abstract',
+    pleaseSelectTheWeChatOfficialAccount: 'Please select public number',
+    clickToLoadMore: 'Click to load more',
+    thereIsNoMore: 'No more',
+    sends: 'Send(S)',
+    theNumberofGraphicMessagesIsLimitedto1: 'The number of graphic messages is limited to 1, the first one has been sent by default.',
+    pleaseEnterTheMusicLink: 'Please enter a music link',
+    pleaseEnterTheHighQualityMusicLink: 'Please enter a high quality music link',
+    selectThePublishedGraphic: 'Select a published message',
+    selectTheGraphicintheDraftBox: 'Select draft message',
+    selectTheVoice: 'Select Voice',
+    text: 'Text',
+    graphic: 'Graphic',
+    music: 'Music',
+    clickToPlayTheVideo: 'Click to play video',
+    videoPlayback: 'Video Playback',
+    voiceRecognition: 'Speech Recognition',
+    abstract: 'Abstract',
     name: 'Name',
     wechatAccount: 'Micro Signal',
     messageEncryptionKey: 'Message encryption and decryption key',
@@ -1635,12 +1625,9 @@ export default {
     pleaseEnterMessageEncryptionKey: 'Please enter the message encryption and decryption key',
     pleaseEnterMiniProgramAppId: 'Please enter applet appId',
     pleaseEnterMiniProgramAppSecret: 'Please enter the applet appSecret',
-    tip11:
-      'You can find ‘Micro Signal’ in the menu [Settings & Development - Public Number Settings - Account Details] of WeChat Public Platform (mp.weixin.qq.com).',
-    tip12:
-      'You can find ‘Developer ID (AppID)’ in the menu [Settings & Development - Public Number Settings - Basic Settings] of WeChat Public Platform (mp.weixin.qq.com).',
-    tip13:
-      'You can find ‘Developer Password (AppSecret)’ in [Settings & Development - Public Number Settings - Basic Settings] on the menu of WeChat Public Platform (mp.weixin.qq.com).',
+    tip11: 'You can find ‘Micro Signal’ in the menu [Settings & Development - Public Number Settings - Account Details] of WeChat Public Platform (mp.weixin.qq.com).',
+    tip12: 'You can find ‘Developer ID (AppID)’ in the menu [Settings & Development - Public Number Settings - Basic Settings] of WeChat Public Platform (mp.weixin.qq.com).',
+    tip13: 'You can find ‘Developer Password (AppSecret)’ in [Settings & Development - Public Number Settings - Basic Settings] on the menu of WeChat Public Platform (mp.weixin.qq.com).',
     nameCannotBeEmpty: 'Name cannot be empty',
     officialAccountCannotBeEmpty: 'Public number account cannot be empty.',
     officialAccountAppIdCannotBeEmpty: 'Public appId cannot be empty.',
@@ -1696,10 +1683,8 @@ export default {
     modifyGraphic: 'Modify image',
     modifiedContentMayNotBeSavedAreYouSureToClose: 'Changes may not have been saved, are you sure you want to close it?',
     publishingSucceeded: 'Post Successful',
-    thisOperationWillPermanentlyDeleteTheDraftAreYouSureToContinue:
-      'This action will permanently delete the draft, do you want to continue?',
-    afterDeletionUsersCannotAccessThisPageAreYouSureToDelete:
-      'Users will not be able to access this page after deletion, are you sure you want to delete it?',
+    thisOperationWillPermanentlyDeleteTheDraftAreYouSureToContinue: 'This action will permanently delete the draft, do you want to continue?',
+    afterDeletionUsersCannotAccessThisPageAreYouSureToDelete: 'Users will not be able to access this page after deletion, are you sure you want to delete it?',
     image: 'Picture',
     voice: 'Voice',
     video: 'Video',
@@ -1709,8 +1694,7 @@ export default {
     selectVideo: 'Select Video',
     tip0: 'Format support MP4, file size not more than 10MB.',
     tips1: 'The title will be displayed on the relevant playback page, it is recommended to fill in a clear, accurate and vivid title.',
-    tips2:
-      'The introduction will be displayed on the relevant playback page, it is recommended to fill in a concise, clear and informative content.',
+    tips2: 'The introduction will be displayed on the relevant playback page, it is recommended to fill in a concise, clear and informative content.',
     pleaseEnterTitle: 'Please enter a title',
     pleaseEnterDescription: 'Please enter a description',
     number: 'No.',
@@ -1720,10 +1704,8 @@ export default {
     download: 'Download',
     delete: 'Delete',
     description: 'Descripción',
-    formatSupportsMp3WmaWavAmrFileSizeNotExceeding2MPlaybackLengthNotExceeding60s:
-      'Support mp3/wma/wav/amr, file size not more than 2M, playback length not more than 60s.',
-    thisOperationWillPermanentlyDeleteTheFileAreYouSureToContinue:
-      'This operation will delete the file permanently, do you want to continue?',
+    formatSupportsMp3WmaWavAmrFileSizeNotExceeding2MPlaybackLengthNotExceeding60s: 'Support mp3/wma/wav/amr, file size not more than 2M, playback length not more than 60s.',
+    thisOperationWillPermanentlyDeleteTheFileAreYouSureToContinue: 'This operation will delete the file permanently, do you want to continue?',
     deleteCurrentMenu: 'Delete current menu',
     menuName: 'Menu name',
     pleaseEnterMenuName: 'Please enter a menu name.',
@@ -1736,14 +1718,11 @@ export default {
     miniProgramPagePath: 'Page path of the applet',
     pleaseEnterMiniProgramPagePathEgPagesIndex: "Please enter the applet's page path, e.g. pages/index",
     miniProgramBackupWebpage: 'Alternate page for the applet:',
-    OlderVersionsOfTheClientThatDoNotSupportMiniProgramsWillOpenThisWebpage:
-      "Older versions of clients that don't support applets will open this page.",
-    tipsYouNeedToAssociateWithTheOfficialAccountToBindTheMiniProgramToTheWeChatMenu:
-      'Tips:You need to associate with your public number to bind the applet to your WeChat menu!',
+    OlderVersionsOfTheClientThatDoNotSupportMiniProgramsWillOpenThisWebpage: "Older versions of clients that don't support applets will open this page.",
+    tipsYouNeedToAssociateWithTheOfficialAccountToBindTheMiniProgramToTheWeChatMenu: 'Tips:You need to associate with your public number to bind the applet to your WeChat menu!',
     selectFromMaterialLibrary: 'Material library selection',
     selectGraphic: 'Select Graphic',
-    YouHaveSelectedAMultiGraphicItWillDefaultToJumpToTheFirstOne:
-      'If you select more than one article, it will jump to the first one by default.',
+    YouHaveSelectedAMultiGraphicItWillDefaultToJumpToTheFirstOne: 'If you select more than one article, it will jump to the first one by default.',
     jumpToWebpage: 'Jump page',
     jumpToMiniProgram: 'Jump to small programme',
     clickToReply: 'Click reply',
@@ -1803,8 +1782,7 @@ export default {
     subscriptionStatus: 'Subscription Status',
     subscriptionTime: 'Subscription time',
     areYouSureToSynchronizeFans: 'Are you sure you want to sync your followers?',
-    startingToSynchronizeFanInfoFromWechatOfficialAccountItTakesTimePleaseQueryLater:
-      "It will take some time to synchronise the followers' information from WeChat, we suggest you to check it later.",
+    startingToSynchronizeFanInfoFromWechatOfficialAccountItTakesTimePleaseQueryLater: "It will take some time to synchronise the followers' information from WeChat, we suggest you to check it later.",
     pleaseSelectTag: 'Please select a tag',
     subscribed: 'Subscribed',
     unsubscribed: 'Unsubscribed'
@@ -1838,14 +1816,11 @@ export default {
     publicKeyOrPublicKeyCertificate: 'Public key or public key certificate',
     pleaseEnterThePublicKeyOrPublicKeyCertificate: 'Please enter the public key or public key certificate',
     keyCertificate: 'key certificate',
-    pleaseEnterTheKeyCertificateAdditionalCertificatesToUseSuchAsSslCertificateOrUnionPayRootLevelCertificates:
-      'Please enter the key certificate, additional certificates to use, such as SSL certificate, or UnionPay root-level certificate aspects',
+    pleaseEnterTheKeyCertificateAdditionalCertificatesToUseSuchAsSslCertificateOrUnionPayRootLevelCertificates: 'Please enter the key certificate, additional certificates to use, such as SSL certificate, or UnionPay root-level certificate aspects',
     passwordOfTheCertificate: 'Password of the certificate',
-    pleaseEnterThePasswordOfThePrivateKeyCertificateOrKeyCertificate:
-      'Please enter the password of the private key certificate or key certificate.',
+    pleaseEnterThePasswordOfThePrivateKeyCertificateOrKeyCertificate: 'Please enter the password of the private key certificate or key certificate.',
     pleaseEnterTheAsynchronousCallback: 'Please enter the asynchronous callback',
-    pleaseEnterTheSynchronousCallbackAddressWhichIsMostlyUsedForPageJumpAfterSuccessfulPayment:
-      'Please enter the address of synchronous callback, which is mostly used for page jump after successful payment.',
+    pleaseEnterTheSynchronousCallbackAddressWhichIsMostlyUsedForPageJumpAfterSuccessfulPayment: 'Please enter the address of synchronous callback, which is mostly used for page jump after successful payment.',
     pleaseSelectSignatureMethodMd5: 'Please select the signature method MD5',
     subappid: 'Subappid',
     pleaseEnterTheSubAppid: 'Please enter the sub-appid',
@@ -2157,8 +2132,7 @@ export default {
     pleaseEnterRedirectableURIAddress: 'Please enter a redirectable URI address.',
     pleaseSelectRecipient: 'Please select the recipient',
     userIdCannotBeEmpty: 'User ID cannot be empty',
-    submissionAndSendingWereSuccessfulTheSendingResultPleaseReferToTheSendingLogNumber:
-      'The commit was sent successfully! The result of the send, see the send log number:',
+    submissionAndSendingWereSuccessfulTheSendingResultPleaseReferToTheSendingLogNumber: 'The commit was sent successfully! The result of the send, see the send log number:',
     clientNumber: 'Client number',
     clientSecretKey: 'Client key',
     appName: 'Application name',
@@ -2381,9 +2355,9 @@ export default {
     numberOfFailedUploads: 'Number of successful uploads:',
     numberOfFailedUpdates: 'Update Failed Quantity:',
     pleaseUploadTheFile: 'Please upload a file',
-    allHaveBeenMarkedAsReadSuccessfully:'All read successfully!',
-    batchMarkingAsReadWasSuccessful:'Batch read successfully!',
-    testSending:'Test Send',
+    allHaveBeenMarkedAsReadSuccessfully: 'All read successfully!',
+    batchMarkingAsReadWasSuccessful: 'Batch read successfully!',
+    testSending: 'Test Send',
   },
   public: {
     all: 'All',

src/locales/zh-CN.ts

@@ -56,7 +56,39 @@ export default {
     copySuccess: '复制成功',
     copyError: '复制失败',
     search: '搜索',
-    detail: '详情'
+    detail: '详情',
+    add: '新增',
+    yes: '是',
+    no: '否',
+    selectShop: '选择店铺',
+    enterProductName: '请输入商品名称',
+    selectCategory: '选择商品分类',
+    enterKeyword: '请输入关键字',
+    enterUnitName: '请输入单位名',
+    enterPrice: '请输入商品价格',
+    enterMarketPrice: '请输入市场价',
+    enterStock: '请输入库存',
+    enterProductDescription: '请输入商品简介',
+    enterPoints: '请输入获得积分',
+    addBasicInfo: '请添加基本信息',
+    selectAttribute: '请选择属性',
+    addCompleteSpec: '请添加完整的规格！',
+    addAttribute: '请添加属性！',
+    addSpec: '请添加规格',
+    confirm: '确认',
+    delete: '删除',
+    nextStep: '下一步',
+    previousStep: '上一步',
+    uploadImage: '上传图片',
+    addNewSpec: '添加新规格',
+    generateNow: '立即生成',
+    selectShopFirst: '请先选择店铺',
+    selectCategoryFirst: '请先选择分类',
+    selectSpec: '选择规格',
+    enterSpecName: '请输入规格',
+    enterSpecValue: '请输入规格值',
+    selectFreightTemplate: '选择运费模板',
+    enterFreight: '请输入邮费'
   },
   lock: {
     lockScreen: '锁定屏幕',