Merge remote-tracking branch 'origin/dev' into dev

src/mods/AppVillageActivity/AppVillageActivity.vue

@@ -31,6 +31,8 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
+
 export default {
   name: 'AppVillageActivity',
   appName: '居民活动',
@@ -43,14 +45,15 @@ export default {
       isMore: false,
     }
   },
-
   onLoad() {
     this.$loading()
     this.$dict.load(['villageActivityStatus']).then(() => {
       this.getList()
     })
   },
-
+  computed: {
+    ...mapState(['user']),
+  },
   methods: {
     getList() {
       if (this.isMore) return
@@ -102,7 +105,6 @@ export default {
         })
     },
   },
-
   onReachBottom() {
     this.getList()
   },