pull

src/App.js

@@ -123,8 +123,9 @@ class App extends Component {
         })
         //微信
         let code = getParam('code')
+        let oid = getParam('oid')
 
-        if (code) {
+        if (code && !oid) {
 
             http.get(`${API['home']}/m/wx_loginInfo/code/${code}`)
                 .then(res => {

src/components/detail/redPacket/index.js

@@ -100,17 +100,28 @@ class RedPacket extends PureComponent {
         });
       }
     }
+<<<<<<< HEAD
 
+=======
+>>>>>>> 65b20269ec1f16a85729a4c44e6d8ba640f00ca2
     this.fetchShareInfo();
   }
 
   // 获取分享信息
   fetchShareInfo = () => {
+<<<<<<< HEAD
+=======
+    const share_code = getParam('share_code');
+>>>>>>> 65b20269ec1f16a85729a4c44e6d8ba640f00ca2
     http.get(`${API.home}/sys/redPacket/shareUrl/${getParam('id')}`).then(res => {
       const { code, data } = res.data;
       if(code === 200) {
         this.setState({
+<<<<<<< HEAD
           shareInfo: data
+=======
+          shareInfo: share_code? Object.assign({}, data, {share_code}) : data
+>>>>>>> 65b20269ec1f16a85729a4c44e6d8ba640f00ca2
         });
       }
     });

src/router/privateRoute.js

@@ -13,7 +13,7 @@ const PrivateRoute = ({component: Component, path, user, ...rest}) => {
     useEffect(() => {
         let _auth = !user.hasError && user.code != 4040
         typeof _auth !== 'undefined' && (setAuthorization(_auth) , setLoadingState(false))
-    })
+    }, [user.hasError])
 
 
     return (

src/router/route-middle-page.js

@@ -12,12 +12,6 @@ function RouteMiddlePage(props) {
     useEffect(() => {
         let {user, location, history} = props
 
-
-        if (history.action === 'POP' && history.length > 2) {
-            history.goBack();
-            return
-        }
-
         if (!user.isFetching) {
             if (user.hasError) {
                 history.replace('/passport', {from: location})
@@ -32,7 +26,7 @@ function RouteMiddlePage(props) {
                 }
             }
         }
-    })
+    }, [props.user.isFetching])
 
     return (
         <div className={'loading-route'}>