bug

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

@@ -78,57 +78,48 @@ 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)
-      return
-    }
-    if(is_prize == 1){
+    } else if(is_prize == 1){
       Toast.info('你已参与当前时段抽奖', 2, null, false)
-      return
-    }
-    if(surplus<1){
+    } else 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`, {
-      id
-    }).then(res => {
-      const {code, msg, data} = res.data
-      if (code == 200) {
-        QRCode.toDataURL(data.url, (err, url) => {
-          this.popupInstance = Popup({
-            title: '你已成功参与本时段抽奖',
-            className: 'join-lottery',
-            content: (
-              <>
-                <div className="text">
-                  <div className="code">抽奖码为：{data.code}</div>
-                  <div className="time">本时段的中奖结果将在{data.date}公布</div>
-                  <div className="hint">你可关注‘七月在线’服务号第一时间获得中奖信息。</div>
-                  <img src={url} className='qr-code' alt=""/>
-                </div>
-                <button onClick={() => {
-                  this.popupInstance.close()
-                }}>知道了
-                </button>
-              </>
-            )
-          })
-          this.setState({
-            userValue: {...this.state.userValue, ...{surplus: --surplus}}
+    } else {
+      http.post(`${API.home}/sys/activity/prize`, {
+        id
+      }).then(res => {
+        const {code, msg, data} = res.data
+        if (code == 200) {
+          QRCode.toDataURL(data.url, (err, url) => {
+            this.popupInstance = Popup({
+              title: '你已成功参与本时段抽奖',
+              className: 'join-lottery',
+              content: (
+                  <>
+                    <div className="text">
+                      <div className="code">抽奖码为：{data.code}</div>
+                      <div className="time">本时段的中奖结果将在{data.date}公布</div>
+                      <div className="hint">你可关注‘七月在线’服务号第一时间获得中奖信息。</div>
+                      <img src={url} className='qr-code' alt=""/>
+                    </div>
+                    <button onClick={() => {
+                      this.popupInstance.close()
+                    }}>知道了
+                    </button>
+                  </>
+              )
+            })
+            this.setState({
+              userValue: {...this.state.userValue, ...{surplus: --surplus}}
+            })
           })
-        })
 
-      } else {
-        Toast.info(msg, 2, null, false)
-      }
-    })
+        } else {
+          Toast.info(msg, 2, null, false)
+        }
+      })
+    }
   }
 
   lotteryFunc = (status, id) => {