mobile update

src/views/spirit/index.vue

@@ -99,10 +99,7 @@ export default {
 
 <style lang="less" scoped>
 @import "../../assets/style/globalVars.less";
-<<<<<<< HEAD
-=======
 @cdn: "https://houseoss.4dkankan.com/chuanshan";
->>>>>>> 82f390066eb729fcfa8a79787438478d3fc4fead
 .dy-con {
   width: 100%;
   background: #f1f1f1;
@@ -201,4 +198,4 @@ export default {
     }
   }
 }
-</style>
+</style>