Merge branch 'dev' of gitea.51mars.com:Oak-Team/oak-pay-business into dev

This commit is contained in:
Xu Chang 2024-07-12 16:01:36 +08:00
commit b21b714a00
2 changed files with 3 additions and 3 deletions

View File

@ -6,7 +6,7 @@ export default function render(props) {
const { wpAccount, wechatPay, oakFullpath, systemId } = props.data;
const { t, update } = props.methods;
if (wpAccount) {
return (<Form labelCol={{ span: 8 }} wrapperCol={{ span: 12 }} layout="horizontal" style={{ minWidth: 860 }}>
return (<Form labelCol={{ span: 6 }} wrapperCol={{ span: 16 }} layout="horizontal" style={{ minWidth: 860 }}>
{(!wechatPay || wechatPay.$$createAt$$ === 1) && <WechatPayUpsert oakPath={`${oakFullpath}.wechatPay`} systemId={systemId} key="wpCreate"/>}
{(wpAccount.wechatPayId && wpAccount?.$$createAt$$ !== 1) && <WechatPayUpsert oakPath={`${oakFullpath}.wechatPay`} systemId={systemId} key="wpUpdate" oakId={wpAccount.wechatPayId}/>}
<Form.Item label="说明">

View File

@ -17,8 +17,8 @@ export default function render(props: WebComponentProps<EntityDict, 'wpAccount',
if (wpAccount) {
return (
<Form
labelCol={{ span: 8 }}
wrapperCol={{ span: 12 }}
labelCol={{ span: 6 }}
wrapperCol={{ span: 16 }}
layout="horizontal"
style={{ minWidth: 860 }}
>