合并代码

bmzm/home/home.vue

@@ -36,51 +36,38 @@
 </template>
 
 <script>
-import AudioControl from '@/components/AudioControl.vue';
-import MusicControl from '@/components/MusicControl.vue';
-import NavMenu from '../components/NavMenu.vue';
+import AudioControl from "@/components/AudioControl.vue";
+import MusicControl from "@/components/MusicControl.vue";
+import NavMenu from "../components/NavMenu.vue";
 export default {
-	components: {
-	    MusicControl,
-		NavMenu,
-		AudioControl
-	},
-    data() {
-        return {
-            currentIndex: 0,
-            swiperImages: [
-                'https://static.ticket.sz-trip.com/epicSoul/bmzm/home/home1s.gif',
-                'https://static.ticket.sz-trip.com/epicSoul/bmzm/home/home2.png',
-                'https://static.ticket.sz-trip.com/epicSoul/bmzm/home/home3.png',
-                'https://static.ticket.sz-trip.com/epicSoul/bmzm/home/home4.png'
-            ],
-            animationConfig: {
-                delay: 0.5,
-                duration: 3,
-                keyframes: {
-                    start: 1,
-                    first: 0.8,
-                    second: 1.2,
-                    third: 0.9,
-                    end: 1.1
-                }
-            }
-        };
-    },
-	onShow() {
-		uni.removeStorageSync('answerObj');
-		const app = getApp();
-		app.updateMusicSrc('https://static.ticket.sz-trip.com/epicSoul/bmzm.mp3');
-		app.initBackgroundMusic(); // 初始化背景音乐
-		uni.$bgMusic.play(); // 播放音乐
-	},
-    methods: {
-        handleSwiperChange(e) {
-            this.currentIndex = e.detail.current;
+  components: {
+    MusicControl,
+    NavMenu,
+    AudioControl,
+  },
+  data() {
+    return {
+      currentIndex: 0,
+      swiperImages: [
+        "https://static.ticket.sz-trip.com/epicSoul/bmzm/home/home1s.gif",
+        "https://static.ticket.sz-trip.com/epicSoul/bmzm/home/home2.png",
+        "https://static.ticket.sz-trip.com/epicSoul/bmzm/home/home3.png",
+        "https://static.ticket.sz-trip.com/epicSoul/bmzm/home/home4.png",
+      ],
+      animationConfig: {
+        delay: 0.5,
+        duration: 3,
+        keyframes: {
+          start: 1,
+          first: 0.8,
+          second: 1.2,
+          third: 0.9,
+          end: 1.1,
         },
       },
     };
   },
+
   onShow() {
     uni.removeStorageSync("answerObj");
     const app = getApp();

xrcc/home/home.vue

@@ -152,7 +152,6 @@ export default {
   background-repeat: no-repeat;
   position: relative;
 
-<<<<<<< HEAD
   .img1-text {
     position: absolute;
     width: 632.16rpx;
@@ -161,31 +160,6 @@ export default {
     right: 0;
     margin: 0 auto;
   }
-=======
-		.img1-text {
-			position: absolute;
-			width: 632.16rpx;
-			top: 170rpx;
-			left: 0;
-			right: 0;
-			margin: 0 auto;
-		}
-
-		.img4-text {
-			position: absolute;
-			width: 476.36rpx;
-			top: 170rpx;
-			left: 84rpx;
-		}
-
-		.btn-img {
-			position: absolute;
-			width: 149.8rpx;
-			bottom: 290rpx;
-			left: 84rpx;
-		}
-	}
->>>>>>> master
 
   .img4-text {
     position: absolute;
@@ -202,6 +176,20 @@ export default {
   }
 }
 
+.img4-text {
+  position: absolute;
+  width: 476.36rpx;
+  top: 170rpx;
+  left: 84rpx;
+}
+
+.btn-img {
+  position: absolute;
+  width: 149.8rpx;
+  bottom: 290rpx;
+  left: 84rpx;
+}
+
 .swiper-img {
   width: 100vw;
   height: 100vh;

xxdf/home/home.vue

@@ -234,46 +234,45 @@
 </template>
 
 <script>
-import AudioControl from '@/components/AudioControl.vue';
-import ShareGuide from '@/components/ShareGuide.vue';
-import MusicControl from '@/components/MusicControl.vue';
-import NavMenu from '../components/NavMenu.vue';
+import AudioControl from "@/components/AudioControl.vue";
+import ShareGuide from "@/components/ShareGuide.vue";
+import MusicControl from "@/components/MusicControl.vue";
+import NavMenu from "../components/NavMenu.vue";
 export default {
-    components: {
-        ShareGuide,
-        MusicControl,
-		NavMenu,
-		AudioControl
-    },
-    onShareGuideClose() {
-      console.log("分享引导已关闭");
-    },
-    shouldShowContent(index) {
-      return Math.abs(index - this.currentIndex) <= this.preloadBuffer;
-    },
-    handleSwiperChange(e) {
-      this.currentIndex = e.detail.current;
-    },
-    navigateToChapter1() {
-      uni.navigateTo({
-        url: "/xxdf/chapter1/cover1",
-      });
-    },
-    navigateToChapter2() {
-      uni.navigateTo({
-        url: "/xxdf/chapter2/cover",
-      });
-    },
-    navigateToChapter3() {
-      uni.navigateTo({
-        url: "/xxdf/chapter3/cover",
-      });
-    },
-    navigateToChapter4() {
-      uni.navigateTo({
-        url: "/xxdf/chapter4/cover",
-      });
-    },
+  components: {
+    ShareGuide,
+    MusicControl,
+    NavMenu,
+    AudioControl,
+  },
+  onShareGuideClose() {
+    console.log("分享引导已关闭");
+  },
+  shouldShowContent(index) {
+    return Math.abs(index - this.currentIndex) <= this.preloadBuffer;
+  },
+  handleSwiperChange(e) {
+    this.currentIndex = e.detail.current;
+  },
+  navigateToChapter1() {
+    uni.navigateTo({
+      url: "/xxdf/chapter1/cover1",
+    });
+  },
+  navigateToChapter2() {
+    uni.navigateTo({
+      url: "/xxdf/chapter2/cover",
+    });
+  },
+  navigateToChapter3() {
+    uni.navigateTo({
+      url: "/xxdf/chapter3/cover",
+    });
+  },
+  navigateToChapter4() {
+    uni.navigateTo({
+      url: "/xxdf/chapter4/cover",
+    });
   },
   watch: {
     currentIndex(newIndex) {