Merge branch '11-11' of gitlab.julyedu.com:baiguangyao/mr-julyedu into 11-11

build/manifest.json

-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}

src/components/activity/invite.js

@@ -105,11 +105,17 @@ class Invite extends Component {
                 isWeiXin: true,
               });
             }else{
+<<<<<<< HEAD
+              history.push(`/invite?shareuid=${jsCookie.get('uid')}&new=1&inviteCode=${inviteCode}`)
+=======
               history.push(`invite?shareuid=${jsCookie.get('uid')}&new=1&inviteCode=${inviteCode}`)
+>>>>>>> ca63cba76b7911e7c740c4c35196599b14bf64c3
               this.setState({
                 showTip: true,
               });
             }
+          }else if(code === 4030 || code === 4040) {
+            history.push('/passport');
           }else{
             Toast.info(msg, 2);
           }