Skip to content

H
h5-base
Commit 4f87986f authored by IvyXia123's avatar IvyXia123
Browse files
Options

cehi

parent 86526515
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
src/components/map/index.vue
View file @ 4f87986f
...@@ -6,11 +6,8 @@ ...@@ -6,11 +6,8 @@
@select="onSelect" @select="onSelect"
/> />
<div class="unit-block"> <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>
=======
<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 :options="swiperOption" class="banner" v-if="shopType==0&&unitList.length>0" ref="mySwiper">
<swiper-slide v-for="(data,index) in unitList" :key="index"> <swiper-slide v-for="(data,index) in unitList" :key="index">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment