提交 99c7bc81 作者: 龚洪江

功能:确认订单,云享金,佣金,商城订单布局调整

上级 18265dd1
......@@ -14,7 +14,7 @@ export type userFddInfoType = InterFunction<
accountType: number;
createTime: string;
updateTime: string;
}
}[]
>;
// fdd-上传合同
......
......@@ -25,7 +25,7 @@ export function TitleView() {
// 菜单栏是否收起
const [isActive, setIsActive] = useState(false);
// fdd实名认证信息
const [fddAuthInfo, setFddAuthInfo] = useState<fddAuthType>();
const [fddAuthInfo, setFddAuthInfo] = useState<fddAuthType[0]>();
// 用户信息
const { userInfo } = useSelector((state: any) => state.UserInfo);
......@@ -37,7 +37,9 @@ export function TitleView() {
// 获取fdd实名认证信息
const getAppUserFddInfo = () => {
FddInterfaceAPI.getAppUserFddInfo({ port: 1 }).then(({ result }) => {
setFddAuthInfo(result);
if (result) {
setFddAuthInfo(result.find((v) => v.accountType === 2));
}
});
};
......
......@@ -79,15 +79,6 @@ const DetailInformation: React.FC<PropsType> = (props) => {
<div className='detail-text'>
<span className='item'>订单编号:{detail?.orderNo}</span>
<span className='item'>创建时间:{detail?.createTime}</span>
{/*<span className={'item'} style={{ display: 'none' }}>*/}
{/* 合同编号:UAV202334741131*/}
{/*</span>*/}
{/*<span className={'item'}>*/}
{/* 订单租期:*/}
{/* {dayjs(detail?.startDate).format('YYYY-MM-DD')}*/}
{/* {' ~ '}*/}
{/* {dayjs(detail?.endDate).format('YYYY-MM-DD')}*/}
{/*</span>*/}
</div>
<Table
size='small'
......
.remark{
display: flex;
.label{
white-space: nowrap;
}
.value{
line-height: 15px;
}
}
......@@ -6,6 +6,7 @@ import { contractStatusList } from '~/utils/dictionary';
import { FddInterfaceAPI } from '~/api';
import { decode } from 'js-base64';
import FileSaver from 'file-saver';
import './index.scss';
// 接口返回的类型
type DataType = InterDataType<mallOrderDetailType>;
......@@ -42,7 +43,10 @@ const DetailPurchaser: React.FC<PropsType> = ({ detail }) => {
<div className='detail-text'>UID:{detail?.userAccountId}</div>
<div className='detail-text'>姓名: {detail?.userName || detail?.nickname}</div>
<div className='detail-text'>手机号:{detail?.phoneNum} </div>
<div className='detail-text'>备注:{detail?.userRemark}</div>
<div className='detail-text remark'>
<div className='label'>备注:</div>
<div className='value'>{detail?.userRemark}</div>
</div>
{detail?.contractInfoDTO ? (
<div>
<div className='detail-title'>合同信息</div>
......
......@@ -218,6 +218,12 @@ const SureOrder: FC<ModalProps & selfProps> = ({ open, onOk, onCancel, mallOrder
>
<Input placeholder='请输入实付总额' suffix='元' maxLength={30} />
</Form.Item>
<Form.Item label='云享金'>
<Input placeholder='请输入抵扣云享金' suffix='元' />
</Form.Item>
<Form.Item label='佣金'>
<Input placeholder='请输入抵扣佣金' suffix='元' />
</Form.Item>
<Form.Item
label='订单交期'
name='deliveryTime'
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论