解决冲突

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

@@ -78,7 +78,6 @@ class FormalDraw extends Component {
   draw = id => {
     var _czc = _czc || []
     _czc.push(["_trackEvent", '点击抽奖', 'm端双十一正式活动-点击抽奖'])
-<<<<<<< HEAD
     let {surplus, is_prize, hot_value} = this.state.userValue
     if(hot_value<50){
       Toast.info('你的福气值未达到参与抽奖所需福气值分数，快去积攒福气值吧', 2, null, false)
@@ -90,10 +89,6 @@ class FormalDraw extends Component {
     }
     if(surplus<1){
       Toast.info('你的抽奖次数已用光，快去积攒福气值可获得更多抽奖机会', 2, null, false)
-=======
-    let {surplus, is_prize} = this.state.userValue
-    if (is_prize || this.popupInstance || surplus <= 0) {
->>>>>>> bda3e512eab055c3737e2b8e95c5dcc7a5e45d53
       return
     }
     http.post(`${API.home}/sys/activity/prize`, {