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

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

@@ -77,13 +77,21 @@ class FormalDraw extends Component {
 
   draw = id => {
     let {surplus, is_prize, hot_value} = this.state.userValue
-    if(hot_value<50){
+    if (hot_value < 50) {
       Toast.info('你的福气值未达到参与抽奖所需福气值分数，快去积攒福气值吧', 2, null, false)
-    } else if(is_prize == 1){
-      Toast.info('你已参与当前时段抽奖', 2, null, false)
-    } else if(surplus<1){
+    } else if (is_prize == 1) {
+      Toast.info('你已参与当前时段抽奖', 2, () => {
+        this.requestDraw(id)
+      }, false)
+    } else if (surplus < 1) {
       Toast.info('你的抽奖次数已用光，快去积攒福气值可获得更多抽奖机会', 2, null, false)
     } else {
+      this.requestDraw(id)
+    }
+  }
+
+  requestDraw = id => {
+    let {surplus} = this.state.userValue
     http.post(`${API.home}/sys/activity/prize`, {
       id
     }).then(res => {
@@ -111,7 +119,7 @@ class FormalDraw extends Component {
             )
           })
           this.setState({
-              userValue: {...this.state.userValue, ...{surplus: --surplus}}
+            userValue: {...this.state.userValue, ...{surplus: --surplus}, ...{is_prize: 1}}
           })
         })
       } else {
@@ -119,7 +127,6 @@ class FormalDraw extends Component {
       }
     })
   }
-  }
 
   lotteryFunc = (status, id) => {
     const {hasError} = this.props.user