From 3926c529af59eb77f4f9cb638b626f24e2b982ad Mon Sep 17 00:00:00 2001 From: lxy Date: Mon, 17 Jun 2024 14:16:48 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- es/components/withdraw/display/web.pc.module.less | 6 ++++-- src/components/withdraw/display/web.pc.module.less | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/es/components/withdraw/display/web.pc.module.less b/es/components/withdraw/display/web.pc.module.less index c8d85267..4f6aea33 100644 --- a/es/components/withdraw/display/web.pc.module.less +++ b/es/components/withdraw/display/web.pc.module.less @@ -47,7 +47,9 @@ } .refundItem { - width: 223px; + // width: 223px; + width: 100%; + box-sizing: border-box; margin: 12px; padding: 8px; font-size: small; @@ -77,7 +79,7 @@ margin-right: 4px; } } - + .reason { color: var(--oak-color-error); } diff --git a/src/components/withdraw/display/web.pc.module.less b/src/components/withdraw/display/web.pc.module.less index c8d85267..4f6aea33 100644 --- a/src/components/withdraw/display/web.pc.module.less +++ b/src/components/withdraw/display/web.pc.module.less @@ -47,7 +47,9 @@ } .refundItem { - width: 223px; + // width: 223px; + width: 100%; + box-sizing: border-box; margin: 12px; padding: 8px; font-size: small; @@ -77,7 +79,7 @@ margin-right: 4px; } } - + .reason { color: var(--oak-color-error); } From b2d40692913a55e7baac66785e1cb58ce1baac8c Mon Sep 17 00:00:00 2001 From: Xc Date: Mon, 17 Jun 2024 18:34:18 +0800 Subject: [PATCH 2/9] 2.2.1-dev --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index c32a70c7..cf7dc1db 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "oak-pay-business", - "version": "2.2.0", + "version": "2.2.1", "description": "", "files": [ "lib/**/*", @@ -50,9 +50,9 @@ "js-base64": "^3.7.2", "lodash": "^4.17.21", "nprogress": "^0.2.0", - "oak-domain": "~5.0.11", - "oak-frontend-base": "~5.2.1", - "oak-general-business": "~5.2.3", + "oak-domain": "file:../oak-domain", + "oak-frontend-base": "file:../oak-frontend-base", + "oak-general-business": "file:../oak-general-business", "react": "~18.2.0", "react-dom": "~18.2.0", "react-image-gallery": "^1.2.11", From 09c3094f7c5eebd688bc969902d32b1852b003c1 Mon Sep 17 00:00:00 2001 From: Xc Date: Mon, 17 Jun 2024 19:47:44 +0800 Subject: [PATCH 3/9] =?UTF-8?q?accountOper/list=E7=9A=84=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accountOper/list/locales/zh-CN.json | 1 + .../accountOper/list/web.module.less | 27 ++++ src/components/accountOper/list/web.pc.tsx | 134 +++++++++++++----- src/components/accountOper/list/web.tsx | 1 + src/locales/common/zh_CN.json | 1 + 5 files changed, 132 insertions(+), 32 deletions(-) create mode 100644 src/components/accountOper/list/web.module.less diff --git a/src/components/accountOper/list/locales/zh-CN.json b/src/components/accountOper/list/locales/zh-CN.json index 4b5a0114..0a544518 100644 --- a/src/components/accountOper/list/locales/zh-CN.json +++ b/src/components/accountOper/list/locales/zh-CN.json @@ -1,4 +1,5 @@ { + "history": "账户历史", "chooseMonth": "选择月份", "type": { "both": "全部", diff --git a/src/components/accountOper/list/web.module.less b/src/components/accountOper/list/web.module.less new file mode 100644 index 00000000..8ea0f01d --- /dev/null +++ b/src/components/accountOper/list/web.module.less @@ -0,0 +1,27 @@ + +.control { + padding: 4px; +} + +.value { + font-size: x-large; + font-weight: bold; +} + +.list { + min-height: 620px; +} + +.types { + padding: 20px; + width: 100%; +} + +.empty { + display: flex; + width: 100%; + flex: 1; + background-color: white; + align-items: center; + justify-content: center; +} \ No newline at end of file diff --git a/src/components/accountOper/list/web.pc.tsx b/src/components/accountOper/list/web.pc.tsx index 45b316a9..1e8bcef4 100644 --- a/src/components/accountOper/list/web.pc.tsx +++ b/src/components/accountOper/list/web.pc.tsx @@ -1,12 +1,12 @@ import React, { useState } from 'react'; -import { Input, Radio, Space, List, Select, Flex, Button } from 'antd'; +import { Radio, Avatar, List, Select, Flex, Button, Card, Result, DatePicker, Modal } from 'antd'; import { CaretDownFilled, SearchOutlined } from '@ant-design/icons'; import { RowWithActions, WebComponentProps } from 'oak-frontend-base'; import { EntityDict } from '../../../oak-app-domain'; -import Styles from './web.pc.module.less'; -import classNames from 'classnames'; +import Styles from './web.module.less'; +import dayJs from 'dayjs'; -export default function Render(props: WebComponentProps void; + setMonth: (month?: Date) => void; setType: (type: 'in' | 'out' | 'both') => void; setChooseMonth: (cm: boolean) => void; setChooseType: (ct: boolean) => void; }>) { - const { accountOpers, hasMore, month, type, chooseMonth, chooseType, monthStr } = props.data; + const { accountOpers, hasMore, month, type, chooseMonth, chooseType, monthStr, oakLoading, oakLoadingMore } = props.data; const { t, loadMore, setType, setMonth, setChooseMonth, setChooseType, navigateBack } = props.methods; - if (accountOpers?.length) { - return ( - + + { + setMonth(value.toDate()); + }} + maxDate={dayJs()} + /> + { + setType(value); + }} value={type} options={[ + { value: 'both', label: t('type.both') }, + { value: 'in', label: t('type.in') }, + { value: 'out', label: t('type.out') }, + ]}/> + }> + {accountOpers?.length ? + ( + {item.symbol}} title={{item.type}} description={ + {item.time} + {t('account:attr.avail')}:{item.avail} + }/> +
+ {item.value} +
+ )} loadMore={!oakLoading && !oakLoadingMore && hasMore ? (
+ +
) : null}/> : ( navigateBack()}> + {t('common::back')} + }/>)} + + ); } diff --git a/es/components/pay/detail/index.js b/es/components/pay/detail/index.js index 5157dcc7..600133e8 100644 --- a/es/components/pay/detail/index.js +++ b/es/components/pay/detail/index.js @@ -264,6 +264,17 @@ export default OakComponent({ }); } }, + updateExternalIdMp(input) { + const { detail } = input; + this.update({ + externalId: detail.value, + }); + }, + clearExternalIdMp() { + this.update({ + externalId: null, + }); + } }, lifetimes: { ready() { diff --git a/es/components/pay/detail/index.xml b/es/components/pay/detail/index.xml index 836cec37..9adce943 100644 --- a/es/components/pay/detail/index.xml +++ b/es/components/pay/detail/index.xml @@ -48,6 +48,16 @@ {{pay.phantom3}} + + + {{offline.channel}} diff --git a/es/components/pay/detail/locales/zh-CN.json b/es/components/pay/detail/locales/zh-CN.json index edf776d6..74c7003f 100644 --- a/es/components/pay/detail/locales/zh-CN.json +++ b/es/components/pay/detail/locales/zh-CN.json @@ -25,10 +25,14 @@ }, "code": { "label": "转帐凭证号", - "help": "请在转帐留言中附上转帐凭证号，便于人工核对" + "help": "请在转帐时于留言中附上转帐凭证号，便于人工核对。若转账时忘记附上，则请准确填写转账流水号。" }, "channel": { "change": "更换", "prefix": "渠道" + }, + "externalId": { + "label": "转账流水号", + "help": "转账成功后有唯一流水号，将之正确填入可减少财务人员核对时的错误概率，给您带来更大便利" } } diff --git a/es/components/pay/detail/web.d.ts b/es/components/pay/detail/web.d.ts index 39e4fddd..59f8c2d6 100644 --- a/es/components/pay/detail/web.d.ts +++ b/es/components/pay/detail/web.d.ts @@ -10,6 +10,7 @@ export declare function RenderOffline(props: { offlines: ColoredOffline[]; offline: ColoredOffline; updateOfflineId: (entityId: string) => void; + updateExternalId: (externalId: string) => void; }): React.JSX.Element; export default function Render(props: WebComponentProps; diff --git a/es/components/pay/detail/web.js b/es/components/pay/detail/web.js index 43a75672..2073c0a1 100644 --- a/es/components/pay/detail/web.js +++ b/es/components/pay/detail/web.js @@ -1,5 +1,5 @@ import React, { useEffect, useState } from 'react'; -import { Card, Tag, List, Button, Modal, Form, Selector, Popup } from 'antd-mobile'; +import { Card, Tag, List, Button, Modal, Form, Selector, Input, Popup } from 'antd-mobile'; import { QRCode, Alert } from 'antd'; import Styles from './web.mobile.module.less'; import * as dayJs from 'dayjs'; @@ -9,8 +9,8 @@ import { CentToString } from 'oak-domain/lib/utils/money'; import { PayCircleOutline, GlobalOutline, InformationCircleOutline, CheckCircleOutline } from 'antd-mobile-icons'; import { generateNewIdAsync } from 'oak-domain/lib/utils/uuid'; export function RenderOffline(props) { - const { pay, t, offline, offlines, updateOfflineId } = props; - const { meta, iState, phantom3 } = pay; + const { pay, t, offline, offlines, updateOfflineId, updateExternalId } = props; + const { meta, iState, phantom3, externalId } = pay; const { type, channel, name, qrCode, color } = offline || {}; const [show, setShow] = useState(false); const items2 = [ @@ -23,6 +23,11 @@ export function RenderOffline(props) { {phantom3} + , + {t('externalId.label')}}> + { + updateExternalId(value); + }} placeholder={t('externalId.help')} disabled={iState !== 'paying'}/> ]; if (type === 'bank') { @@ -121,7 +126,7 @@ function RenderWechatPay(props) { return null; } function RenderPayMeta(props) { - const { pay, notSameApp, t, offlines, offline, updateOfflineId } = props; + const { pay, notSameApp, t, offlines, offline, updateOfflineId, updateExternalId } = props; const { iState, entity } = pay; if (entity !== 'offlineAccount' && notSameApp) { return ; @@ -131,7 +136,7 @@ function RenderPayMeta(props) { if (offline && offlines) { return (<> {iState === 'paying' && } - + ); } return null; @@ -208,6 +213,8 @@ export default function Render(props) { } } ]); + }} updateExternalId={(externalId) => { + update({ externalId }); }}/>
diff --git a/es/components/pay/detail/web.pc.d.ts b/es/components/pay/detail/web.pc.d.ts index dc711022..b1f81282 100644 --- a/es/components/pay/detail/web.pc.d.ts +++ b/es/components/pay/detail/web.pc.d.ts @@ -10,6 +10,7 @@ export declare function RenderOffline(props: { offlines: ColoredOffline[]; offline: ColoredOffline; updateOfflineId: (entityId: string) => void; + updateExternalId: (externalId: string) => void; }): React.JSX.Element | null; export default function Render(props: WebComponentProps; diff --git a/es/components/pay/detail/web.pc.js b/es/components/pay/detail/web.pc.js index 5551770f..f95bc067 100644 --- a/es/components/pay/detail/web.pc.js +++ b/es/components/pay/detail/web.pc.js @@ -1,5 +1,5 @@ import React, { useEffect, useState } from 'react'; -import { Tag, Card, QRCode, Form, Descriptions, Typography, Alert, Button, Modal, Radio } from 'antd'; +import { Input, Tag, Card, QRCode, Form, Descriptions, Typography, Alert, Button, Modal, Radio } from 'antd'; import { CheckCircleOutlined } from '@ant-design/icons'; import { CentToString } from 'oak-domain/lib/utils/money'; import Styles from './web.pc.module.less'; @@ -8,8 +8,8 @@ import duration from 'dayjs/plugin/duration'; import { generateNewIdAsync } from 'oak-domain/lib/utils/uuid'; dayJs.extend(duration); export function RenderOffline(props) { - const { pay, t, offline, offlines, updateOfflineId } = props; - const { iState, phantom3 } = pay; + const { pay, t, offline, offlines, updateOfflineId, updateExternalId } = props; + const { iState, phantom3, externalId } = pay; const { type, channel, name, qrCode, color } = offline; const [show, setShow] = useState(false); const [showQrCode, setShowQrCode] = useState(false); @@ -23,6 +23,12 @@ export function RenderOffline(props) { {phantom3} + , + {t('externalId.label')}}> + { + const { value } = currentTarget; + updateExternalId(value); + }} placeholder={t('externalId.help')} disabled={iState !== 'paying'}/> ]; if (type === 'bank') { @@ -123,7 +129,7 @@ function RenderWechatPay(props) { return null; } function RenderPayMeta(props) { - const { pay, notSameApp, t, offlines, offline, updateOfflineId } = props; + const { pay, notSameApp, t, offlines, offline, updateOfflineId, updateExternalId } = props; const { iState, entity } = pay; if (entity !== 'offlineAccount' && notSameApp) { return ; @@ -133,7 +139,7 @@ function RenderPayMeta(props) { if (offline && offlines) { return (<> {iState === 'paying' && } - + ); } return null; @@ -214,6 +220,10 @@ export default function Render(props) { } } ]); + }} updateExternalId={(externalId) => { + update({ + externalId, + }); }}/>
diff --git a/es/components/pay/list/web.pc.js b/es/components/pay/list/web.pc.js index 357e049b..2779825f 100644 --- a/es/components/pay/list/web.pc.js +++ b/es/components/pay/list/web.pc.js @@ -146,6 +146,8 @@ export default function Render(props) { {offlines && ele.id === spRow.entityId)} updateOfflineId={(entityId) => updateItem({ entity: 'offlineAccount', entityId + }, spId)} updateExternalId={(externalId) => updateItem({ + externalId, }, spId)}/>}
diff --git a/es/configuration/attrUpdateMatrix.js b/es/configuration/attrUpdateMatrix.js index 6834ff12..9d67a307 100644 --- a/es/configuration/attrUpdateMatrix.js +++ b/es/configuration/attrUpdateMatrix.js @@ -67,7 +67,12 @@ const attrUpdateMatrix = { } }, externalId: { - actions: ['startPaying', 'succeedPaying'], + actions: ['startPaying', 'succeedPaying', 'update'], + filter: { + iState: { + $in: ['unpaid', 'paying'], + }, + }, }, }, refund: { diff --git a/es/data/i18n.js b/es/data/i18n.js index cf51db03..456240bd 100644 --- a/es/data/i18n.js +++ b/es/data/i18n.js @@ -52,7 +52,15 @@ const i18ns = [ language: "zh-CN", module: "oak-pay-business", position: "src/components/accountOper/list", - data: {} + data: { + "history": "账户历史", + "chooseMonth": "选择月份", + "type": { + "both": "全部", + "in": "仅收入", + "out": "仅支出" + } + } }, { id: "65d19e4723a89c25e3c10a87013af430", @@ -198,11 +206,15 @@ const i18ns = [ }, "code": { "label": "转帐凭证号", - "help": "请在转帐留言中附上转帐凭证号，便于人工核对" + "help": "请在转帐时于留言中附上转帐凭证号，便于人工核对。若转账时忘记附上，则请准确填写转账流水号。" }, "channel": { "change": "更换", "prefix": "渠道" + }, + "externalId": { + "label": "转账流水号", + "help": "转账成功后有唯一流水号，将之正确填入可减少财务人员核对时的错误概率，给您带来更大便利" } } }, @@ -696,6 +708,7 @@ const i18ns = [ "enter": "请输入", "change": "修改", "finish": "完成", + "loadMore": "加载更多", "pay": { "symbol": "￥", "scale": "元" diff --git a/es/locales/common/zh_CN.json b/es/locales/common/zh_CN.json index 72b70601..111a9cf2 100644 --- a/es/locales/common/zh_CN.json +++ b/es/locales/common/zh_CN.json @@ -46,6 +46,7 @@ "enter": "请输入", "change": "修改", "finish": "完成", + "loadMore": "加载更多", "pay": { "symbol": "￥", "scale": "元" diff --git a/lib/components/pay/detail/index.js b/lib/components/pay/detail/index.js index 0b524bd2..019d08eb 100644 --- a/lib/components/pay/detail/index.js +++ b/lib/components/pay/detail/index.js @@ -269,6 +269,17 @@ exports.default = OakComponent({ }); } }, + updateExternalIdMp(input) { + const { detail } = input; + this.update({ + externalId: detail.value, + }); + }, + clearExternalIdMp() { + this.update({ + externalId: null, + }); + } }, lifetimes: { ready() { diff --git a/lib/configuration/attrUpdateMatrix.js b/lib/configuration/attrUpdateMatrix.js index 93e162f8..bdfc41a9 100644 --- a/lib/configuration/attrUpdateMatrix.js +++ b/lib/configuration/attrUpdateMatrix.js @@ -69,7 +69,12 @@ const attrUpdateMatrix = { } }, externalId: { - actions: ['startPaying', 'succeedPaying'], + actions: ['startPaying', 'succeedPaying', 'update'], + filter: { + iState: { + $in: ['unpaid', 'paying'], + }, + }, }, }, refund: { diff --git a/lib/data/i18n.js b/lib/data/i18n.js index cdb3110d..c26441c2 100644 --- a/lib/data/i18n.js +++ b/lib/data/i18n.js @@ -54,7 +54,15 @@ const i18ns = [ language: "zh-CN", module: "oak-pay-business", position: "src/components/accountOper/list", - data: {} + data: { + "history": "账户历史", + "chooseMonth": "选择月份", + "type": { + "both": "全部", + "in": "仅收入", + "out": "仅支出" + } + } }, { id: "65d19e4723a89c25e3c10a87013af430", @@ -200,11 +208,15 @@ const i18ns = [ }, "code": { "label": "转帐凭证号", - "help": "请在转帐留言中附上转帐凭证号，便于人工核对" + "help": "请在转帐时于留言中附上转帐凭证号，便于人工核对。若转账时忘记附上，则请准确填写转账流水号。" }, "channel": { "change": "更换", "prefix": "渠道" + }, + "externalId": { + "label": "转账流水号", + "help": "转账成功后有唯一流水号，将之正确填入可减少财务人员核对时的错误概率，给您带来更大便利" } } }, @@ -698,6 +710,7 @@ const i18ns = [ "enter": "请输入", "change": "修改", "finish": "完成", + "loadMore": "加载更多", "pay": { "symbol": "￥", "scale": "元" diff --git a/lib/locales/common/zh_CN.json b/lib/locales/common/zh_CN.json index 72b70601..111a9cf2 100644 --- a/lib/locales/common/zh_CN.json +++ b/lib/locales/common/zh_CN.json @@ -46,6 +46,7 @@ "enter": "请输入", "change": "修改", "finish": "完成", + "loadMore": "加载更多", "pay": { "symbol": "￥", "scale": "元" diff --git a/src/components/pay/detail/index.ts b/src/components/pay/detail/index.ts index fed84860..1296e5d2 100644 --- a/src/components/pay/detail/index.ts +++ b/src/components/pay/detail/index.ts @@ -290,6 +290,17 @@ export default OakComponent({ }) } }, + updateExternalIdMp(input: WechatMiniprogram.Input) { + const { detail } = input; + this.update({ + externalId: detail.value, + }); + }, + clearExternalIdMp() { + this.update({ + externalId: null, + }); + } }, lifetimes: { ready() { diff --git a/src/components/pay/detail/index.xml b/src/components/pay/detail/index.xml index 836cec37..9adce943 100644 --- a/src/components/pay/detail/index.xml +++ b/src/components/pay/detail/index.xml @@ -48,6 +48,16 @@ {{pay.phantom3}} + + + {{offline.channel}} diff --git a/src/components/pay/detail/locales/zh-CN.json b/src/components/pay/detail/locales/zh-CN.json index cf78a779..e1dd2fb4 100644 --- a/src/components/pay/detail/locales/zh-CN.json +++ b/src/components/pay/detail/locales/zh-CN.json @@ -25,10 +25,14 @@ }, "code": { "label": "转帐凭证号", - "help": "请在转帐留言中附上转帐凭证号，便于人工核对" + "help": "请在转帐时于留言中附上转帐凭证号，便于人工核对。若转账时忘记附上，则请准确填写转账流水号。" }, "channel": { "change": "更换", "prefix": "渠道" + }, + "externalId": { + "label": "转账流水号", + "help": "转账成功后有唯一流水号，将之正确填入可减少财务人员核对时的错误概率，给您带来更大便利" } } \ No newline at end of file diff --git a/src/components/pay/detail/web.pc.tsx b/src/components/pay/detail/web.pc.tsx index c8805bf7..e782c861 100644 --- a/src/components/pay/detail/web.pc.tsx +++ b/src/components/pay/detail/web.pc.tsx @@ -16,10 +16,11 @@ export function RenderOffline(props: { t: (key: string) => string, offlines: ColoredOffline[]; offline: ColoredOffline; - updateOfflineId: (entityId: string) => void + updateOfflineId: (entityId: string) => void; + updateExternalId: (externalId: string) => void; }) { - const { pay, t, offline, offlines, updateOfflineId } = props; - const { iState, phantom3 } = pay; + const { pay, t, offline, offlines, updateOfflineId, updateExternalId } = props; + const { iState, phantom3, externalId } = pay; const { type, channel, name, qrCode, color } = offline; const [show, setShow] = useState(false); @@ -41,6 +42,20 @@ export function RenderOffline(props: { {phantom3} + , + {t('externalId.label')}} + > + { + const { value } = currentTarget; + updateExternalId(value); + }} + placeholder={t('externalId.help')} + disabled={iState !== 'paying'} + /> ]; if (type === 'bank') { @@ -228,8 +243,9 @@ function RenderPayMeta(props: { offlines?: ColoredOffline[]; offline?: ColoredOffline; updateOfflineId: (entityId: string) => void + updateExternalId: (externalId: string) => void; }) { - const { pay, notSameApp, t, offlines, offline, updateOfflineId } = props; + const { pay, notSameApp, t, offlines, offline, updateOfflineId, updateExternalId } = props; const { iState, entity } = pay; if (entity !== 'offlineAccount' && notSameApp) { return @@ -246,6 +262,7 @@ function RenderPayMeta(props: { offline={offline} offlines={offlines} updateOfflineId={updateOfflineId} + updateExternalId={updateExternalId} /> ); @@ -384,6 +401,11 @@ export default function Render(props: WebComponentProps { + update({ + externalId, + }); + }} />
diff --git a/src/components/pay/detail/web.tsx b/src/components/pay/detail/web.tsx index 3e6f8e34..82ce4112 100644 --- a/src/components/pay/detail/web.tsx +++ b/src/components/pay/detail/web.tsx @@ -21,10 +21,11 @@ export function RenderOffline(props: { t: (key: string) => string, offlines: ColoredOffline[]; offline: ColoredOffline; - updateOfflineId: (entityId: string) => void + updateOfflineId: (entityId: string) => void; + updateExternalId: (externalId: string) => void; }) { - const { pay, t, offline, offlines, updateOfflineId } = props; - const { meta, iState, phantom3 } = pay; + const { pay, t, offline, offlines, updateOfflineId, updateExternalId } = props; + const { meta, iState, phantom3, externalId } = pay; const { type, channel, name, qrCode, color } = offline || {}; const [show, setShow] = useState(false); @@ -45,6 +46,20 @@ export function RenderOffline(props: { {phantom3} + , + {t('externalId.label')}} + > + { + updateExternalId(value); + }} + placeholder={t('externalId.help')} + disabled={iState !== 'paying'} + /> ]; if (type === 'bank') { @@ -221,9 +236,10 @@ function RenderPayMeta(props: { t: (key: string) => string, offlines?: ColoredOffline[]; offline?: ColoredOffline; - updateOfflineId: (entityId: string) => void + updateOfflineId: (entityId: string) => void; + updateExternalId: (externalId: string) => void; }) { - const { pay, notSameApp, t, offlines, offline, updateOfflineId } = props; + const { pay, notSameApp, t, offlines, offline, updateOfflineId, updateExternalId } = props; const { iState, entity } = pay; if (entity !== 'offlineAccount' && notSameApp) { return @@ -240,6 +256,7 @@ function RenderPayMeta(props: { offline={offline} offlines={offlines} updateOfflineId={updateOfflineId} + updateExternalId={updateExternalId} /> ); @@ -383,6 +400,9 @@ export default function Render(props: WebComponentProps { + update({ externalId }); + }} />
diff --git a/src/components/pay/list/web.pc.tsx b/src/components/pay/list/web.pc.tsx index 2d19b72d..1f865b24 100644 --- a/src/components/pay/list/web.pc.tsx +++ b/src/components/pay/list/web.pc.tsx @@ -197,6 +197,9 @@ export default function Render(props: WebComponentProps updateItem({ + externalId, + }, spId)} />} = { } }, externalId: { - actions: ['startPaying', 'succeedPaying'], + actions: ['startPaying', 'succeedPaying', 'update'], + filter: { + iState: { + $in: ['unpaid', 'paying'], + }, + }, }, }, refund: { diff --git a/src/data/i18n.ts b/src/data/i18n.ts index 3351be1f..0ee30b3e 100644 --- a/src/data/i18n.ts +++ b/src/data/i18n.ts @@ -54,7 +54,15 @@ const i18ns: I18n[] = [ language: "zh-CN", module: "oak-pay-business", position: "src/components/accountOper/list", - data: {} + data: { + "history": "账户历史", + "chooseMonth": "选择月份", + "type": { + "both": "全部", + "in": "仅收入", + "out": "仅支出" + } + } }, { id: "65d19e4723a89c25e3c10a87013af430", @@ -200,11 +208,15 @@ const i18ns: I18n[] = [ }, "code": { "label": "转帐凭证号", - "help": "请在转帐留言中附上转帐凭证号，便于人工核对" + "help": "请在转帐时于留言中附上转帐凭证号，便于人工核对。若转账时忘记附上，则请准确填写转账流水号。" }, "channel": { "change": "更换", "prefix": "渠道" + }, + "externalId": { + "label": "转账流水号", + "help": "转账成功后有唯一流水号，将之正确填入可减少财务人员核对时的错误概率，给您带来更大便利" } } }, @@ -698,6 +710,7 @@ const i18ns: I18n[] = [ "enter": "请输入", "change": "修改", "finish": "完成", + "loadMore": "加载更多", "pay": { "symbol": "￥", "scale": "元" From 5daa4bd0af16555cf44dc0e3b579ca594f6aa1c4 Mon Sep 17 00:00:00 2001 From: Xc Date: Mon, 17 Jun 2024 20:35:10 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=BB=8E?= =?UTF-8?q?=E6=8F=90=E7=8E=B0=E9=A1=B5=E9=9D=A2=E5=88=B0=E6=8F=90=E7=8E=B0?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- es/components/withdraw/create/index.d.ts | 1 + es/components/withdraw/create/index.js | 4 ++++ es/components/withdraw/create/index.xml | 4 ++++ es/components/withdraw/create/locales/zh-CN.json | 3 ++- es/components/withdraw/create/web.d.ts | 1 + es/components/withdraw/create/web.js | 8 ++++++-- es/components/withdraw/create/web.pc.d.ts | 1 + es/components/withdraw/create/web.pc.js | 5 ++++- es/data/i18n.js | 3 ++- lib/data/i18n.js | 3 ++- src/components/withdraw/create/index.ts | 4 ++++ src/components/withdraw/create/index.xml | 4 ++++ src/components/withdraw/create/locales/zh-CN.json | 3 ++- src/components/withdraw/create/web.pc.tsx | 9 ++++++++- src/components/withdraw/create/web.tsx | 12 ++++++++++-- src/data/i18n.ts | 3 ++- 16 files changed, 57 insertions(+), 11 deletions(-) diff --git a/es/components/withdraw/create/index.d.ts b/es/components/withdraw/create/index.d.ts index 7883f743..cbdf50b4 100644 --- a/es/components/withdraw/create/index.d.ts +++ b/es/components/withdraw/create/index.d.ts @@ -5,5 +5,6 @@ declare const _default: (props: import("oak-frontend-base").ReactComponentProps< onNewWithdrawAccount: () => void; onCreateWithdraw: (id: string) => void; onGoToHistory: () => void; + onGoToWaManage: () => void; }>) => React.ReactElement; export default _default; diff --git a/es/components/withdraw/create/index.js b/es/components/withdraw/create/index.js index 6d981716..5f7b4e33 100644 --- a/es/components/withdraw/create/index.js +++ b/es/components/withdraw/create/index.js @@ -10,6 +10,7 @@ export default OakComponent({ onNewWithdrawAccount: () => undefined, onCreateWithdraw: (id) => undefined, onGoToHistory: () => undefined, + onGoToWaManage: () => undefined, }, formData({ features }) { const { accountId, withdrawAccountFilter } = this.props; @@ -220,6 +221,9 @@ export default OakComponent({ onGoToHistoryMp() { const { onGoToHistory } = this.props; onGoToHistory && onGoToHistory(); + }, + onGoToWaManageMp() { + this.props.onGoToWaManage(); } }, }); diff --git a/es/components/withdraw/create/index.xml b/es/components/withdraw/create/index.xml index 64857f0d..d1957b62 100644 --- a/es/components/withdraw/create/index.xml +++ b/es/components/withdraw/create/index.xml @@ -105,6 +105,10 @@ {{t('gotoHistory')}} + + + {{t('gotoWaManage')}} + void; + onGoToWaManage: () => void; }, { setValue: (v: string | number | null) => void; switchHelp: (type: 'method' | 'loss') => void; diff --git a/es/components/withdraw/create/web.js b/es/components/withdraw/create/web.js index 12d9f7f0..f8fcab1a 100644 --- a/es/components/withdraw/create/web.js +++ b/es/components/withdraw/create/web.js @@ -1,12 +1,12 @@ import React from 'react'; import { Button, Input, Result } from 'antd-mobile'; -import { DownOutline, UpOutline, ReceiptOutline } from 'antd-mobile-icons'; +import { DownOutline, UpOutline, ReceiptOutline, BankcardOutline } from 'antd-mobile-icons'; import Styles from './web.module.less'; import classNames from 'classnames'; import WithDrawAccountPicker from '../../withdrawAccount/list'; import WithdrawDisplay from '../display'; export default function render(props) { - const { account, value, refundAmount, manualAmount, avail, availYuan, valueYuan, manualAmountYuan, refundAmountYuan, showMethodHelp, showLossHelp, executale, withdrawCreate, withdrawable, withdrawLossText, chooseWa, waFilter, userId, onGoToHistory } = props.data; + const { account, value, refundAmount, manualAmount, avail, availYuan, valueYuan, manualAmountYuan, refundAmountYuan, showMethodHelp, showLossHelp, executale, withdrawCreate, withdrawable, withdrawLossText, chooseWa, waFilter, userId, onGoToHistory, onGoToWaManage } = props.data; const { t, setValue, switchHelp, createWithdrawData, restartAll, createWithdraw, goBack, pickWithdrawChannel } = props.methods; if (!withdrawable) { return ( goBack()}> @@ -85,6 +85,10 @@ export default function render(props) { {t('gotoHistory')}
+
+ + {t('gotoWaManage')} +
+
+ {t('gotoWaManage')} +
+
+ + {t('gotoWaManage')} +