Merge branch 'version_forge' of http://gitea.trustie.net/jasder/forgeplus-react into version_forge

src/forge/Merge/MessageCount.js

@@ -138,8 +138,15 @@ class MessageCount extends Component {
             this.props.showNotification("评论成功！");
           }
         }).catch(error => {
+          this.setState({
+            journal_spin: false
+          })
           console.log(error);
         })
+      }else{
+        this.setState({
+          journal_spin: false
+        })
       }
     })
   }
@@ -237,6 +244,9 @@ class MessageCount extends Component {
         this.getjournalslist(page, limit);
       }
     }).catch(error => {
+      this.setState({
+        edit_spin: false
+      })
       console.log(error);
     })
   }

src/forge/Merge/NewMerge.js

@@ -179,6 +179,10 @@ class NewMerge extends Component{
           })
           console.log(error);
         })
+      }else{
+        this.setState({
+          isSpin: false
+        })
       }
     })
   }

src/forge/Order/Detail.js

@@ -113,8 +113,15 @@ class Detail extends Component {
             this.getjournalslist(page, limit);
           }
         }).catch(error => {
+          this.setState({
+            journal_spin: false
+          })
           console.log(error);
         })
+      }else{
+        this.setState({
+          journal_spin: false
+        })
       }
     })
   }
@@ -197,6 +204,9 @@ class Detail extends Component {
         this.getjournalslist(page, limit);
       }
     }).catch(error => {
+      this.setState({
+        edit_spin: false
+      })
       console.log(error);
     })
   }

src/forge/Order/New.js

@@ -132,7 +132,10 @@ class New extends Component {
           })
           console.log(error);
         })
-
+      }else{
+        this.setState({
+          isSpin: false
+        })
       }
     })
   }

src/forge/Order/UpdateDetail.js

@@ -209,6 +209,10 @@ class UpdateDetail extends Component {
           console.log(error);
         })
 
+      }else{
+        this.setState({
+          isSpin: false
+        })
       }
     })
   }

src/forge/Order/UpdateMilepost.js

@@ -89,8 +89,11 @@ class UpdateMilepost extends Component {
           }
 
         }).catch(error => {
+          this.setState({ isSpin: false })
           console.log(error);
         })
+      }else{
+        this.setState({ isSpin: false })
       }
     })
   }

src/forge/Order/newMilepost.js

@@ -59,8 +59,11 @@ class NewMilepost extends Component {
           }
 
         }).catch(error => {
+          this.setState({ isSpin: false })
           console.log(error);
         })
+      }else{
+        this.setState({ isSpin: false })
       }
     })
   }

src/forge/Version/NewVersion.js

@@ -95,6 +95,10 @@ class NewVersion extends Component{
           console.log(error);
         })
 
+      }else{
+        this.setState({
+          isSpin: false
+        })
       }
     })
   }

src/forge/Version/UpdateVersion.js

@@ -97,6 +97,10 @@ class NewVersion extends Component{
           console.log(error);
         })
 
+      }else{
+        this.setState({
+          isSpin: false
+        })
       }
     })
   }

src/modules/user/usersInfo/Infos.js

@@ -280,8 +280,6 @@ class Infos extends Component {
                 }
           ></Route>
 
-
-
           {/* 众包 */}
           <Route exact path="/users/:username/package"
             render={