no message

src/components/stuMan/eventsCalendar.vue

 <style>
-<<<<<<< HEAD
     .eventsCalendar_Form{
         padding: 20px 0;
         background-color: #fff;
@@ -235,23 +234,6 @@
       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;
-    }
 </style>
 <template>
   <div>
@@ -273,7 +255,7 @@
                                         <p class="Suspended_text">结束时间: {{items.StartTime}}~{{items.EndTime}}</p>
                                         <p class="Suspended_text">活动类型: {{items.ActivityTypeName}}</p>
                                         <p class="Suspended_text" v-show="!items.IsFree">价格: {{items.Price}}</p>
-                                        <p class="Suspended_text">地址: {{items.LocationName}}</p>
+                                        <p class="Suspended_text" v-show="items.LocationName">地址: {{items.LocationName}}</p>
                                         <p class="Suspended_text">状态: {{items.ActivityStatus==1?'进行中':(items.ActivityStatus==2?'已结束':'')}}</p>
                                     </div>
                                 </div>