diff --git a/src/App.vue b/src/App.vue index b2c7110..f4ef6a4 100644 --- a/src/App.vue +++ b/src/App.vue @@ -33,6 +33,8 @@ export default { // watch $route 决定使用哪种过渡 watch: { '$route'(to, from) { + this.$store.commit('setMaskDialog', {state: false, mode: this.maskDialogMode}) + //footer下面的5个按钮,对跳不要用动画 let noAnimation = ['/', '/home', '/me', '/attention', '/message', '/publish'] if (noAnimation.indexOf(from.path) !== -1 && noAnimation.indexOf(to.path) !== -1) { diff --git a/src/components/Indicator.vue b/src/components/Indicator.vue index 3a2848e..ebe3a0b 100644 --- a/src/components/Indicator.vue +++ b/src/components/Indicator.vue @@ -105,7 +105,7 @@ export default { top: 0; left: 0; right: 0; - z-index: 2; + z-index: 1; background: $main-bg; .tabs { diff --git a/src/pages/people/FindAcquaintance.vue b/src/pages/people/FindAcquaintance.vue index 6243aa1..7d786ff 100644 --- a/src/pages/people/FindAcquaintance.vue +++ b/src/pages/people/FindAcquaintance.vue @@ -52,6 +52,9 @@ + + +
@@ -72,28 +75,10 @@
- -
-
- 站外好友口令 -
-
- 扫一扫加好友 -
-
- 面对面加好友 -
-
-
- 取消 -
-
-
-
@@ -184,10 +169,10 @@ export default { computed: { maskDialog: { get() { - return this.findAddressListDialog || this.moreOptionDialog || this.outWebImgAccountDialog + return this.findAddressListDialog || this.outWebImgAccountDialog }, set() { - this.findAddressListDialog = this.moreOptionDialog = this.outWebImgAccountDialog = false + this.findAddressListDialog = this.outWebImgAccountDialog = false } } }, diff --git a/src/store/index.js b/src/store/index.js index 1b5b56f..1dba597 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -30,7 +30,9 @@ const store = Vuex.createStore({ }, setMaskDialog(store, val) { store.maskDialog = val.state - store.maskDialogMode = val.mode + if (val.mode){ + store.maskDialogMode = val.mode + } } } })