Skip to content

M
mr-julyedu
Commit d94457b1 by wangshuo
Options

解决冲突

parent ceeb00dd
Showing with 0 additions and 5 deletions
src/components/blessingPreheat/formal-draw/index.js
...@@ -78,7 +78,6 @@ class FormalDraw extends Component { ...@@ -78,7 +78,6 @@ class FormalDraw extends Component {
draw = id => { draw = id => {
var _czc = _czc || [] var _czc = _czc || []
_czc.push(["_trackEvent", '点击抽奖', 'm端双十一正式活动-点击抽奖']) _czc.push(["_trackEvent", '点击抽奖', 'm端双十一正式活动-点击抽奖'])
<<<<<<< HEAD
let {surplus, is_prize, hot_value} = this.state.userValue let {surplus, is_prize, hot_value} = this.state.userValue
if(hot_value<50){ if(hot_value<50){
Toast.info('你的福气值未达到参与抽奖所需福气值分数，快去积攒福气值吧', 2, null, false) Toast.info('你的福气值未达到参与抽奖所需福气值分数，快去积攒福气值吧', 2, null, false)
...@@ -90,10 +89,6 @@ class FormalDraw extends Component { ...@@ -90,10 +89,6 @@ class FormalDraw extends Component {
} }
if(surplus<1){ if(surplus<1){
Toast.info('你的抽奖次数已用光，快去积攒福气值可获得更多抽奖机会', 2, null, false) Toast.info('你的抽奖次数已用光，快去积攒福气值可获得更多抽奖机会', 2, null, false)
=======
let {surplus, is_prize} = this.state.userValue
if (is_prize || this.popupInstance || surplus <= 0) {
>>>>>>> bda3e512eab055c3737e2b8e95c5dcc7a5e45d53
return return
} }
http.post(`${API.home}/sys/activity/prize`, { http.post(`${API.home}/sys/activity/prize`, {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment