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

src/apps/AppActive/AppActive.vue

@@ -0,0 +1,65 @@
+<template>
+  <div class="AppActive">
+    <div class="header-top">
+      <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#3975C6" inactive-color="#fff" active-color="#fff" @change="change"></u-tabs>
+    </div>
+
+    <div class="header-middle">
+      <div class="currentLeft" v-if="currentTabs == 0">0</div>
+
+      <div class="currentLeft" v-if="currentTabs == 1">1</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AppActive',
+  appName: '居民活动',
+  components: {},
+  props: {},
+  data() {
+    return {
+      datas: [],
+      tabList: [
+        {
+          name: '全部',
+        },
+        {
+          name: '我的走访',
+        },
+      ],
+      currentTabs: 0,
+      current: 1,
+    }
+  },
+  computed: {},
+  watch: {},
+  onLoad() {
+    this.getList()
+  },
+  mounted() {},
+  methods: {
+    getList() {},
+
+    change(index) {
+      this.currentTabs = index
+      this.getList()
+    },
+  },
+  onReachBottom() {
+    this.current = this.current + 1
+    this.getList()
+  },
+}
+</script>
+
+<style scoped lang="scss">
+uni-page-body {
+  height: 100%;
+}
+.AppActive {
+  height: 100%;
+  background: #fff;
+}
+</style>

src/apps/AppServicePublic/AppServicePublic.vue

@@ -147,6 +147,7 @@ uni-page-body {
 }
 .AppServicePublic {
   height: 100%;
+
   .header-top {
     display: flex;
     background: #fff;