diff --git a/src/components/slide/Indicator.vue b/src/components/slide/Indicator.vue
index b407a19..82c97a3 100644
--- a/src/components/slide/Indicator.vue
+++ b/src/components/slide/Indicator.vue
@@ -77,7 +77,7 @@ export default {
methods: {
changeIndex(index) {
this.currentSlideItemIndex = index
- this.$attrs['onUpdate:active-index'] && this.$emit('update:active-index', this.currentSlideItemIndex)
+ this.$attrs['onUpdate:activeIndex'] && this.$emit('update:active-index', this.currentSlideItemIndex)
this.$setCss(this.indicatorRef, 'transition-duration', `300ms`)
this.$setCss(this.indicatorRef, 'left', this.tabIndicatorRelationActiveIndexLefts[this.currentSlideItemIndex] + 'px')
},
diff --git a/src/components/slide/IndicatorLight.vue b/src/components/slide/IndicatorLight.vue
index 110aef0..fe6849b 100644
--- a/src/components/slide/IndicatorLight.vue
+++ b/src/components/slide/IndicatorLight.vue
@@ -76,7 +76,7 @@ export default {
methods: {
changeIndex(index) {
this.currentSlideItemIndex = index
- this.$attrs['onUpdate:active-index'] && this.$emit('update:active-index', this.currentSlideItemIndex)
+ this.$attrs['onUpdate:activeIndex'] && this.$emit('update:active-index', this.currentSlideItemIndex)
this.$setCss(this.indicatorRef, 'transition-duration', `300ms`)
this.$setCss(this.indicatorRef, 'left', this.tabIndicatorRelationActiveIndexLefts[this.currentSlideItemIndex] + 'px')
},
diff --git a/src/components/slide/SlideColumnList.vue b/src/components/slide/SlideColumnList.vue
deleted file mode 100644
index da5eea5..0000000
--- a/src/components/slide/SlideColumnList.vue
+++ /dev/null
@@ -1,199 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/components/slide/SlideList.vue b/src/components/slide/SlideList.vue
index 19c7680..585d52a 100644
--- a/src/components/slide/SlideList.vue
+++ b/src/components/slide/SlideList.vue
@@ -183,7 +183,7 @@ export default {
} else {
this.$setCss(this.slideList, 'transform', `translate3d(0px, ${-this.getHeight(this.currentSlideItemIndex) + this.moveYDistance}px, 0px)`)
}
- this.$attrs['onUpdate:active-index'] && this.$emit('update:active-index', this.currentSlideItemIndex)
+ this.$attrs['onUpdate:activeIndex'] && this.$emit('update:active-index', this.currentSlideItemIndex)
},
initTabs() {
@@ -357,7 +357,7 @@ export default {
this.$setCss(this.slideList, 'transform', `translate3d(0px, ${-this.getHeight(this.currentSlideItemIndex)}px, 0px)`)
}
this.resetConfig()
- this.$attrs['onUpdate:active-index'] && this.$emit('update:active-index', this.currentSlideItemIndex)
+ this.$attrs['onUpdate:activeIndex'] && this.$emit('update:active-index', this.currentSlideItemIndex)
},
resetConfig() {
this.isCanDownWiping = false
diff --git a/src/components/slide/SlideRowList.vue b/src/components/slide/SlideRowList.vue
index 18732f8..60fb2ce 100644
--- a/src/components/slide/SlideRowList.vue
+++ b/src/components/slide/SlideRowList.vue
@@ -1,31 +1,5 @@
-
-
@@ -177,7 +151,7 @@ export default {
if (this.isHome) {
this.$setCss(this.indicatorRef, 'left', this.tabIndicatorRelationActiveIndexLefts[this.currentSlideItemIndex] + 'px')
}
- this.$attrs['onUpdate:active-index'] && this.$emit('update:active-index', this.currentSlideItemIndex)
+ this.$attrs['onUpdate:activeIndex'] && this.$emit('update:active-index', this.currentSlideItemIndex)
},
initTabs() {
let tabs = this.$refs.tabs
@@ -293,7 +267,7 @@ export default {
}
}
this.resetConfig()
- this.$attrs['onUpdate:active-index'] && this.$emit('update:active-index', this.currentSlideItemIndex)
+ this.$attrs['onUpdate:activeIndex'] && this.$emit('update:active-index', this.currentSlideItemIndex)
this.$attrs['onEnd'] && this.$emit('end')
bus.emit(this.name + '-end', this.currentSlideItemIndex)
},
@@ -360,80 +334,6 @@ export default {
position: relative;
}
- .indicator-home {
- position: fixed;
- font-size: 16rem;
- top: 0;
- left: 0;
- height: 60px;
- z-index: 2;
- width: 100%;
- color: white;
-
- .notice {
- opacity: 0;
- top: 0;
- position: absolute;
- width: 100vw;
- height: 100%;
- display: flex;
- justify-content: center;
- align-items: center;
- }
-
- .loading {
- opacity: 0;
- top: 13rem;
- right: 15rem;
- position: absolute;
-
- }
-
- .toolbar {
- z-index: 2;
- position: relative;
- color: white;
- width: 100%;
- height: 100%;
- box-sizing: border-box;
- padding: 0 15rem;
- display: flex;
- justify-content: space-between;
- align-items: center;
-
- .tab-ctn {
- width: 30%;
- position: relative;
-
- .tabs {
- display: flex;
- justify-content: space-between;
- font-weight: bold;
-
- .tab {
- transition: color .3s;
- color: gray;
-
- &.active {
- color: white;
- }
- }
- }
-
-
- .indicator {
- //transition: left .3s;
- position: absolute;
- bottom: -8rem;
- height: 3rem;
- width: 20rem;
- background: #fff;
- border-radius: 5rem;
- }
- }
- }
- }
-
.indicator-bullets {
position: absolute;
bottom: 10rem;
diff --git a/src/components/slide/UNUSE_SlideColumnVirtualList.txt b/src/components/slide/UNUSE_SlideColumnVirtualList.txt
index 3668167..7426086 100644
--- a/src/components/slide/UNUSE_SlideColumnVirtualList.txt
+++ b/src/components/slide/UNUSE_SlideColumnVirtualList.txt
@@ -271,7 +271,7 @@ export default {
this.$setCss(this.slideList, 'transform', `translate3d(0px, ${-this.getHeight(this.currentSlideItemIndex)}px, 0px)`)
}
this.resetConfig()
- this.$attrs['onUpdate:active-index'] && this.$emit('update:active-index', this.currentSlideItemIndex)
+ this.$attrs['onUpdate:activeIndex'] && this.$emit('update:active-index', this.currentSlideItemIndex)
},
resetConfig() {
this.isCanDownWiping = false
diff --git a/src/pages/home/MusicRankList.vue b/src/pages/home/MusicRankList.vue
index 86d9bb2..2752ae6 100644
--- a/src/pages/home/MusicRankList.vue
+++ b/src/pages/home/MusicRankList.vue
@@ -21,9 +21,9 @@
:tabTexts="['热歌榜','飙升樘','原创榜']"
v-model:active-index="contentIndex">
-
+ v-model:index="contentIndex">
-
+
diff --git a/src/pages/home/Publish.vue b/src/pages/home/Publish.vue
index 273b9e9..38fbd58 100644
--- a/src/pages/home/Publish.vue
+++ b/src/pages/home/Publish.vue
@@ -2,22 +2,24 @@

diff --git a/src/pages/home/SearchPage.vue b/src/pages/home/SearchPage.vue
index a186106..d8ab5bb 100644
--- a/src/pages/home/SearchPage.vue
+++ b/src/pages/home/SearchPage.vue
@@ -46,7 +46,7 @@
品牌榜
-
+
diff --git a/src/pages/me/Me.less b/src/pages/me/Me.less
index 6bc0a51..c994c83 100644
--- a/src/pages/me/Me.less
+++ b/src/pages/me/Me.less
@@ -457,7 +457,7 @@
box-sizing: border-box;
background: @main-bg;
width: 100%;
- padding: 10rem 20rem;
+ padding: 10rem 26rem;
list-style: none;
display: flex;
align-items: center;
diff --git a/src/pages/me/Me.vue b/src/pages/me/Me.vue
index 9f6a50c..657b2ba 100644
--- a/src/pages/me/Me.vue
+++ b/src/pages/me/Me.vue
@@ -2,7 +2,8 @@
+ style="width: 100vw;"
+ v-model:active-index="baseActiveIndex">
-
{{ userinfo.nickname }}
+
{{ userinfo.nickname }}
@@ -224,7 +225,7 @@
-
+
@@ -359,10 +360,11 @@ import {mapState} from "vuex";
import bus from "../../utils/bus";
import ConfirmDialog from "../../components/dialog/ConfirmDialog";
import {$no} from "@/utils";
+import SlideHorizontal from "@/components/slide/SlideHorizontal.vue";
export default {
name: "Me",
- components: {Posters, Footer, Indicator, ConfirmDialog},
+ components: {Posters, Footer, Indicator, ConfirmDialog, SlideHorizontal},
data() {
return {
previewImg: '',
diff --git a/src/pages/me/MyMusic.vue b/src/pages/me/MyMusic.vue
index d15a632..3bbf1a8 100644
--- a/src/pages/me/MyMusic.vue
+++ b/src/pages/me/MyMusic.vue
@@ -9,7 +9,7 @@
-
+
@@ -98,7 +98,7 @@
-
+
diff --git a/src/pages/people/FindAcquaintance.vue b/src/pages/people/FindAcquaintance.vue
index 61248b6..1ffbfb6 100644
--- a/src/pages/people/FindAcquaintance.vue
+++ b/src/pages/people/FindAcquaintance.vue
@@ -10,7 +10,7 @@
-
+
-
+
diff --git a/src/pages/people/FollowAndFans.vue b/src/pages/people/FollowAndFans.vue
index 76b4069..6c1ab80 100644
--- a/src/pages/people/FollowAndFans.vue
+++ b/src/pages/people/FollowAndFans.vue
@@ -19,7 +19,7 @@
v-model:active-index="slideIndex">
-
+
diff --git a/src/utils/mixin.js b/src/utils/mixin.js
index 6ae6084..792678b 100644
--- a/src/utils/mixin.js
+++ b/src/utils/mixin.js
@@ -2,7 +2,6 @@ import globalMethods from "./index";
import BaseHeader from "../components/BaseHeader";
import SlideList from "../components/slide/SlideList";
import SlideRowList from "../components/slide/SlideRowList";
-import SlideColumnList from "../components/slide/SlideColumnList";
import SlideItem from "../components/slide/SlideItem";
import Indicator from "../components/slide/Indicator";
import Video from "../components/Video";
@@ -17,13 +16,14 @@ import Dom from "./dom";
import bus, {EVENT_KEY} from "./bus";
import {random} from "lodash";
import {Icon} from '@iconify/vue'
+import SlideHorizontal from "@/components/slide/SlideHorizontal.vue";
export default {
components: {
BaseHeader,
+ SlideHorizontal,
SlideList,
SlideRowList,
- SlideColumnList,
SlideItem,
Indicator,
'Video1': Video,