返场

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

@@ -46,19 +46,9 @@ class FormalDraw extends Component {
       .then(res => {
         const {data, code, msg} = res.data
         if (code == 200) {
-<<<<<<< HEAD
-          const {today} = data.value
-          const oneDay = data.list.filter(item => item.date === data.value.today)
-          let activeIndex = 0;
-          if(oneDay.length > 0) {
-            activeIndex = oneDay[0]['son'].findIndex(item => item.status == 3)
-          }
-          
-=======
           let oneDay = data.list.find(item => item.date === data.value.today) || data.list[0]
           const today = oneDay.date
           const activeIndex = oneDay['son'].findIndex(item => item.status == 3)
->>>>>>> formal-draw
           this.setState({
             tabs: data.list.map(item => ({title: item.date})),
             today,