Browse Source

优化弹窗

pull/19/head
zyronon 4 years ago
parent
commit
e2ed9c23e3
  1. 2
      src/App.vue
  2. 2
      src/components/Indicator.vue
  3. 27
      src/pages/people/FindAcquaintance.vue
  4. 4
      src/store/index.js

2
src/App.vue

@ -33,6 +33,8 @@ export default { @@ -33,6 +33,8 @@ export default {
// watch $route 使
watch: {
'$route'(to, from) {
this.$store.commit('setMaskDialog', {state: false, mode: this.maskDialogMode})
//footer5
let noAnimation = ['/', '/home', '/me', '/attention', '/message', '/publish']
if (noAnimation.indexOf(from.path) !== -1 && noAnimation.indexOf(to.path) !== -1) {

2
src/components/Indicator.vue

@ -105,7 +105,7 @@ export default { @@ -105,7 +105,7 @@ export default {
top: 0;
left: 0;
right: 0;
z-index: 2;
z-index: 1;
background: $main-bg;
.tabs {

27
src/pages/people/FindAcquaintance.vue

@ -52,6 +52,9 @@ @@ -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 @@ @@ -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 { @@ -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
}
}
},

4
src/store/index.js

@ -30,7 +30,9 @@ const store = Vuex.createStore({ @@ -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
}
}
}
})

Loading…
Cancel
Save