cehi

src/components/map/index.vue

@@ -6,11 +6,8 @@
         @select="onSelect"
       />
     <div class="unit-block">
-<<<<<<< HEAD
       <div class="course_title" @click="actionsheetShow=true">{{secActions.name}} <i class="iconfont icon-below-s"></i> </div>
-=======
-      <div class="course_title" @click="actionsheetShow=true">{{secActions.name}} <i class="iconfont icon-below-s"></i></div>
->>>>>>> pre
+
       <!--竖屏 主题栏-->
       <swiper :options="swiperOption" class="banner" v-if="shopType==0&&unitList.length>0" ref="mySwiper">
         <swiper-slide v-for="(data,index) in unitList" :key="index">