Browse Source

合并代码

dev_des
1054425342@qq.com 1 month ago
parent
commit
5706972ee0
  1. 33
      bmzm/home/home.vue
  2. 672
      pig/home/home.vue
  3. 20
      xrcc/home/home.vue
  4. 11
      xxdf/home/home.vue

33
bmzm/home/home.vue

@ -36,23 +36,23 @@
</template> </template>
<script> <script>
import AudioControl from '@/components/AudioControl.vue'; import AudioControl from "@/components/AudioControl.vue";
import MusicControl from '@/components/MusicControl.vue'; import MusicControl from "@/components/MusicControl.vue";
import NavMenu from '../components/NavMenu.vue'; import NavMenu from "../components/NavMenu.vue";
export default { export default {
components: { components: {
MusicControl, MusicControl,
NavMenu, NavMenu,
AudioControl AudioControl,
}, },
data() { data() {
return { return {
currentIndex: 0, currentIndex: 0,
swiperImages: [ swiperImages: [
'https://static.ticket.sz-trip.com/epicSoul/bmzm/home/home1s.gif', "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/home2.png",
'https://static.ticket.sz-trip.com/epicSoul/bmzm/home/home3.png', "https://static.ticket.sz-trip.com/epicSoul/bmzm/home/home3.png",
'https://static.ticket.sz-trip.com/epicSoul/bmzm/home/home4.png' "https://static.ticket.sz-trip.com/epicSoul/bmzm/home/home4.png",
], ],
animationConfig: { animationConfig: {
delay: 0.5, delay: 0.5,
@ -62,25 +62,12 @@ export default {
first: 0.8, first: 0.8,
second: 1.2, second: 1.2,
third: 0.9, third: 0.9,
end: 1.1 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;
}, },
}, },
}; };
}, },
onShow() { onShow() {
uni.removeStorageSync("answerObj"); uni.removeStorageSync("answerObj");
const app = getApp(); const app = getApp();

672
pig/home/home.vue

File diff suppressed because it is too large

20
xrcc/home/home.vue

@ -152,16 +152,6 @@ export default {
background-repeat: no-repeat; background-repeat: no-repeat;
position: relative; position: relative;
<<<<<<< HEAD
.img1-text {
position: absolute;
width: 632.16rpx;
top: 170rpx;
left: 0;
right: 0;
margin: 0 auto;
}
=======
.img1-text { .img1-text {
position: absolute; position: absolute;
width: 632.16rpx; width: 632.16rpx;
@ -184,22 +174,20 @@ export default {
bottom: 290rpx; bottom: 290rpx;
left: 84rpx; left: 84rpx;
} }
} }
>>>>>>> master
.img4-text { .img4-text {
position: absolute; position: absolute;
width: 476.36rpx; width: 476.36rpx;
top: 170rpx; top: 170rpx;
left: 84rpx; left: 84rpx;
} }
.btn-img { .btn-img {
position: absolute; position: absolute;
width: 149.8rpx; width: 149.8rpx;
bottom: 290rpx; bottom: 290rpx;
left: 84rpx; left: 84rpx;
}
} }
.swiper-img { .swiper-img {

11
xxdf/home/home.vue

@ -234,16 +234,16 @@
</template> </template>
<script> <script>
import AudioControl from '@/components/AudioControl.vue'; import AudioControl from "@/components/AudioControl.vue";
import ShareGuide from '@/components/ShareGuide.vue'; import ShareGuide from "@/components/ShareGuide.vue";
import MusicControl from '@/components/MusicControl.vue'; import MusicControl from "@/components/MusicControl.vue";
import NavMenu from '../components/NavMenu.vue'; import NavMenu from "../components/NavMenu.vue";
export default { export default {
components: { components: {
ShareGuide, ShareGuide,
MusicControl, MusicControl,
NavMenu, NavMenu,
AudioControl AudioControl,
}, },
onShareGuideClose() { onShareGuideClose() {
console.log("分享引导已关闭"); console.log("分享引导已关闭");
@ -274,7 +274,6 @@ export default {
url: "/xxdf/chapter4/cover", url: "/xxdf/chapter4/cover",
}); });
}, },
},
watch: { watch: {
currentIndex(newIndex) { currentIndex(newIndex) {
for ( for (

Loading…
Cancel
Save