|
@@ -2,9 +2,9 @@
|
|
|
<section class="app-main" :style="{ paddingTop: show ? '140px' : '80px' }">
|
|
|
<div class="app-main-view">
|
|
|
<keep-alive>
|
|
|
- <router-view v-if="$route.meta.isCache == 1" :key="nameKey" />
|
|
|
+ <router-view v-if="$route.meta.isCache == 1 && nameKey.indexOf($route.name) == 0" :key="nameKey" />
|
|
|
</keep-alive>
|
|
|
- <router-view v-if="$route.meta.isCache != 1" :key="nameKey" />
|
|
|
+ <router-view v-if="$route.meta.isCache != 1 && nameKey.indexOf($route.name) == 0" :key="nameKey" />
|
|
|
<zj-watermark color="rgba(200,200,200,.3)" position="absolute" :str="str" zIndex="99" />
|
|
|
</div>
|
|
|
</section>
|
|
@@ -14,9 +14,9 @@
|
|
|
import { mapGetters } from 'vuex'
|
|
|
export default {
|
|
|
name: 'AppMain',
|
|
|
- data(){
|
|
|
+ data() {
|
|
|
return {
|
|
|
- key:0
|
|
|
+ key: 0
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
@@ -24,10 +24,11 @@ export default {
|
|
|
str() {
|
|
|
return this.$store.state?.user?.name
|
|
|
},
|
|
|
- nameKey(){
|
|
|
- return this.$store.state.tagsView.visitedViews.find(item=>item?.name===this.$route?.name)?.nameKey || "0"
|
|
|
+ nameKey() {
|
|
|
+ return this.$store.state.tagsView.visitedViews.find(item => item?.name === this.$route?.name)?.nameKey || Math.floor(Date.now() / 1000) + ""
|
|
|
},
|
|
|
},
|
|
|
+
|
|
|
}
|
|
|
</script>
|
|
|
|