+

diff --git a/src/components/Search.vue b/src/components/Search.vue
index 8eac7e1..d47290e 100644
--- a/src/components/Search.vue
+++ b/src/components/Search.vue
@@ -2,7 +2,7 @@
diff --git a/src/components/slide/SlideRowList.vue b/src/components/slide/SlideRowList.vue
index eab141e..932ac28 100644
--- a/src/components/slide/SlideRowList.vue
+++ b/src/components/slide/SlideRowList.vue
@@ -20,7 +20,6 @@
AA
-
0
},
+ name: {
+ type: String,
+ default: () => ''
+ },
},
computed: {
toolbarStyle() {
@@ -137,7 +140,6 @@ export default {
await this.checkChildren(true)
this.showIndicator && this.initTabs()
this.changeIndex(true)
- console.log(this.$slots.indicator)
},
methods: {
changeIndex(init = false, index = null, e) {
@@ -215,7 +217,7 @@ export default {
//禁止在最后页面的时候,向右划
if (this.currentSlideItemIndex === this.slideItems.length - 1 && this.isDrawRight) return
- bus.emit('move', {
+ bus.emit(this.name + 'move', {
x: {distance: this.moveXDistance, isDrawRight: this.isDrawRight},
})
@@ -269,7 +271,7 @@ export default {
this.resetConfig()
this.$attrs['onUpdate:active-index'] && this.$emit('update:active-index', this.currentSlideItemIndex)
this.$attrs['onEnd'] && this.$emit('end')
- bus.emit('end', this.currentSlideItemIndex)
+ bus.emit(this.name + 'end', this.currentSlideItemIndex)
},
resetConfig() {
this.isCanRightWiping = false
diff --git a/src/main.js b/src/main.js
index a9447ee..29ad6da 100644
--- a/src/main.js
+++ b/src/main.js
@@ -16,6 +16,8 @@ import store from "./store";
import globalMethods from './utils/global-methods'
import SlideRowList from "./components/slide/SlideRowList";
import SlideColumnList from "./components/slide/SlideColumnList";
+import Mask from "./components/Mask";
+import NoMore from "./components/NoMore";
const mixin = {
methods: {
@@ -32,6 +34,8 @@ app.component('SlideColumnList', SlideColumnList)
app.component('SlideItem', SlideItem)
app.component('Video1', Video)
app.component('Footer', Footer)
+app.component('Mask', Mask)
+app.component('NoMore', NoMore)
app.mixin(mixin)
app.use(router)
app.use(store)
diff --git a/src/pages/me/Me.vue b/src/pages/me/Me.vue
index 19dd8be..598d55d 100644
--- a/src/pages/me/Me.vue
+++ b/src/pages/me/Me.vue
@@ -59,12 +59,14 @@
diff --git a/src/pages/people/FindAcquaintance.vue b/src/pages/people/FindAcquaintance.vue
index 13eeedd..c6ff402 100644
--- a/src/pages/people/FindAcquaintance.vue
+++ b/src/pages/people/FindAcquaintance.vue
@@ -1,42 +1,69 @@
-
+
-
+
+ 我的好友(互相关注)
+
-
-
+
-
-
-
-
-

-
-
发现通讯录好友
-
+
+
+
+
+
+
+
+

+
+
发现通讯录好友
+
授权通讯录,看看哪些好友在使用抖音。具体使用场景及撤回授权方式详见
《隐私政策》
+
+
-
+
+
+
+
+
+
+
+ 站外好友口令
+
+
+ 扫一扫加好友
+
+
+ 面对面加好友
+
+
+
+ 取消
-
+
+