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

.npmrc

-registry="http://npm.shushangyun.com"
-# registry = "https://registry.npmjs.org/"
+registry = "https://registry.npmjs.org/"
+@linkseeks:registry="http://npm.shushangyun.com"

src/locales/en-US/balance.ts

@@ -54,7 +54,7 @@ export default {
   'balance.accountsReceivable.invoice.message.1': '请选择开票记录',
   'balance.accountsReceivable.invoice.message.2': '无法合并开票，请单张开票！',
 
-  'balance.accountsReceivable.invoice.schema.orderNo':'Search order number',
+  'balance.accountsReceivable.invoice.schema.orderNo':'Search Doc number',
   'balance.accountsReceivable.invoice.schema.orderAbstract':'Document Summary',
   'balance.accountsReceivable.invoice.schema.orderStartTime':'Order time (start time)',
   'balance.accountsReceivable.invoice.schema.orderEndTime':'Order time (end time)',

src/locales/ko-KR/balance.ts

@@ -54,7 +54,7 @@ export default {
   'balance.accountsReceivable.invoice.message.1': '请选择开票记录',
   'balance.accountsReceivable.invoice.message.2': '无法合并开票，请单张开票！',
 
-  'balance.accountsReceivable.invoice.schema.orderNo': '주문 번호 검색',
+  'balance.accountsReceivable.invoice.schema.orderNo': '영수증 번호 검색',
   'balance.accountsReceivable.invoice.schema.orderAbstract': '증빙서류 요약',
   'balance.accountsReceivable.invoice.schema.orderStartTime': '주문 시간(시작 시간)',
   'balance.accountsReceivable.invoice.schema.orderEndTime': '주문 시간(종료 시간)',

src/locales/zh-CN/balance.ts

@@ -54,7 +54,7 @@ export default {
   'balance.accountsReceivable.invoice.message.1': '请选择开票记录',
   'balance.accountsReceivable.invoice.message.2': '无法合并开票，请单张开票！',
 
-  'balance.accountsReceivable.invoice.schema.orderNo': '搜索订单号',
+  'balance.accountsReceivable.invoice.schema.orderNo': '搜索单据号',
   'balance.accountsReceivable.invoice.schema.orderAbstract': '单据摘要',
   'balance.accountsReceivable.invoice.schema.orderStartTime': '下单时间（开始时间）',
   'balance.accountsReceivable.invoice.schema.orderEndTime': '下单时间（结束时间）',

src/pages/balance/accountsReceivable/settlementList/schema/index.tsx

@@ -53,6 +53,30 @@ export const schema: ISchema = {
                 }
               }
             },
+            /** 预计付款时间 */
+            // "[startTime, endTime]": {
+            //   type: 'object',
+            //   "x-component": 'RangePicker',
+            //   'x-component-props': {
+            //     allowClear: true,
+            //     placeholder: [intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.startTime'}), intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.endTime'})],
+            //     style: {
+            //       minWidth: "320px"
+            //     }
+            //   }
+            // },
+            /** 实际付款时间 */
+            // "[startTime, endTime]": {
+            //   type: 'object',
+            //   "x-component": 'RangePicker',
+            //   'x-component-props': {
+            //     allowClear: true,
+            //     placeholder: [intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.startTime'}), intl.formatMessage({id: 'balance.accountsReceivable.settlementList.schema.schema.endTime'})],
+            //     style: {
+            //       minWidth: "320px"
+            //     }
+            //   }
+            // },
             status: {
               type: 'string',
               enum: [],

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Toolbar/index.tsx

@@ -6,6 +6,7 @@ import { Modal } from 'antd';
 import { useIntl} from 'umi'
 import Color from './color';
 import { changeProps, SelectedInfoType, STATE_PROPS, useSelector } from '@linkseeks/design-react';
+import { usePageStatus } from '@/hooks/usePageStatus';
 
 interface Iprops {
   extra?: React.ReactNode,
@@ -18,6 +19,7 @@ type SettingPanelType = {
 
 const Toolbar: React.FC<Iprops> = (props: Iprops) => {
   const { pageConfig } = useSelector<SettingPanelType, STATE_PROPS>(['pageConfig']);
+  const { id } = usePageStatus();
   const color = pageConfig?.[0]?.props?.backgroundColor;
 
   const intl = useIntl();
@@ -26,7 +28,8 @@ const Toolbar: React.FC<Iprops> = (props: Iprops) => {
     Modal.confirm({
       title: intl.formatMessage({ id: 'activityPage.confirmLeaveDecoratePage' }),
       onOk: () => {
-        history.goBack()
+        // history.goBack()
+        history.push(`/memberCenter/marketingAbility/activityPages/management/edit?id=${id}`)
       },
     })
   };

src/pages/transaction/purchaseAbility/confirmOffer/contrast/index.tsx

@@ -156,7 +156,7 @@ const ContrastPrice = () => {
     let company = [];
     data[0].company.forEach(item => {
       if (item.sumPrice) {
-        company.push(`${item.memberName}（${intl.formatMessage({ id: 'detail.purchase.message24' })}：¥${item.sumPrice}）`)
+        company.push(`${item.memberName}（${intl.formatMessage({ id: 'detail.purchase.message25' })}：¥${item.sumPrice}）`)
       }
     })
     setDisabled(false)