no message

src/components/stuMan/eventsCalendar.vue

@@ -252,7 +252,6 @@
         font-size: 10px;
         margin-top: 5px;
     }
->>>>>>> 53875bcbefe904d0825cec7c0184ea0f57bd0130
 </style>
 <template>
   <div>
@@ -263,7 +262,6 @@
                 <div class="calendar-day">{{ data.day.split('-').slice(2).join('-') }}</div>
                 <div v-for="(item,index) in calendarData" :key="index">
                     <div v-if="item.Date==data.day">
-<<<<<<< HEAD
                         <div class="eventsCalendar_box">
                             <div class="eventsCalendar" v-for="(items,indexs) in item.ActivityList" :key="indexs"
                             @click="eventName(items.ActivityName)">
@@ -279,14 +277,8 @@
                                         <p class="Suspended_text">状态: {{items.ActivityStatus==1?'进行中':(items.ActivityStatus==2?'已结束':'')}}</p>
                                     </div>
                                 </div>
-=======
-                        <div class="eventsCalendar-box">
-                            <div class="eventsCalendar" v-for="(items,indexs) in item.ActivityList" :key="indexs"
-                            @click="eventName(items.ActivityName)">
-                                {{items.ActivityName}}
->>>>>>> 53875bcbefe904d0825cec7c0184ea0f57bd0130
                             </div>
-                        </div>
+                    </div>
                     </div>
                     <div v-else></div>
                 </div>
@@ -298,12 +290,6 @@
 </template>
 
 <script>
-<<<<<<< HEAD
-=======
-import { mapGetters } from "vuex";
-import {quertClassPlan} from '../../api/course/class';
-
->>>>>>> 53875bcbefe904d0825cec7c0184ea0f57bd0130
 export default {
   components: {
 
@@ -339,11 +325,7 @@ export default {
       }
   },
   computed: {
-<<<<<<< HEAD
-    
-=======
-    ...mapGetters(["userInfo"])
->>>>>>> 53875bcbefe904d0825cec7c0184ea0f57bd0130
+
   },
   mounted() {
     var d = new Date();
@@ -357,12 +339,8 @@ export default {
   },
   methods: {
     eventName(item){
-<<<<<<< HEAD
         const { href } = this.$router.resolve({path:'/stuMan/activeList',query:{'ActivityName':item}})
         window.open(href, '_blank');
-=======
-        this.$router.push({path:'/stuMan/activeList',query:{'ActivityName':item}})
->>>>>>> 53875bcbefe904d0825cec7c0184ea0f57bd0130
     },
     // 获取活动日历
     getList() {