diff --git a/src/userComponents/userManageCenter/homeDocuments/DocumentsManage.js b/src/userComponents/userManageCenter/homeDocuments/DocumentsManage.js
index 830dfd4acad356c6e09046cc894c9977cc0b8a41..a14e5ff883e899472b0d6f54b8b50c9cc0bfe4a0 100644
--- a/src/userComponents/userManageCenter/homeDocuments/DocumentsManage.js
+++ b/src/userComponents/userManageCenter/homeDocuments/DocumentsManage.js
@@ -19,6 +19,7 @@ class DocumentsManage extends React.Component{
             queryId:null,
             queryDate:null,
             showType:"all",
+            user_ic:'IC00000001',
         }
         this.showAll=this.showAll.bind(this);
         this.showIn=this.showIn.bind(this);
@@ -35,32 +36,40 @@ class DocumentsManage extends React.Component{
     }
 
     componentDidMount() {
-
-        axios.post('/user/userhome/manage/instorage/order', {
-            //firstName: 'Fred',
-            //lastName: 'Flintstone'
+        axios({
+            method: 'post',
+            url: 'http://localhost:8080/user/userhome/manage/orderdetail/orders?user_ic='+this.state.user_ic,
           })
           .then(response=> {
             console.log(response);
+            console.log("4");
             this.setState({
-                dataSource:response.data.result.list,
-                dataSource2:response.data.result.list,
-                queryData:response.data.result.list,
+                dataSource:response.data.data.items,
+                dataSource2:response.data.data.items,
+                queryData:response.data.data.items,
             });
           })
           .catch(function (error) {
-            console.log(error);
+            if (error.response) {
+                // 请求成功发出且服务器也响应了状态码，但状态代码超出了 2xx 的范围
+                console.log(error.response.data);
+                console.log(error.response.status);
+                console.log(error.response.headers);
+                console.log("1");
+              } else if (error.request) {
+                // 请求已经成功发起，但没有收到响应
+                // `error.request` 在浏览器中是 XMLHttpRequest 的实例，
+                // 而在node.js中是 http.ClientRequest 的实例
+                console.log(error.request);
+                console.log("2");
+              } else {
+                // 发送请求时出了点问题
+                console.log('Error', error.message);
+                console.log("3");
+              }
+
+              console.log(error.config);
           });
-          /*
-        axios.get("/user/userhome/manage/instorage/order").then(res => {
-            this.setState({
-                dataSource:res.data.result.list,
-                dataSource2:res.data.result.list,
-                queryData:res.data.result.list,
-            });
-        });
-        */
-        
     }
 
     idChange(event){
@@ -117,22 +126,22 @@ class DocumentsManage extends React.Component{
     showIn(event){
         this.setState({
             showType:"in",
-            dataSource2:this.state.dataSource.filter(item=>item.orderType=="入库"||item.orderType=="入库待办"),
-            queryData:this.state.dataSource.filter(item=>item.orderType=="入库"||item.orderType=="入库待办"),
+            dataSource2:this.state.dataSource.filter(item=>item.orderType=="0"||item.orderType=="3"),
+            queryData:this.state.dataSource.filter(item=>item.orderType=="0"||item.orderType=="3"),
         })
     }
     showOut(event){
         this.setState({
             showType:"out",
-            dataSource2:this.state.dataSource.filter(item=>item.orderType=="出库"||item.orderType=="出库待办"),
-            queryData:this.state.dataSource.filter(item=>item.orderType=="出库"||item.orderType=="出库待办"),
+            dataSource2:this.state.dataSource.filter(item=>item.orderType=="2"||item.orderType=="5"),
+            queryData:this.state.dataSource.filter(item=>item.orderType=="2"||item.orderType=="5"),
         })
     }
     showTrading(event){
         this.setState({
             showType:"trading",
-            dataSource2:this.state.dataSource.filter(item=>item.orderType=="过户"||item.orderType=="过户待办"),
-            queryData:this.state.dataSource.filter(item=>item.orderType=="过户"||item.orderType=="过户待办"),
+            dataSource2:this.state.dataSource.filter(item=>item.orderType=="1"||item.orderType=="4"),
+            queryData:this.state.dataSource.filter(item=>item.orderType=="1"||item.orderType=="4"),
         })
     }
 
@@ -145,25 +154,25 @@ class DocumentsManage extends React.Component{
     }
     showModal(){
         switch(this.state.detailData.orderType){
-            case "入库":
+            case "0":
                 return(<AppDetailTable item={this.state.detailData}/>);
-            case "入库待办":
+            case "3":
                 return(<AppDetailTable item={this.state.detailData}/>);
-            case "出库":
+            case "2":
                 return(<OutAppDetail item={this.state.detailData}/>);
-            case "出库待办":
+            case "5":
                 return(<OutAppDetail item={this.state.detailData}/>);
-            case "过户":
+            case "1":
                 return(<TradingAppDetail item={this.state.detailData}/>);
-            case "过户待办":
+            case "4":
                 return(<TradingAppDetail item={this.state.detailData}/>);
         }
     }
 
 
     cancelApp(item){
-        if((item.orderType=="入库待办"||item.orderType=="出库待办"||item.orderType=="过户待办")&&item.orderStatus!="已取消"){
-            item.orderStatus="已取消"
+        if((item.orderType=="3"||item.orderType=="5"||item.orderType=="4")&&item.orderStatus!="2"){
+            item.orderStatus=2;
             
         }else{
             alert("无法取消");
@@ -174,29 +183,6 @@ class DocumentsManage extends React.Component{
             //queryData:this.state.dataSource
         })
     }
-    /*
-    newBtn(event){
-        switch(this.state.showType){
-            case "all":
-                this.setState({
-                    dataSource2:this.state.dataSource,
-                    queryData:this.state.dataSource,
-                })
-                break;
-            case "in":
-                this.setState({
-                    showType:"all",
-                    showType:"in",
-                    dataSource2:this.state.dataSource.filter(item=>item.orderType=="入库"),
-                    queryData:this.state.dataSource.filter(item=>item.orderType=="入库"),
-                })
-                break;
-
-        }
-       
-        event.preventDefault();
-    }
-*/
 
     handleOk(){
         this.setState({
@@ -204,7 +190,6 @@ class DocumentsManage extends React.Component{
         });
     }
 
-    
     allColumns=[
         {
             title:'创建时间',
@@ -221,6 +206,22 @@ class DocumentsManage extends React.Component{
         {
             title:'单据类型',
             dataIndex:'orderType',
+            render:(text)=>{
+                switch(text){
+                    case 0:
+                        return(<p>入库</p>);
+                    case 1:
+                        return(<p>过户</p>);
+                    case 2:
+                        return(<p>出库</p>);
+                    case 3:
+                        return(<p>入库待办</p>);
+                    case 4:
+                        return(<p>过户待办</p>);
+                    case 5:
+                        return(<p>出库待办</p>);
+                }
+            }
         },
         
         {
@@ -230,16 +231,26 @@ class DocumentsManage extends React.Component{
         {
             title:'单据状态',
             dataIndex:'orderStatus',
+            render:(text)=>{
+                switch(text){
+                    case 0:
+                        return(<p>未支付</p>);
+                    case 1:
+                        return(<p>已支付</p>);
+                    case 2:
+                        return(<p>已取消</p>);
+                }
+            }
         },
         {
             title:'操作',
             key:'action',
-            render:(record)=>{
+            render:(text)=>{
                 return(
                     <div>
-                        <button onClick={()=>this.showInfoModal(record)} className='underline font-bold'>查看</button>
-                        {(record.orderType=="入库待办"||record.orderType=="出库待办"||record.orderType=="过户待办")&&record.orderStatus!="已取消"?
-                        <button onClick={()=>this.cancelApp(record)} className='underline font-bold text-red-500 relative inset-x-5'>取消</button>
+                        <button onClick={()=>this.showInfoModal(text)} className='underline font-bold'>查看</button>
+                        {(text.orderType=="3"||text.orderType=="5"||text.orderType=="4")&&text.orderStatus!="2"?
+                        <button onClick={()=>this.cancelApp(text)} className='underline font-bold text-red-500 relative inset-x-5'>取消</button>
                         :<button className=' font-bold text-gray-400 relative inset-x-5'>取消</button>}
                         
                     </div>
@@ -317,9 +328,13 @@ class DocumentsManage extends React.Component{
                             y: 400,
                         }}
                         
-                    />
+                        
+                    >
+                    </Table>
+                    
                     }
                     
+                    
                 </div>
                 <Modal title="申请详情" visible={this.state.isModalVisible} onOk={this.handleOk} onCancel={this.handleOk}
                 footer={[<button onClick={this.handleOk} className="rounded-md w-12 bg-blue-400 font-bold">确定</button>]}>
diff --git a/src/userComponents/userManageCenter/homeGoods/QueryGoods.js b/src/userComponents/userManageCenter/homeGoods/QueryGoods.js
index 97d5d29c3d775b3791c1425e873a2cd5669aa74e..ceb2fbb9f6d0d8f59cb6a23bad83d4896cc3af83 100644
--- a/src/userComponents/userManageCenter/homeGoods/QueryGoods.js
+++ b/src/userComponents/userManageCenter/homeGoods/QueryGoods.js
@@ -16,6 +16,7 @@ class QueryGoods extends React.Component{
             queryName:null,
             queryId:null,
             queryData:[],
+            user_ic:'IC00000001',
         }
         this.showAllGoods=this.showAllGoods.bind(this);
         this.showGoodsStorge=this.showGoodsStorge.bind(this);
@@ -26,6 +27,42 @@ class QueryGoods extends React.Component{
     }
 
     componentDidMount() {
+        axios({
+            method: 'post',
+            url: 'http://localhost:8080/user/userhome/manage/querygoods/total?user_ic='+this.state.user_ic,
+          })
+          .then(response=> {
+            console.log(response);
+            console.log("4");
+            this.setState({
+                dataSource:response.data.data.items,
+                queryData:response.data.data.items,
+            });
+          })
+          .catch(function (error) {
+            if (error.response) {
+                // 请求成功发出且服务器也响应了状态码，但状态代码超出了 2xx 的范围
+                console.log(error.response.data);
+                console.log(error.response.status);
+                console.log(error.response.headers);
+                console.log("1");
+              } else if (error.request) {
+                // 请求已经成功发起，但没有收到响应
+                // `error.request` 在浏览器中是 XMLHttpRequest 的实例，
+                // 而在node.js中是 http.ClientRequest 的实例
+                console.log(error.request);
+                console.log("2");
+              } else {
+                // 发送请求时出了点问题
+                console.log('Error', error.message);
+                console.log("3");
+              }
+
+              console.log(error.config);
+          });
+
+
+        /*
         axios.post('/user/userhome/manage/instorage/order', {
             //firstName: 'Fred',
             //lastName: 'Flintstone'
@@ -40,6 +77,7 @@ class QueryGoods extends React.Component{
           .catch(function (error) {
             console.log(error);
           });
+          */
         /*
         axios.get("/user/userhome/manage/instorage/order").then(res => {
             this.setState({