Merge branch '11-11-formal' into dev

src/components/blessingGetPrize/index.js

@@ -27,17 +27,25 @@ class BlessingGetPrize extends Component {
   }
 
   componentDidMount () {
-    http.get(`${API.home}/sys/lottery_result?id=${getParam('id')}`).then(res => {
-      const {code, msg, data} = res.data;
-      if(code === 200) {
-        this.setState({
-          ...data.info,
-          prize_data: data.prize_data.slice(0, 6),
-        })
-      } else {
-        Toast.info(msg);
+    const _this = this;
+    setTimeout(function(){
+      const {history, uid} = _this.props;
+      if(!uid) {
+        history.push('/passport')
+      }else{
+        http.get(`${API.home}/sys/lottery_result?id=${getParam('id')}`).then(res => {
+          const {code, msg, data} = res.data;
+          if(code === 200) {
+            _this.setState({
+              ...data.info,
+              prize_data: data.prize_data.slice(0, 6),
+            })
+          } else {
+            Toast.info(msg);
+          }
+        });
       }
-    });
+    }, 100);
   }
 
   showAddress = (bool) => {

src/components/blessingPreheat/formal-draw/index.js

@@ -33,10 +33,10 @@ class FormalDraw extends Component {
     http.get(`${API.home}/sys/activity/prize_data`)
       .then(res => {
         const {data, code, msg} = res.data
-        const oneDay = data.list.filter(item => item.date === data.value.today)
-        const activeIndex = oneDay[0]['son'].findIndex(item => item.status == 3)
         if (code == 200) {
           const {today} = data.value
+          const oneDay = data.list.filter(item => item.date === data.value.today)
+          const activeIndex = oneDay[0]['son'].findIndex(item => item.status == 3)
           this.setState({
             tabs: data.list.map(item => ({title: item.date})),
             today,