冲突解决

src/components/map/index.vue

 <template>
   <div>
-<<<<<<< HEAD
-=======
-
-
->>>>>>> pre
     <van-actionsheet
         v-model="actionsheetShow"
         :actions="actions"
@@ -764,11 +759,7 @@
   .actStar{height:20*@toVw;width:20*@toVw;background-position:0 -60*@toVw;display: inline-block}
   .clock{height:28*@toVw;width:28*@toVw;background-position:0 -80*@toVw;display: inline-block}
   .money{height:40*@toVw;width:40*@toVw;background-position:0 -108*@toVw;display: inline-block;animation: dodge 1s infinite;}
-<<<<<<< HEAD
-  .goLesson{height:59*@toVw;width:169*@toVw;background-position:0 -148*@toVw;display: inline-block;margin-top:15*@toVw;margin-bottom: 10*@toVw }
-=======
   .goLesson{height:59*@toVw;width:136*@toVw;background-position:0 -148*@toVw;display: inline-block;margin-top:15*@toVw;margin-bottom: 10*@toVw }
->>>>>>> pre
   .van-actionsheet{
     .activit{color: yellowgreen;}
   }