Merge branch '11-11-formal' into dev

src/components/blessingGetPrize/index.js

@@ -31,8 +31,8 @@ class BlessingGetPrize extends Component {
     const _this = this;
     setTimeout(function(){
       const {history, uid} = _this.props;
-      if(!uid && !jsCookie.get('uid')) {
-        history.push('/passport')
+      if(!uid) {
+        window.location.href = `${API.m}/passport`;
       }else{
         http.get(`${API.home}/sys/lottery_result?id=${getParam('id')}`).then(res => {
           const {code, msg, data} = res.data;
@@ -46,7 +46,7 @@ class BlessingGetPrize extends Component {
           }
         });
       }
-    }, 100);
+    }, 300);
   }
 
   showAddress = (bool) => {