feat: 待支付订单通联支付国际化，e账户剩余国际化

src/locales/en-US/commodity.ts

@@ -912,6 +912,16 @@ export default {
   'commodity.products.schema.fastSchema.min':'Lowest price',
   'commodity.products.schema.fastSchema.max':'Highest price',
   'commodity.products.schema.fastSchema.submit':'Query',
+  'commodity.products.schema.fastSchema.qingxuanzeshangjiashangpin' : 'Please select the goods on the shelves',
+  'commodity.products.schema.fastSchema.daochuchenggong' : 'Export success',
+  'commodity.products.menuMore.5' : 'Export product QR code',
+  'commodity.products.liebiaogouxuan' : 'List check:',
+  'commodity.products.geshangpin' : 'A commodity',
+  'commodity.products.shuoming' : 'xplain:',
+  'commodity.products.textone' : '1. a maximum of 1000 product two-dimensional code export',
+  'commodity.products.texttwo' : '2. The size of the QR code of the exported product is 400*400',
+  'commodity.products.textthree' : '3. The QR code of the product shall be in. JPG format, and the picture shall be named as the product ID+ the product name (for example: 10001 DIR Cool and Refreshing Yi Xia Zhenggong Red Lipstick).',
+  'commodity.products.textfour' : '4. The qr code picture of the exported product is packaged according to the store. The file name of the package is the store name + the date of the current export (for example: APP Store 20121201).',
 
 
-}
\ No newline at end of file
+}

src/locales/en-US/order.ts

@@ -468,6 +468,8 @@ export default {
   'saleOrder.querenshenhecao': 'Confirm review operation',
   'saleOrder.shifouquerenshen': 'Are you sure to review the invoice number?',
   'saleOrder.dexiaoshoufahuo': 'The sales invoice',
+  'saleOrder.xuanzeleixin': 'selective type',
+  'saleOrder.xiaochengxu': 'mini program',
 
   // Requisitions
 
@@ -568,4 +570,4 @@ export default {
   'purchaseRequisition.bianjiqinggoudan': 'Edit purchase requisition',
   'purchaseRequisition.xinzengqinggoudan': 'New purchase requisition',
   'purchaseRequisition.baocun': 'Save'
-}
\ No newline at end of file
+}

src/locales/en-US/payandSettle.ts

@@ -1025,6 +1025,7 @@ export default {
   'payandSettle.capitalAccounts.eAccount.jiebangshoujihao': 'Untie mobile phone number',
   'payandSettle.capitalAccounts.eAccount.bangdingxinshouji': 'Bind new phone number',
   'payandSettle.capitalAccounts.eAccount.caozuochenggong': 'Operation successful',
+  'payandSettle.capitalAccounts.eAccount.caozuoshibai': 'operation failure',
   'payandSettle.capitalAccounts.eAccount.tijiao': 'Submit',
   'payandSettle.capitalAccounts.eAccount.tonglianzhanghu': 'Tonglian Account',
   'payandSettle.capitalAccounts.eAccount.jiekouqingqiuyi': 'Interface request exception',
@@ -1056,4 +1057,7 @@ export default {
   'payandSettle.capitalAccounts.eAccount.shurunideshou': 'Enter your mobile phone number',
   'payandSettle.capitalAccounts.eAccount.qingtianxieyanzheng': 'Please fill in the verification code',
   'payandSettle.capitalAccounts.eAccount.qingshuruduanxin': 'Please enter the SMS verification code',
+  'payandSettle.capitalAccounts.eAccount.yiwanchengzhifu': 'Payment completed',
+  'payandSettle.capitalAccounts.eAccount.weiwanchengzhifu': 'Outstanding payment',
+  'payandSettle.capitalAccounts.eAccount.fukuanwanchengqianqingbuyaoguanbi': 'Please do not close this window until payment is completed. After completing the payment, please click the button below according to your situation.',
 }

src/locales/en-US/transaction_components.ts

@@ -311,4 +311,14 @@ export default {
   'transaction_components.wenjianleixingbixuwei': 'File type must be',
   'transaction_components.shangchuanwenjiandaxiaobuchao1': 'Upload file size does not exceed',
   'transaction_components.yicishangchuanyigewenjian1': 'Upload one file at a time, and the size of each attachment cannot exceed',
+  'transaction_components.qingsaomawanchengzhifu': 'Please scan the code to complete payment',
+  'transaction_components.liantongzhifuqueren': 'Confirmation of payment through link',
+  'transaction_components.liantongzhifu': 'Allinpay',
+  'transaction_components.yanzhengma': 'verification code',
+  'transaction_components.yifasongweihaozhi': 'A verification code has been sent to you ending with',
+  'transaction_components.deshoujihao': 'The mobile phone number',
+  'transaction_components.zhifu': 'payment',
+  'transaction_components.yiwanchengzhifu': 'Payment completed',
+  'transaction_components.weiwanchengzhifu': 'Outstanding payment',
+  'transaction_components.fukuanqianqingbuyaoguanbi': 'Please do not close this window until payment is completed. After completing the payment, please click the button below according to your situation.',
 }

src/locales/ko-KR/commodity.ts

@@ -912,6 +912,16 @@ export default {
   'commodity.products.schema.fastSchema.min' : '최저 가격',
   'commodity.products.schema.fastSchema.max' : '최고 가격',
   'commodity.products.schema.fastSchema.submit' : '조회',
+  'commodity.products.schema.fastSchema.qingxuanzeshangjiashangpin' : '진열대 상품 조작을 선택하세요',
+  'commodity.products.schema.fastSchema.daochuchenggong' : '성공적으로 내보내기',
+  'commodity.products.menuMore.5' : '상품의 qr 코드를 내보내다',
+  'commodity.products.liebiaogouxuan' : '목록 체크:',
+  'commodity.products.geshangpin' : '몇 가지 상품',
+  'commodity.products.shuoming' : '해설',
+  'commodity.products.textone' : '1. 한번에 최대 1000개의 상품 qr 코드를 내보냅니다',
+  'commodity.products.texttwo' : '2. 상품 내보내기 qr 코드 크기는 400*400입니다',
+  'commodity.products.textthree' : '3. 상품 qr 코드는.jpg 형식, 사진 이름은 상품 id + 상품명 (예:10001_dir 시원한 여름 정궁 립스틱)  ',
+  'commodity.products.textfour' : '4. 상품 2차원 코드 내보내기 그림 쇼핑몰 패키지 압축 패키지, 압축 패키지 파일 이름 규칙에 따라 쇼핑몰 이름 + 현재 내보내기 년월일 (예:app 쇼핑몰 20121201) ',
 
 
 }

src/locales/ko-KR/order.ts

@@ -468,6 +468,8 @@ export default {
   'saleOrder.querenshenhecao': '감사 작업 확인',
   'saleOrder.shifouquerenshen': '승인 송장 번호가',
   'saleOrder.dexiaoshoufahuo': '의 판매 송장',
+  'saleOrder.xuanzeleixin': '선택 형식:',
+  'saleOrder.xiaochengxu': '애플릿',
 
   // 请购单
 

src/locales/ko-KR/payandSettle.ts

@@ -1025,6 +1025,7 @@ export default {
   'payandSettle.capitalAccounts.eAccount.jiebangshoujihao': '휴대폰 번호를 묶다',
   'payandSettle.capitalAccounts.eAccount.bangdingxinshouji': '새 휴대폰 번호 바인딩',
   'payandSettle.capitalAccounts.eAccount.caozuochenggong': '작업 성공',
+  'payandSettle.capitalAccounts.eAccount.caozuoshibai': '작업 실패',
   'payandSettle.capitalAccounts.eAccount.tijiao': '커밋',
   'payandSettle.capitalAccounts.eAccount.tonglianzhanghu': '통관 계좌',
   'payandSettle.capitalAccounts.eAccount.jiekouqingqiuyi': '인터페이스 요청 예외',
@@ -1056,4 +1057,7 @@ export default {
   'payandSettle.capitalAccounts.eAccount.shurunideshou': '핸드폰 번호 입력',
   'payandSettle.capitalAccounts.eAccount.qingtianxieyanzheng': '인증번호를 입력하십시오.',
   'payandSettle.capitalAccounts.eAccount.qingshuruduanxin': '문자 인증번호 입력',
+  'payandSettle.capitalAccounts.eAccount.yiwanchengzhifu': '지불이 완료되다',
+  'payandSettle.capitalAccounts.eAccount.weiwanchengzhifu': '미지급',
+  'payandSettle.capitalAccounts.eAccount.fukuanwanchengqianqingbuyaoguanbi': '付款完成前请不要关闭此窗口。完成付款后请根据您的情况点击下面的按钮。',
 }

src/locales/ko-KR/transaction_components.ts

@@ -311,4 +311,14 @@ export default {
   'transaction_components.wenjianleixingbixuwei': '파일 유형은 다음과 같아야 합니다.',
   'transaction_components.shangchuanwenjiandaxiaobuchao1': '업로드 파일 크기 초과 안 함',
   'transaction_components.yicishangchuanyigewenjian1': '한 번에 하나의 파일을 업로드하며, 각 첨부 파일의 크기는 초과할 수 없습니다.',
+  'transaction_components.qingsaomawanchengzhifu': '코드를 스캔해서 결제를 마쳐 주세요',
+  'transaction_components.liantongzhifuqueren': '통화 지불 확인',
+  'transaction_components.liantongzhifu': '통화 결제',
+  'transaction_components.yanzhengma': '인증번호',
+  'transaction_components.yifasongweihaozhi': '끝 번호로 확인 번호가 전송되었습니다',
+  'transaction_components.deshoujihao': '핸드폰 번호',
+  'transaction_components.zhifu': '지불',
+  'transaction_components.yiwanchengzhifu': '지불이 완료되다',
+  'transaction_components.weiwanchengzhifu': '미지급',
+  'transaction_components.fukuanqianqingbuyaoguanbi': '결제가 완료되기 전에는이 창을 닫지 마십시오. 결제 완료 후 귀하의 상황에 맞게 아래 단추를 클릭해 주십시오.  ',
 }

src/locales/zh-CN/commodity.ts

@@ -913,6 +913,16 @@ export default {
   'commodity.products.schema.fastSchema.min' : '最低价格',
   'commodity.products.schema.fastSchema.max' : '最高价格',
   'commodity.products.schema.fastSchema.submit' : '查询',
+  'commodity.products.schema.fastSchema.qingxuanzeshangjiashangpin' : '请选择上架的商品操作',
+  'commodity.products.schema.fastSchema.daochuchenggong' : '导出成功',
+  'commodity.products.menuMore.5' : '导出商品二维码',
+  'commodity.products.liebiaogouxuan' : '列表勾选：',
+  'commodity.products.geshangpin' : '个商品',
+  'commodity.products.shuoming' : '说明：',
+  'commodity.products.textone' : '1、一次最多导出1000个商品二维码',
+  'commodity.products.texttwo' : '2、导出商品二维码大小为400*400',
+  'commodity.products.textthree' : '3、商品二维码为.jpg格式，图片命名为商品ID+商品名称（例如：10001_DIR清凉一夏正宫红口红）',
+  'commodity.products.textfour' : '4、导出的商品二维码图片按商城打包压缩包，压缩包文件命名规则为商城名称+当前导出年月日（例如：APP商城_20121201)',
 
 
 }

src/locales/zh-CN/order.ts

@@ -468,6 +468,8 @@ export default {
   'saleOrder.querenshenhecao': '确认审核操作',
   'saleOrder.shifouquerenshen': '是否确认审核发货单号为',
   'saleOrder.dexiaoshoufahuo': '的销售发货单',
+  'saleOrder.xuanzeleixin': '选择类型：',
+  'saleOrder.xiaochengxu': '小程序',
 
   // 请购单
 

src/locales/zh-CN/payandSettle.ts

@@ -1025,6 +1025,7 @@ export default {
   'payandSettle.capitalAccounts.eAccount.jiebangshoujihao': '解绑手机号',
   'payandSettle.capitalAccounts.eAccount.bangdingxinshouji': '绑定新手机号',
   'payandSettle.capitalAccounts.eAccount.caozuochenggong': '操作成功',
+  'payandSettle.capitalAccounts.eAccount.caozuoshibai': '操作成功',
   'payandSettle.capitalAccounts.eAccount.tijiao': '提交',
   'payandSettle.capitalAccounts.eAccount.tonglianzhanghu': '通联账户',
   'payandSettle.capitalAccounts.eAccount.jiekouqingqiuyi': '接口请求异常',
@@ -1056,4 +1057,7 @@ export default {
   'payandSettle.capitalAccounts.eAccount.shurunideshou': '输入你的手机号码',
   'payandSettle.capitalAccounts.eAccount.qingtianxieyanzheng': '请填写验证码',
   'payandSettle.capitalAccounts.eAccount.qingshuruduanxin': '请输入短信验证码',
+  'payandSettle.capitalAccounts.eAccount.yiwanchengzhifu': '已完成支付',
+  'payandSettle.capitalAccounts.eAccount.weiwanchengzhifu': '未完成支付',
+  'payandSettle.capitalAccounts.eAccount.fukuanwanchengqianqingbuyaoguanbi': '付款完成前请不要关闭此窗口。完成付款后请根据您的情况点击下面的按钮。',
 }

src/locales/zh-CN/transaction_components.ts

@@ -311,4 +311,14 @@ export default {
   'transaction_components.wenjianleixingbixuwei': '文件类型必须为',
   'transaction_components.shangchuanwenjiandaxiaobuchao1': '上传文件大小不超过',
   'transaction_components.yicishangchuanyigewenjian1': '一次上传一个文件，每个附件大小不能超过',
+  'transaction_components.qingsaomawanchengzhifu': '请扫码完成支付',
+  'transaction_components.liantongzhifuqueren': '通联支付确认',
+  'transaction_components.liantongzhifu': '通联支付',
+  'transaction_components.yanzhengma': '验证码',
+  'transaction_components.yifasongweihaozhi': '已将验证码发送至您尾号为',
+  'transaction_components.deshoujihao': '的手机号',
+  'transaction_components.zhifu': '支付',
+  'transaction_components.yiwanchengzhifu': '已完成支付',
+  'transaction_components.weiwanchengzhifu': '未完成支付',
+  'transaction_components.fukuanqianqingbuyaoguanbi': '付款完成前请不要关闭此窗口。完成付款后请根据您的情况点击下面的按钮。',
 }

src/pages/commodity/products/index.tsx

@@ -525,9 +525,9 @@ const Products: React.FC<{}> = () => {
     } else if(e.key === '5') {
       console.log(currentRefRow.current)
       if(!currentRefRow.current.every(item => item.status === 5)) {
-        return message.error('请选择上架的商品操作')
+        return message.error(intl.formatMessage({ id: 'commodity.products.handleBatch.qingxuanzeshangjiashangpin' }))
       }
-      currentRef.current.length ? setExportQrcodeModal(true) : message.error('请选择需要操作的商品')
+      currentRef.current.length ? setExportQrcodeModal(true) : message.error(intl.formatMessage({ id: 'commodity.products.handleBatchDelete.error' }))
     }
   }
 
@@ -547,7 +547,7 @@ const Products: React.FC<{}> = () => {
       window.URL.revokeObjectURL(url);
     }).finally(() => {
       setExportLoading(false)
-      message.success('导出成功')
+      message.success(intl.formatMessage({ id: 'commodity.products.handleBatch.daochuchenggong' }))
       setExportQrcodeModal(false)
     })
   }
@@ -620,7 +620,7 @@ const Products: React.FC<{}> = () => {
         {intl.formatMessage({ id: 'commodity.products.menuMore.4' })}
       </Menu.Item>
       <Menu.Item key="5" icon={<ExportOutlined />}>
-        导出商品二维码
+        {intl.formatMessage({ id: 'commodity.products.menuMore.5' })}
       </Menu.Item>
     </Menu>
   )
@@ -785,18 +785,18 @@ const Products: React.FC<{}> = () => {
         </Form>
       </Modal>
       <Modal
-        title='导出商品二维码'
+        title={intl.formatMessage({ id: 'commodity.products.menuMore.5' })}
         visible={exportQrcodeModal}
         onOk={handleExportQrcode}
         onCancel={() => setExportQrcodeModal(false)}
         confirmLoading={exportLoading}
       >
-        <h1>列表勾选：{currentRef.current.length || 0}个商品</h1>
-        <h2>说明：</h2>
-        <p>1、一次最多导出1000个商品二维码</p>
-        <p>2、导出商品二维码大小为400*400</p>
-        <p>3、商品二维码为.jpg格式，图片命名为商品ID+商品名称（例如：10001_DIR清凉一夏正宫红口红）</p>
-        <p>4、导出的商品二维码图片按商城打包压缩包，压缩包文件命名规则为商城名称+当前导出年月日（例如：APP商城_20121201)</p>
+        <h1>{intl.formatMessage({ id: 'commodity.products.liebiaogouxuan' })}{currentRef.current.length || 0}{intl.formatMessage({ id: 'commodity.products.geshangpin' })}</h1>
+        <h2>{intl.formatMessage({ id: 'commodity.products.shuoming' })}</h2>
+        <p>{intl.formatMessage({ id: 'commodity.products.textone' })}</p>
+        <p>{intl.formatMessage({ id: 'commodity.products.texttwo' })}</p>
+        <p>{intl.formatMessage({ id: 'commodity.products.textthree' })}</p>
+        <p>{intl.formatMessage({ id: 'commodity.products.textfour' })}</p>
       </Modal>
       {/* 选择上游商品 */}
       <UpperProductModalTable currentRef={upperRef} type="checkbox" tableRef={ref} />

src/pages/payandSettle/capitalAccounts/eAccount/index.tsx

@@ -100,7 +100,7 @@ const EAccountDetail: React.FC<{}> = () => {
     const { code, data, message: msg } = res
     if(code !== 1000) { return false }
     setDetails(data)
-    setExtra(`已将验证码发送至您尾号为${data.phone.substr(7, 4)}的手机号`)
+    setExtra(`${intl.formatMessage({id: 'payandSettle.capitalAccounts.eAccount.yijiangyanzhengma'})}${data.phone.substr(7, 4)}${intl.formatMessage({id: 'payandSettle.capitalAccounts.eAccount.deshoujihao'})}`)
     getPayEAccountAllInPayGetEAccountStatusRecord({id: data.id + ''}).then(res => {
       const { data } = res
       setMoveData(data)
@@ -651,7 +651,7 @@ const EAccountDetail: React.FC<{}> = () => {
       </Modal>
       {/* 网银/快捷验证码 */}
       <Modal
-        title='验证码'
+        title={intl.formatMessage({ id: 'payandSettle.eAccountApprove.components.personalFinish.mellowCard.4.captcha'})}
         visible={sendCodeVisible}
         onOk={handleSendCode}
         onCancel={() => setSendCodeVisible(false)}
@@ -692,14 +692,14 @@ const EAccountDetail: React.FC<{}> = () => {
         </Form>
       </Modal>
       <Modal
-        title="支付"
+        title={intl.formatMessage({ id: 'payandSettle.amountAccountManage.paymentWithdraw.columns.option.1'})}
         visible={payResultVisible}
         onOk={()=>{getAccountInfo();setPayResultVisible(false)}}
         onCancel={()=>setPayResultVisible(false)}
-        okText="已完成支付"
-        cancelText="未完成支付"
+        okText={intl.formatMessage({ id: 'payandSettle.capitalAccounts.eAccount.yiwanchengzhifu'})}
+        cancelText={intl.formatMessage({ id: 'payandSettle.capitalAccounts.eAccount.weiwanchengzhifu'})}
       >
-        <p>付款完成前请不要关闭此窗口。完成付款后请根据您的情况点击下面的按钮。</p>
+        <p>{intl.formatMessage({ id: 'payandSettle.capitalAccounts.eAccount.fukuanwanchengqianqingbuyaoguanbi'})}</p>
       </Modal>
     </PageHeaderWrapper>
   )

src/pages/payandSettle/eAccountApprove/components/company/index.tsx

@@ -99,9 +99,9 @@ const Company: React.FC<{}> = () => {
 
     Promise.all(fns).then((res) => {
       if(res.every(item => item['code'] === 1000)) {
-        message.success('操作成功')
+        message.success(intl.formatMessage({ id: 'payandSettle.capitalAccounts.eAccount.caozuochenggong' }))
       } else {
-        message.success('操作失败')
+        message.success(intl.formatMessage({ id: 'payandSettle.capitalAccounts.eAccount.caozuoshibai' }))
       }
       setLoading(false)
       reloadFormData()

src/pages/transaction/components/orderPayModal/index.tsx

@@ -335,7 +335,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
       handleSubmitPay()
     } else if(current === 4 || current === 6) {
       // 微信 支付宝 提示扫码支付
-      return message.info('请扫码完成支付')
+      return message.info(intl.formatMessage({id: 'transaction_components.qingsaomawanchengzhifu'}))
     } else if(current === 99) {
       // 提交通联支付
       handleSubmitPay()
@@ -779,7 +779,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
           </p>
           <p>
             <span className={style.title}>
-            支付金额(元)：
+            {intl.formatMessage({id: 'transaction_components.zhifujineyuan'})}：
             </span>
             <span className={cx(style.amount, style.amount2)}>
               {Number(paymentAmount).toFixed(2)}
@@ -791,18 +791,18 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
       {
         current === 99 &&
         <div>
-          <p style={{fontWeight: "bold"}}>通联支付确认</p>
+          <p style={{fontWeight: "bold"}}>{intl.formatMessage({id: 'transaction_components.liantongzhifuqueren'})}</p>
           <p>
             <span className={style.title}>
-            支付方式：
+            {intl.formatMessage({id: 'transaction_components.zhifufangshi'})}：
             </span>
             <span className={style.amount}>
-            通联支付
+            {intl.formatMessage({id: 'transaction_components.liantongzhifu'})}
             </span>
           </p>
           <p>
             <span className={style.title}>
-            支付渠道：
+            {intl.formatMessage({id: 'transaction_components.zhifuqudao'})}：
             </span>
             <span className={style.amount}>
             {checked?.channel}
@@ -842,8 +842,8 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
             onFinish={submitFormCode}
           >
           <Form.Item
-            label="验证码"
-            extra={phoneEndNumber ? `已将验证码发送至您尾号为${phoneEndNumber.substr(7, 4)}的手机号` : ''}
+            label={intl.formatMessage({id: 'transaction_components.yanzhengma'})}
+            extra={phoneEndNumber ? `${intl.formatMessage({id: 'transaction_components.yifasongweihaozhi'})}${phoneEndNumber.substr(7, 4)}${intl.formatMessage({id: 'transaction_components.deshoujihao'})}` : ''}
             style={{textAlign: "left"}}
           >
             <Row gutter={8}>
@@ -866,14 +866,14 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
       }
     </Modal>
     <Modal
-      title="支付"
+      title={intl.formatMessage({id: 'transaction_components.zhifu'})}
       visible={payResultVisible}
       onOk={()=>{history.goBack();setPayResultVisible(false)}}
       onCancel={()=>setPayResultVisible(false)}
-      okText="已完成支付"
-      cancelText="未完成支付"
+      okText={intl.formatMessage({id: 'transaction_components.yiwanchengzhifu'})}
+      cancelText={intl.formatMessage({id: 'transaction_components.weiwanchengzhifu'})}
     >
-      <p>付款完成前请不要关闭此窗口。完成付款后请根据您的情况点击下面的按钮。</p>
+      <p>{intl.formatMessage({id: 'transaction_components.fukuanqianqingbuyaoguanbi'})}</p>
     </Modal>
   </>)
 }

src/pages/transaction/saleOrder/index.tsx

@@ -557,11 +557,11 @@ const SaleOrder: React.FC<SaleOrderProps> = () => {
     >
       <div>
         <div style={{marginBottom: 10}}>
-          <p>选择类型：</p>
+          <p>{intl.formatMessage({ id: 'saleOrder.xuanzeleixin', defaultMessage: '选择类型：' })}选择类型：</p>
           <Radio.Group onChange={onChangePayModel} value={payModel}>
             <Radio value='web'>WEB</Radio>
             <Radio value='app'>APP</Radio>
-            <Radio value='miniapp'>小程序</Radio>
+            <Radio value='miniapp'>{intl.formatMessage({ id: 'saleOrder.xiaochengxu', defaultMessage: '小程序' })}</Radio>
             <Radio value='H5'>H5</Radio>
           </Radio.Group>
         </div>