From 6a6f0ca784a54ca4729094681925b892850ae6e7 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 10 May 2021 17:24:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B9=8B=E9=97=B4=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=E6=9C=AA=E8=BF=94=E5=9B=9E=E8=87=B3?=
 =?UTF-8?q?=E9=A1=B6=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json        | 4 ++--
 src/App.js               | 6 ------
 src/forge/Index.js       | 8 ++++++++
 src/forge/users/Infos.js | 5 +++++
 src/index.js             | 1 +
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4a85c71b..df502d24 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "forge",
-  "version": "0.1.0",
+  "version": "3.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2065,7 +2065,7 @@
     },
     "babel-polyfill": {
       "version": "6.26.0",
-      "resolved": "https://registry.npm.taobao.org/babel-polyfill/download/babel-polyfill-6.26.0.tgz",
+      "resolved": "https://registry.nlark.com/babel-polyfill/download/babel-polyfill-6.26.0.tgz",
       "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
       "dev": true,
       "requires": {
diff --git a/src/App.js b/src/App.js
index 789c0af2..c153e4f1 100644
--- a/src/App.js
+++ b/src/App.js
@@ -124,12 +124,6 @@ class App extends Component {
 	componentDidMount() {
 		document.title = "loading...";
 		this.disableVideoContextMenu();
-		history.listen(() => {
-			this.forceUpdate()
-			const $ = window.$
-			$("html").animate({ scrollTop: $('html').scrollTop() - 0 })
-		});
-
 		initAxiosInterceptors(this.props);
 		this.getAppdata();
 
diff --git a/src/forge/Index.js b/src/forge/Index.js
index aa0219aa..533530b0 100644
--- a/src/forge/Index.js
+++ b/src/forge/Index.js
@@ -31,6 +31,14 @@ const Infos = Loadable({
   loading: Loading,
 });
 class Index extends Component {
+
+  componentDidUpdate=()=>{
+    this.props.history.listen(()=>{
+      if (document.body.scrollTop || document.documentElement.scrollTop > 0) {
+        window.scrollTo(0, 0)
+      }
+    })
+  }
   render() {
     return (
       <div className="newMain clearfix">
diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js
index f7a1d887..a812a6d7 100644
--- a/src/forge/users/Infos.js
+++ b/src/forge/users/Infos.js
@@ -67,6 +67,11 @@ class Infos extends Component {
     if(prevUser && username && prevUser !== username){
       this.fetchUser();
     }
+    this.props.history.listen(()=>{
+      if (document.body.scrollTop || document.documentElement.scrollTop > 0) {
+        window.scrollTo(0, 0)
+      }
+    })
   }
 
   fetchUser = () => {
diff --git a/src/index.js b/src/index.js
index eb757a2a..d6c14281 100644
--- a/src/index.js
+++ b/src/index.js
@@ -13,6 +13,7 @@ configureUrlQuery({ history });
 window.__useKindEditor = false;
 
 
+
 const render = (Component) => {
   ReactDOM.render(
     <AppContainer >