Merge branch 'dev' into devbra
This commit is contained in:
commit
f023afcc47
@ -1,4 +1,4 @@
|
|||||||
import React from 'react'
|
// import React from 'react'
|
||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
// import './RefunModal.css'
|
// import './RefunModal.css'
|
||||||
import { Form, Select, Button, Upload, message, Input } from 'antd';
|
import { Form, Select, Button, Upload, message, Input } from 'antd';
|
||||||
|
@ -12,7 +12,7 @@ import {
|
|||||||
WarningOutlined,
|
WarningOutlined,
|
||||||
} from '@ant-design/icons';
|
} from '@ant-design/icons';
|
||||||
import { Button, Tag, Modal, Carousel } from 'antd';
|
import { Button, Tag, Modal, Carousel } from 'antd';
|
||||||
import { GenerateStatus, ProjChargeType } from "../../interfaces/proj/IProj.ts";
|
import { GenerateStatus } from "../../interfaces/proj/IProj.ts";
|
||||||
import { useNavigate } from "react-router-dom";
|
import { useNavigate } from "react-router-dom";
|
||||||
import { Axios, post, downloadUrl } from "../../util/AjaxUtils.ts";
|
import { Axios, post, downloadUrl } from "../../util/AjaxUtils.ts";
|
||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
|
@ -353,8 +353,11 @@ export default function MyOrder() {
|
|||||||
defaultExpandAllRows: true,
|
defaultExpandAllRows: true,
|
||||||
// columnTitle:'订单详情'
|
// columnTitle:'订单详情'
|
||||||
expandedRowKeys: expandedRowKeys,
|
expandedRowKeys: expandedRowKeys,
|
||||||
|
expandIcon: () => null, // 隐藏展开图标
|
||||||
|
|
||||||
}}
|
}}
|
||||||
bordered
|
style={{border:'1px solid #efefef'}}
|
||||||
|
// bordered
|
||||||
scroll={{ y: 500 }} key="orderId" rowKey="orderId" />
|
scroll={{ y: 500 }} key="orderId" rowKey="orderId" />
|
||||||
</Spin>
|
</Spin>
|
||||||
{/* <Modal
|
{/* <Modal
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
import React from 'react'
|
|
||||||
import { useState, useEffect, } from 'react';
|
import { useState, useEffect, } from 'react';
|
||||||
import {
|
import {
|
||||||
Table,
|
Table,
|
||||||
|
Loading…
Reference in New Issue
Block a user