app-bug

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

@@ -30,6 +30,7 @@ class FormalDraw extends Component {
   }
 
   componentDidMount() {
+<<<<<<< HEAD
     this.getPrizeData()
   }
 
@@ -63,6 +64,29 @@ class FormalDraw extends Component {
             Toast.info(msg, 2, null, false)
           }
         })
+=======
+    http.get(`${API.home}/sys/activity/prize_data`)
+      .then(res => {
+        const {data, code, msg} = res.data
+        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,
+            initialPageIndex: data.list.findIndex(item => item.date == today) || 0,
+            list: data.list,
+            userValue: data.value,
+            activeTimeRangeIndex: activeIndex < 0 ? 0 : activeIndex
+          }, () => {
+            this.initializeSwiper()
+          })
+        } else {
+          Toast.info(msg, 2, null, false)
+        }
+      })
+>>>>>>> caf81df4e9f961f7467d49fe9798b9123c92dadc
   }
 
   initializeSwiper = () => {

src/components/blessingPreheat/index.js

@@ -586,7 +586,11 @@ class BlessingPreheat extends Component {
               <button className="luck-draw__button" onClick={() => this.handleToShow('isRule')}>活动规则></button>
               <button className='prize-record' onClick={this.getMyPrizeRecord}>中奖记录></button>
             </div>
+<<<<<<< HEAD
             <FormalDraw toLogin={this.toLogin} isApp={isApp}/>
+=======
+            <FormalDraw toLogin={this.toLogin}/>
+>>>>>>> caf81df4e9f961f7467d49fe9798b9123c92dadc
           </>
 
         }