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

src/locales/en-US/balance.ts

@@ -880,5 +880,7 @@ export default {
   'balance.memberSettle.settleMethod.payDayValidate': 'Payment date must be numeric and must be between 1-31',
   'balance.memberSettle.settleMethod.payDay': 'payDay / Mon',
   'balance.memberSettle.settleMethod.payDay.info': 'Payment date: monthly {data}',
-
+  'balance.platformSettlement.columns.estimatedPaymentDate': 'estimatedPaymentDate',
+  'balance.platformSettlement.columns.payTime': 'payTime',
+  'balance.platformSettlement.columns.settlementName': 'settlementName'
 }

src/locales/en-US/purchase.ts

@@ -301,7 +301,7 @@ export default {
   'detail.purchase.null': 'None',
   'detail.purchase.thanks': 'Thank you letter',
   'detail.purchase.respect': 'Respected',
-  'detail.purchase.areaBOList': 'Attribution to city',
+  'detail.purchase.areaBOList': 'Business Location',
   'detail.purchase.pageName': 'Page Name',
   'detail.purchase.doorIndex': 'Purchase portal home page',
   'detail.purchase.aboutUs': 'About Us',

src/locales/ko-KR/balance.ts

@@ -880,4 +880,7 @@ export default {
   'balance.memberSettle.settleMethod.payDayValidate': '결제일은 숫자여야 하며 1-31 사이여야 합니다.',
   'balance.memberSettle.settleMethod.payDay': '매월 지불일',
   'balance.memberSettle.settleMethod.payDay.info': '지불일: 매월 {data}번',
+  'balance.platformSettlement.columns.estimatedPaymentDate': '예상 지불 시간',
+  'balance.platformSettlement.columns.payTime': '실제 지불 시간',
+  'balance.platformSettlement.columns.settlementName': '결제자'
 }

src/locales/ko-KR/purchase.ts

@@ -301,7 +301,7 @@ export default {
   'detail.purchase.null': '없음',
   'detail.purchase.thanks': '감사 편지',
   'detail.purchase.respect': '존경했어',
-  'detail.purchase.areaBOList': '귀속지',
+  'detail.purchase.areaBOList': '사업장 위치',
   'detail.purchase.pageName': '페이지 이름',
   'detail.purchase.doorIndex': '구매 포털 첫 페이지',
   'detail.purchase.aboutUs': '우리',

src/locales/zh-CN/balance.ts

@@ -881,5 +881,8 @@ export default {
   'balance.memberSettle.view': '查看会员策略',
   'balance.memberSettle.settleMethod.payDayValidate': '付款日必须为数字且必须在1-31之间',
   'balance.memberSettle.settleMethod.payDay': '每月付款日',
-  'balance.memberSettle.settleMethod.payDay.info': '付款日：每月{data}号'
+  'balance.memberSettle.settleMethod.payDay.info': '付款日：每月{data}号',
+  'balance.platformSettlement.columns.estimatedPaymentDate': '预计付款时间',
+  'balance.platformSettlement.columns.payTime': '实际付款时间',
+  'balance.platformSettlement.columns.settlementName': '结算方'
 }

src/locales/zh-CN/purchase.ts

@@ -301,7 +301,7 @@ export default {
   'detail.purchase.null': '无',
   'detail.purchase.thanks': '感谢函',
   'detail.purchase.respect': '尊敬的',
-  'detail.purchase.areaBOList': '归属地市',
+  'detail.purchase.areaBOList': '业务所在地',
   'detail.purchase.pageName': '页面名称',
   'detail.purchase.doorIndex': '采购门户首页',
   'detail.purchase.aboutUs': '关于我们',

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

@@ -60,15 +60,16 @@ const AccountReceivable = () => {
         )
       }
     },
-    {title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.settlementDate'}), dataIndex: 'settlementDate'},
-    {title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.settlementWayName'}), dataIndex: 'settlementWayName'},
-    {title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.totalCount'}), dataIndex: 'totalCount', render: (text) => numFormat(text)},
-    {title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.collectAmount'}), dataIndex: 'collectAmount', render: (text) => `${intl.formatMessage({ id: 'common.money' })}${fomatNumber(text)}`},
-    {title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.brokerage'}), dataIndex: 'brokerage'},
-    {title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.amount'}), dataIndex: 'amount', render: (text) => `${intl.formatMessage({ id: 'common.money' })}${fomatNumber(text)}`},
-    // {title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.settlementTime'}), dataIndex: 'settlementDate'},
-    {title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.settlementTime'}), dataIndex: 'settlementTime'},
-    {title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.payWayName'}), dataIndex: 'payWayName'},
+    { title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.settlementDate'}), dataIndex: 'settlementDate'},
+    { title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.settlementWayName'}), dataIndex: 'settlementWayName'},
+    { title: intl.formatMessage({ id: 'balance.platformSettlement.columns.settlementName', defaultMessage: '结算方'}), dataIndex: 'settlementName'},
+    { title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.totalCount'}), dataIndex: 'totalCount', render: (text) => numFormat(text)},
+    { title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.collectAmount'}), dataIndex: 'collectAmount', render: (text) => `${intl.formatMessage({ id: 'common.money' })}${fomatNumber(text)}`},
+    { title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.brokerage'}), dataIndex: 'brokerage'},
+    { title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.amount'}), dataIndex: 'amount', render: (text) => `${intl.formatMessage({ id: 'common.money' })}${fomatNumber(text)}`},
+    { title: intl.formatMessage({id: 'balance.platformSettlement.columns.estimatedPaymentDate', defaultMessage: '实际付款时间'}), dataIndex: 'estimatedPaymentDate'},
+    { title: intl.formatMessage({id: 'balance.platformSettlement.columns.payTime', defaultMessage: '预计付款时间'}), dataIndex: 'payTime'},
+    { title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.payWayName'}), dataIndex: 'payWayName'},
     {
       title: intl.formatMessage({id: 'balance.platformSettlement.accountReceivable.columns.status'}), dataIndex: 'status',
       filters: payStatus,

src/pages/balance/platformSettlement/couponSettlement/hooks/useHandleSettlementList.tsx

@@ -72,8 +72,7 @@ function useHandleSettlementList() {
       }
     },
     { title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.settlementWayName' }), dataIndex: 'settlementWayName' },
-    { title: intl.formatMessage({ id: '结算方' }), dataIndex: 'settlementName' },
-
+    { title: intl.formatMessage({ id: 'balance.platformSettlement.columns.settlementName', defaultMessage: '结算方'}), dataIndex: 'settlementName'},
     { title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.settlementDate' }), dataIndex: 'settlementDate' },
     { title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.totalCount' }), dataIndex: 'totalCount' },
     {
@@ -81,10 +80,9 @@ function useHandleSettlementList() {
       dataIndex: 'amount',
       render: (text) => `${intl.formatMessage({ id: 'common.money' })}${priceFormat(text)}`
     },
-    { title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.settlementTime' }), dataIndex: 'settlementTime' },
+    { title: intl.formatMessage({ id: 'balance.platformSettlement.columns.estimatedPaymentDate', defaultMessage: '预计付款时间' }), dataIndex: 'estimatedPaymentDate' },
+    { title: intl.formatMessage({ id: 'balance.platformSettlement.columns.payTime', defaultMessage: '实际付款时间' }), dataIndex: 'actualPaymentTime' },
     { title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.payWayName' }), dataIndex: 'payWayName' },
-    { title: '预计付款时间', dataIndex: 'payTime' },
-    { title: '实际付款时间', dataIndex: 'actualPayTime' },
     {
       title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.status' }), dataIndex: 'status',
       render: (text, record) => {

src/pages/balance/platformSettlement/integral/hooks/useHandleSettlementList.tsx

@@ -84,7 +84,8 @@ function useHandleSettlementList() {
       }
     },
     { title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.amount' }), dataIndex: 'amount' },
-    { title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.settlementTime' }), dataIndex: 'settlementTime' },
+    { title: intl.formatMessage({ id: 'balance.platformSettlement.columns.estimatedPaymentDate', defaultMessage: '预计付款时间' }), dataIndex: 'estimatedPaymentDate' },
+    { title: intl.formatMessage({id: 'balance.platformSettlement.columns.payTime', defaultMessage: '实际付款时间'}), dataIndex: 'payTime'},
     { title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.payWayName' }), dataIndex: 'payWayName' },
     {
       title: intl.formatMessage({ id: 'balance.platformSettlement.integral.columns.status' }), dataIndex: 'status',

src/pages/user/components/LoginWrap.tsx

@@ -8,7 +8,7 @@ import {
 } from '@ant-design/icons';
 import { postMemberLogin } from '@/services/MemberV2Api';
 import { setAuth, setRouters } from '@/utils/auth';
-import { encryptedByAES } from '@/utils/cryptoAes';
+import { encryptedByAES, Base64 } from '@/utils/cryptoAes';
 import { setUserCookie } from '@/utils/siteCookie';
 import { omit } from '@/utils';
 const intl = getIntl();
@@ -31,7 +31,7 @@ const LoginWrap: React.FC = () => {
         setAuth(data)
         // 此处需使用href跳转， 否则无法触发app.ts中的路由初始化校验
         if (redirect) {
-          window.location.replace(decodeURIComponent(atob(redirect)))
+          window.location.replace(decodeURIComponent(Base64.decode(redirect)))
         } else {
           window.location.replace('/memberCenter/home')
         }

src/pages/user/index.tsx

@@ -55,6 +55,11 @@ const User: React.FC = () => {
     })
   }
 
+  const getRegisterUrl = () => {
+    const { redirect, source } = history.location.query
+    return `/user/register${redirect ? `?redirect=${redirect}` : ''}${source ? `${redirect ? '&' : '?' }source=${source}` : ''}`
+  }
+
   return (
     <Fragment>
       <Helmet>
@@ -88,7 +93,7 @@ const User: React.FC = () => {
                   <LoginWrap />
                   <Row justify='end' style={{ marginTop: 16 }}>
                     <Space size={32}>
-                      <TextLink><Link to='/user/register' style={{ color: '#909399' }}>{intl.formatMessage({id: 'user.mianfeizhuce'})}</Link></TextLink>
+                      <TextLink><Link to={getRegisterUrl()} style={{ color: '#909399' }}>{intl.formatMessage({id: 'user.mianfeizhuce'})}</Link></TextLink>
                       <TextLink><a onClick={forgetPassword} style={{ color: '#909399' }}>{intl.formatMessage({id: 'user.wangjimima'})}</a></TextLink>
                     </Space>
                   </Row>

src/pages/user/register.tsx

@@ -11,12 +11,12 @@ import im_success from '../../../mockStatic/im_success.png'
 import { createFormActions, FormEffectHooks } from '@formily/antd';
 import useCountDown from '@/utils/hooks';
 import { GlobalConfig } from '@/global/config';
-import { omit, transFormSchema, filterUndef } from '@/utils';
+import { omit, transFormSchema, filterUndef, getUrlMemberId } from '@/utils';
 import { getManageContentNoticeFindAllByColumnType } from '@/services/ManageV2Api';
 import { getMemberMenuRegisterDetail, postMemberRegister } from '@/services/MemberV2Api'
 import NiceForm from '@/components/NiceForm';
 import schemas from './schema';
-import { encryptedByAES } from '@/utils/cryptoAes';
+import { Base64, encryptedByAES } from '@/utils/cryptoAes';
 import PasswordInput from './components/PasswordInput'
 import godEvent from '@/utils/event'
 const intl = getIntl();
@@ -79,10 +79,11 @@ let timeChange: any;  // 定时器
 const actions = createFormActions()
 
 const UserRegistry = () => {
-  const [current, setCurrent] = useState(0)
+  const [current, setCurrent] = useState(1)
   const [subStep, setSubStep] = useState(false)
   const [submitLoading, setSubmitLoading] = useState(false)
   const [agreementList, setAgreementList] = useState([])
+  const { source, redirect } = history.location.query
 
   const stepList = [
     { title: intl.formatMessage({id: 'user.tianxiexinxi'}), key: 'message', name: 'message' },
@@ -92,6 +93,16 @@ const UserRegistry = () => {
   ]
 
   useEffect(() => {
+    if (redirect) {
+      const redirectUrl = decodeURIComponent(Base64.decode(redirect))
+      // 判断来源是自营商城时从链接获取自营商城的memberId
+      if (source && source === 'own') {
+        const memberId = getUrlMemberId(redirectUrl)
+        console.log(memberId, source, redirectUrl, 'memberId')
+      }
+    }
+
+    console.log(source, 'source')
     fetchAgreement()
   }, [])
 

src/utils/index.tsx

@@ -703,6 +703,17 @@ export function arrayMoveImmutable<T>(array: T[], fromIndex: number, toIndex: nu
 	return array;
 }
 
+export const getUrlMemberId = (url: string) => {
+  const tempParam = url.match(/\/\d{1,}/)
+  if (tempParam) {
+    const param = tempParam[0] as unknown as string
+    if (param) {
+      return Number(param.replace('/', ''))
+    }
+  }
+  return undefined
+}
+
 export default {
   isArray,
   isObject,