Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius into master

# Conflicts:
#	src/components/stuMan/eventsCalendar.vue

src/components/stuMan/eventsCalendar.vue

 <style>
+<<<<<<< HEAD
     .eventsCalendar_Form{
         padding: 20px 0;
         background-color: #fff;
@@ -234,6 +235,24 @@
       margin: 0;
       color: #3f4254;
   }
+=======
+    .eventsCalendar_Form .el-calendar-day {
+        position: relative;
+    }
+    .eventsCalendar_Form .calendar-day {
+        position: absolute;
+        bottom: 5px;
+        left: 5px;
+    }
+    .eventsCalendar_Form .el-calendar-table .el-calendar-day {
+        padding: 5px;
+        height: 120px;
+    }
+    .eventsCalendar_Form .is-selected {
+        font-size: 10px;
+        margin-top: 5px;
+    }
+>>>>>>> 53875bcbefe904d0825cec7c0184ea0f57bd0130
 </style>
 <template>
   <div>
@@ -244,6 +263,7 @@
                 <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)">
@@ -259,6 +279,12 @@
                                         <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>
@@ -272,6 +298,12 @@
 </template>
 
 <script>
+<<<<<<< HEAD
+=======
+import { mapGetters } from "vuex";
+import {quertClassPlan} from '../../api/course/class';
+
+>>>>>>> 53875bcbefe904d0825cec7c0184ea0f57bd0130
 export default {
   components: {
 
@@ -307,7 +339,11 @@ export default {
       }
   },
   computed: {
+<<<<<<< HEAD
     
+=======
+    ...mapGetters(["userInfo"])
+>>>>>>> 53875bcbefe904d0825cec7c0184ea0f57bd0130
   },
   mounted() {
     var d = new Date();
@@ -321,8 +357,12 @@ 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() {