fix:修改冲突

2 years ago · 581a6385e5
parent 3c2ff793ab
commit 581a6385e5
1 changed files with 0 additions and 5 deletions
--- a/pages/index/module/Banner.vue
+++ b/pages/index/module/Banner.vue
@ -11,13 +11,8 @@
    <el-carousel height="360px" indicator-position="outside">
      <el-carousel-item>
        <el-image
 <<<<<<< HEAD
          @click="onAdvBannerClick(1)"
          :src="banner1"
 =======
          @click="onAdvBannerClick(0)"
          :src="adv1"
 >>>>>>> fix/ui-0521-zz
          fit="cover"
        ></el-image>
      </el-carousel-item>