From e2ed9c23e3e2ca92c1d47055325aecb930038ba3 Mon Sep 17 00:00:00 2001
From: zyronon <zyronon@163.com>
Date: Tue, 27 Jul 2021 00:16:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                           |  2 ++
 src/components/Indicator.vue          |  2 +-
 src/pages/people/FindAcquaintance.vue | 27 ++++++---------------------
 src/store/index.js                    |  4 +++-
 4 files changed, 12 insertions(+), 23 deletions(-)

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 @@
       </SlideItem>
     </SlideRowList>
 
+    <transition name="fade">
+      <Mask v-if="maskDialog" @click="maskDialog = false"></Mask>
+    </transition>
 
     <transition name="fade">
       <div v-if="findAddressListDialog" class="find-address-list-dialog" @click="findAddressListDialog = false">
@@ -72,28 +75,10 @@
       </div>
     </transition>
 
-    <transition name="from-bottom">
-      <div class="more-option-dialog" v-if="false">
-        <div class="row" @click="outWebImgAccountDialog = true;moreOptionDialog = false">
-          <span>站外好友口令</span>
-        </div>
-        <div class="row" @click="$nav('/scan')">
-          <span>扫一扫加好友</span>
-        </div>
-        <div class="row" style="border-bottom: none;" @click="$nav('/face-to-face')">
-          <span>面对面加好友</span>
-        </div>
-        <div class="space"></div>
-        <div class="row" @click="moreOptionDialog = false">
-          取消
-        </div>
-      </div>
-    </transition>
-
     <from-bottom-dialog
         v-model="moreOptionDialog"
         :show-heng-gang="false"
-        height="20rem"
+        height="21rem"
         mode="white">
       <div class="more-option-dialog">
         <div class="row" @click="outWebImgAccountDialog = true;moreOptionDialog = false">
@@ -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
+      }
     }
   }
 })