Merge branch 'cherry-pick-4707c627' into 'v2-220418'

src/pages/balance/accountsPayable/settlementList/logisticsDetail.tsx

@@ -5,7 +5,7 @@
  */
 
 import React, { useRef, useEffect, useState, useMemo } from 'react';
-import { useIntl } from 'umi'
+import { useIntl, history } from 'umi'
 import { PageHeaderWrapper } from '@ant-design/pro-layout'
 import { Card, PageHeader, Descriptions, Button, DatePicker } from 'antd';
 import NiceForm from '@/components/NiceForm';
@@ -25,6 +25,7 @@ import {
 } from '@/services/SettleV2Api';
 import useBalanceInfo from '../../hooks/useBalanceInfo';
 import CustomizeColumn from '@/components/CustomizeColumn';
+import ReutrnEle from '@/components/ReturnEle';
 const RangePicker = DatePicker.RangePicker
 const formActions = createFormActions();
 
@@ -75,6 +76,8 @@ const logisticsDetail: React.FC = () => {
   return (
     <PageHeaderWrapper
       title={intl.formatMessage({ id: 'balance.accountsPayable.settlementList.logisticsDetail.title' }, { data: initialValue?.settlementNo })}
+      onBack={() => history.goBack()}
+      backIcon={<ReutrnEle />}
     >
       <div style={{ marginBottom: '16px' }}>
         <CustomizeColumn data={infoList} title="" column={3} />

src/pages/balance/accountsPayable/settlementList/orderDetail.tsx

@@ -27,6 +27,7 @@ import {
   getSettleAccountsMemberSettlementGetPayableDetail,
   getSettleAccountsMemberSettlementPagePayableOrderSettlement
 } from '@/services/SettleV2Api';
+import ReutrnEle from '@/components/ReturnEle';
 
 const RangePicker = DatePicker.RangePicker;
 const formActions = createFormActions();
@@ -40,6 +41,8 @@ const OrderDetail: React.FC = () => {
   return (
     <PageHeaderWrapper
       title={intl.formatMessage({ id: 'balance.accountsPayable.settlementList.orderDetail.title' }, { data: infoDetail?.settlementNo })}
+      onBack={() => history.goBack()}
+      backIcon={<ReutrnEle />}
     >
       <div style={{ marginBottom: '16px' }}>
         <CustomizeColumn data={infoList} title="" column={3} />

src/pages/balance/accountsPayable/settlementList/productNoticeSettlementDetail.tsx

@@ -27,6 +27,7 @@ import {
   getSettleAccountsMemberSettlementPagePayableProductionNoticeSettlement
 } from '@/services/SettleV2Api';
 import CustomizeColumn from '@/components/CustomizeColumn';
+import ReutrnEle from '@/components/ReturnEle';
 
 const RangePicker = DatePicker.RangePicker;
 const formActions = createFormActions();
@@ -63,6 +64,8 @@ const ProductNoticeSettlementDetail: React.FC = () => {
   return (
     <PageHeaderWrapper
       title={intl.formatMessage({ id: 'balance.accountsPayable.settlementList.productNoticeSettlementDetail.title' }, { data: initialValue?.settlementNo })}
+      onBack={() => history.goBack()}
+      backIcon={<ReutrnEle />}
     >
       <div style={{ marginBottom: '16px' }}>
         <CustomizeColumn data={infoList} title="" column={3} />

src/pages/balance/accountsReceivable/settlementList/logisticsDetail.tsx

@@ -27,6 +27,7 @@ import {
 } from '@/services/SettleV2Api';
 import useBalanceInfo from '../../hooks/useBalanceInfo';
 import CustomizeColumn from '@/components/CustomizeColumn';
+import ReutrnEle from '@/components/ReturnEle';
 
 const RangePicker = DatePicker.RangePicker;
 const formActions = createFormActions();
@@ -61,6 +62,8 @@ const logisticsDetail: React.FC = () => {
   return (
     <PageHeaderWrapper
       title={intl.formatMessage({ id: 'balance.accountsReceivable.settlementList.logisticsDetail.title' }, { data: initialValue?.settlementNo })}
+      onBack={() => history.goBack()}
+      backIcon={<ReutrnEle />}
     >
       <div style={{ marginBottom: '16px' }}>
         <CustomizeColumn data={infoList} title="" column={3} />

src/pages/balance/accountsReceivable/settlementList/orderDetail.tsx

@@ -24,6 +24,7 @@ import {
   getSettleAccountsMemberSettlementGetPayableDetail,
   getSettleAccountsMemberSettlementPagePayableOrderSettlement
 } from '@/services/SettleV2Api';
+import ReutrnEle from '@/components/ReturnEle';
 
 const RangePicker = DatePicker.RangePicker;
 const formActions = createFormActions();
@@ -37,6 +38,8 @@ const OrderDetail: React.FC = () => {
   return (
     <PageHeaderWrapper
       title={intl.formatMessage({ id: 'balance.accountsReceivable.settlementList.orderDetail.title' }, { data: infoDetail?.settlementNo })}
+      onBack={() => history.goBack()}
+      backIcon={<ReutrnEle />}
     >
       <div style={{ marginBottom: '16px' }}>
         <CustomizeColumn data={infoList} title="" column={3} />

src/pages/balance/accountsReceivable/settlementList/productNoticeSettlementDetail.tsx

@@ -25,6 +25,7 @@ import {
 import useInitialValue from '@/pages/member/common/hooks/useInitialValue';
 import CustomizeColumn from '@/components/CustomizeColumn';
 import useBalanceInfo from '../../hooks/useBalanceInfo';
+import ReutrnEle from '@/components/ReturnEle';
 
 const RangePicker = DatePicker.RangePicker;
 const formActions = createFormActions();
@@ -64,6 +65,8 @@ const ProductNoticeSettlementDetail: React.FC = () => {
   return (
     <PageHeaderWrapper
       title={intl.formatMessage({ id: 'balance.accountsReceivable.settlementList.productNoticeSettlementDetail.title' }, { data: initialValue?.settlementNo })}
+      onBack={() => history.goBack()}
+      backIcon={<ReutrnEle />}
     >
       <div style={{ marginBottom: '16px' }}>
         <CustomizeColumn data={infoList} title="" column={3} />

src/pages/balance/platformSettlement/accountReceivable/info.tsx

@@ -31,6 +31,7 @@ import {
 } from '@/services/SettleV2Api';
 import useBalanceInfo from '../../hooks/useBalanceInfo';
 import CustomizeColumn from '@/components/CustomizeColumn';
+import ReutrnEle from '@/components/ReturnEle';
 
 const formActions = createFormActions();
 const columns = [
@@ -138,6 +139,8 @@ const Info: React.FC = () => {
   return (
     <PageHeaderWrapper
       title={intl.formatMessage({ id: 'balance.platformSettlement.accountReceivable.info.title' }, { data: initialValue?.settlementNo })}
+      onBack={() => history.goBack()}
+      backIcon={<ReutrnEle />}
     >
       <div style={{ marginBottom: '16px' }}>
         <CustomizeColumn data={infoList} title="" column={3} />

src/pages/balance/platformSettlement/couponSettlement/info.tsx

@@ -20,6 +20,7 @@ import {
 } from '@/services/SettleV2Api';
 import CustomizeColumn from '@/components/CustomizeColumn';
 import { priceFormat } from '@/utils/numberFomat';
+import ReutrnEle from '@/components/ReturnEle';
 
 const intl = getIntl();
 
@@ -91,6 +92,8 @@ const Info: React.FC = () => {
   return (
     <PageHeaderWrapper
       title={intl.formatMessage({ id: 'balance.platformSettlement.integral.info.title' }, { data: initialValue?.settlementNo })}
+      onBack={() => history.goBack()}
+      backIcon={<ReutrnEle />}
     >
       <div style={{ marginBottom: '16px' }}>
         <CustomizeColumn data={infoList} title="" column={3} />

src/pages/balance/platformSettlement/integral/info.tsx

@@ -26,6 +26,7 @@ import {
   getSettleAccountsPlatformScoreSettlementPageReceivableSettlementDetail
 } from '@/services/SettleV2Api';
 import CustomizeColumn from '@/components/CustomizeColumn';
+import ReutrnEle from '@/components/ReturnEle';
 
 const formActions = createFormActions();
 
@@ -87,6 +88,8 @@ const Info: React.FC = () => {
   return (
     <PageHeaderWrapper
       title={intl.formatMessage({ id: 'balance.platformSettlement.integral.info.title' }, { data: initialValue?.settlementNo })}
+      onBack={() => history.goBack()}
+      backIcon={<ReutrnEle />}
     >
       <div style={{ marginBottom: '16px' }}>
         <CustomizeColumn data={infoList} title="" column={3} />

src/pages/member/memberMaintain/black/schema.ts

@@ -43,7 +43,6 @@ export const blockedModalSchema: ISchema = {
           'x-component': 'Textarea',
           'x-component-props': {
             placeholder: intl.formatMessage({ id: 'member.management.maintain.black.getBlocked.form.reason.placeholder' }),
-            maxLength: 60, 
             rows: 5, 
           },
           'x-rules': [

src/pages/member/memberMaintain/eliminate/schema.ts

@@ -43,7 +43,6 @@ export const unfriendModalSchema: ISchema = {
           'x-component': 'Textarea',
           'x-component-props': {
             placeholder: intl.formatMessage({ id: 'member.management.maintain.eliminate.remove.form.reason.placeholder' }),
-            maxLength: 60,
             rows: 5,
           },
           'x-rules': [

src/pages/member/memberMaintain/freeze/schema.ts

@@ -26,7 +26,6 @@ export const freezeSchema: ISchema = {
           'x-component': 'Textarea',
           'x-component-props': {
             placeholder: intl.formatMessage({ id: 'member.management.maintain.freeze.freeze.form.reason.placeholder' }),
-            maxLength: 60, 
             rows: 5, 
           },
           'x-rules': [

src/pages/member/memberMaintain/unfreeze/schema.ts

@@ -43,7 +43,6 @@ export const unfriendModalSchema: ISchema = {
           'x-component': 'Textarea',
           'x-component-props': {
             placeholder: intl.formatMessage({ id: 'member.management.maintain.unfreeze.unfreeze.form.placeholder-reason' }),
-            maxLength: 60,
             rows: 5,
           },
           'x-rules': [

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

@@ -200,7 +200,7 @@ const MerchantCouponDetail: React.FC<IProps> = (props) => {
     ),
     {
       key: 'applicableMember',
-      name: intl.formatMessage({ id: 'merchantCoupon.suitMall' }),
+      name: intl.formatMessage({ id: 'merchantCoupon.suitUsers' }),
     },
     {
       key: 'innerFlowRecords',