列表渲染

src/components/ScrollY/index.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="ScrollY">
-    <scroll-view style="width: 100%; height: 100%;" :scroll-y="true" :refresher-enabled="true" :refresher-threshold="120" refresher-background="#f8f8f8" :refresher-triggered="IsRefreshing" @refresherpulling="$emit('Refresh')">
+    <scroll-view style="width: 100%; height: 100%;" :scroll-y="true" :refresher-enabled="true" :refresher-threshold="120" refresher-background="#f8f8f8" :refresher-triggered="IsRefreshing" @refresherpulling="$emit('Refresh')" @scrolltolower="$emit('ScrollBottom')">
       <slot></slot>
     </scroll-view>
   </view>

src/pages/HuiAiXin/EnergyStory/index.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="page ZhengNengLiangShiJi">
-    <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh">
+    <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh" @ScrollBottom="ScrollBottom">
       <view class="Container">
 
         <!-- 标题 -->
@@ -9,15 +9,17 @@
         </view>
 
         <!-- 列表 -->
-        <view class="List">
-          <navigator v-for="(item, index) in 10" :key="index" url="./EnergyStoryDetail/index" hover-class="other-navigator-hover" class="Item flex-h">
+        <view class="List" v-if="ZhengNengLiangShiJiList.length">
+          <navigator v-for="(item, index) in ZhengNengLiangShiJiList" :key="index" url="./EnergyStoryDetail/index" hover-class="other-navigator-hover" class="Item flex-h">
             <view class="flex-item">
               <text>事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题</text>
               <text>副标题</text>
               <text>来源</text>
             </view>
             <view class="Img">
-              <view></view>
+              <view>
+                <image mode="aspectFill" class="centerLabel" :src="ToolClass.DemoImg()"></image>
+              </view>
             </view>
           </navigator>
         </view>
@@ -29,14 +31,26 @@
 
 <script>
 import ScrollY from '../../../components/ScrollY/index'
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
 export default {
   name: 'ZhengNengLiangShiJi',
   data () {
     return {
+      PageData: {
+        pageNum: 1,
+        pageSize: 15
+      },
+      HasNextPage: true,
       IsRefreshing: false,
       DataLock: false
     }
   },
+  computed: {
+    ...mapIndexState({
+      ZhengNengLiangShiJiList: x => x.ZhengNengLiangShiJiList // 正能量事迹列表
+    })
+  },
   components: {
     ScrollY
   },
@@ -44,15 +58,40 @@ export default {
     this.Init()
   },
   methods: {
-    Init () {
+    ...mapIndexActions([
+      'GetZhengNengLiangShiJiList' // 获取正能量事迹列表
+    ]),
+    ...mapIndexMutations([
+      'EmptyZhengNengLiangShiJiList' // 清空正能量事迹列表
+    ]),
+    Init () { // 初始化
+      this.PageData.pageNum = 1
+      this.HasNextPage = true
+      this.EmptyZhengNengLiangShiJiList() // 清空正能量事迹列表
+      this.ToGetPageList() // 获取列表
+    },
+    ToGetPageList () { // 获取列表
+      this.GetZhengNengLiangShiJiList({ queryData: { accountId: 5, ...this.PageData } }).then((res) => { // 获取正能量事迹列表
+        this.HasNextPage = res.data.data.hasNextPage
+        this.DataLock = false
+        this.IsRefreshing = false
+      }).catch(() => {
+        this.DataLock = false
+        this.IsRefreshing = false
+      })
+    },
+    ScrollBottom () { // 上拉加载
+      if (this.DataLock || !this.HasNextPage) return
+      this.DataLock = true
+      this.PageData.pageNum += 1
+      this.ToGetPageList() // 获取列表
     },
-    Refresh (e) {
+    Refresh (e) { // 页面下拉刷新
       if (this.DataLock) return
       this.DataLock = true
       this.IsRefreshing = true
       setTimeout(() => {
-        this.IsRefreshing = false
-        this.DataLock = false
+        this.Init() // 获取列表
       }, 1000)
     }
   }

src/pages/HuiAiXin/StarOwner/index.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="page MingXingYeZhu">
-    <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh">
+    <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh" @ScrollBottom="ScrollBottom">
       <view class="Container">
 
         <!-- 标题 -->
@@ -9,9 +9,11 @@
         </view>
 
         <!-- 列表 -->
-        <view class="List">
-          <navigator v-for="(item, index) in 10" :key="index" url="./StarOwnerDetail/index" hover-class="other-navigator-hover" class="Item">
-            <view class="Img"></view>
+        <view class="List" v-if="MingXingYeZhuList.length">
+          <navigator v-for="(item, index) in MingXingYeZhuList" :key="index" url="./StarOwnerDetail/index" hover-class="other-navigator-hover" class="Item">
+            <view class="Img">
+              <image mode="aspectFill" class="centerLabel" :src="ToolClass.DemoImg()"></image>
+            </view>
             <text class="Info">业主家庭名称</text>
           </navigator>
         </view>
@@ -23,30 +25,67 @@
 
 <script>
 import ScrollY from '../../../components/ScrollY/index'
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
 export default {
   name: 'MingXingYeZhu',
   data () {
     return {
+      PageData: {
+        pageNum: 1,
+        pageSize: 15
+      },
+      HasNextPage: true,
       IsRefreshing: false,
       DataLock: false
     }
   },
+  computed: {
+    ...mapIndexState({
+      MingXingYeZhuList: x => x.MingXingYeZhuList // 明星业主列表
+    })
+  },
   components: {
     ScrollY
   },
   created () {
-    this.Init()
+    this.Init() // 初始化
   },
   methods: {
-    Init () {
+    ...mapIndexActions([
+      'GetMingXingYeZhuList' // 获取明星业主列表
+    ]),
+    ...mapIndexMutations([
+      'EmptyMingXingYeZhuList' // 清空明星业主列表
+    ]),
+    Init () { // 初始化
+      this.PageData.pageNum = 1
+      this.HasNextPage = true
+      this.EmptyMingXingYeZhuList() // 清空明星业主列表
+      this.ToGetPageList() // 获取列表
+    },
+    ToGetPageList () { // 获取列表
+      this.GetMingXingYeZhuList({ queryData: { accountId: 5, ...this.PageData } }).then((res) => { // 获取明星业主列表
+        this.HasNextPage = res.data.data.hasNextPage
+        this.DataLock = false
+        this.IsRefreshing = false
+      }).catch(() => {
+        this.DataLock = false
+        this.IsRefreshing = false
+      })
+    },
+    ScrollBottom () { // 上拉加载
+      if (this.DataLock || !this.HasNextPage) return
+      this.DataLock = true
+      this.PageData.pageNum += 1
+      this.ToGetPageList() // 获取列表
     },
-    Refresh (e) {
+    Refresh (e) { // 页面下拉刷新
       if (this.DataLock) return
       this.DataLock = true
       this.IsRefreshing = true
       setTimeout(() => {
-        this.IsRefreshing = false
-        this.DataLock = false
+        this.Init() // 获取列表
       }, 1000)
     }
   }

src/pages/HuiQuanYi/OwnersNews/index.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="page YeZhuZiXun">
-    <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh">
+    <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh" @ScrollBottom="ScrollBottom">
       <view class="Container">
 
         <!-- 标题 -->
@@ -9,8 +9,8 @@
         </view>
 
         <!-- 列表 -->
-        <view class="List">
-          <navigator url="./NewsDetail/index" hover-class="other-navigator-hover" v-for="(item, index) in 20" :key="index" class="Item flex-h">
+        <view class="List" v-if="YeZhuZiXunList.length">
+          <navigator url="./NewsDetail/index" hover-class="other-navigator-hover" v-for="(item, index) in YeZhuZiXunList" :key="index" class="Item flex-h">
             <view class="flex-item">
               <text>资讯标题</text>
               <text>4567</text>
@@ -26,30 +26,67 @@
 
 <script>
 import ScrollY from '../../../components/ScrollY/index'
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
 export default {
   name: 'YeZhuZiXun',
   data () {
     return {
+      PageData: {
+        pageNum: 1,
+        pageSize: 15
+      },
+      HasNextPage: true,
       IsRefreshing: false,
       DataLock: false
     }
   },
+  computed: {
+    ...mapIndexState({
+      YeZhuZiXunList: x => x.YeZhuZiXunList // 业主资讯列表
+    })
+  },
   components: {
     ScrollY
   },
   created () {
-    this.Init()
+    this.Init() // 初始化
   },
   methods: {
-    Init () {
+    ...mapIndexActions([
+      'GetYeZhuZiXunList' // 获取资讯列表
+    ]),
+    ...mapIndexMutations([
+      'EmptyYeZhuZiXunList' // 清空资讯列表
+    ]),
+    Init () { // 初始化
+      this.PageData.pageNum = 1
+      this.HasNextPage = true
+      this.EmptyYeZhuZiXunList() // 清空资讯列表
+      this.ToGetPageList() // 获取列表
+    },
+    ToGetPageList () { // 获取列表
+      this.GetYeZhuZiXunList({ queryData: { accountId: 5, ...this.PageData } }).then((res) => { // 获取资讯列表
+        this.HasNextPage = res.data.data.hasNextPage
+        this.DataLock = false
+        this.IsRefreshing = false
+      }).catch(() => {
+        this.DataLock = false
+        this.IsRefreshing = false
+      })
+    },
+    ScrollBottom () { // 上拉加载
+      if (this.DataLock || !this.HasNextPage) return
+      this.DataLock = true
+      this.PageData.pageNum += 1
+      this.ToGetPageList() // 获取列表
     },
-    Refresh (e) {
+    Refresh (e) { // 页面下拉刷新
       if (this.DataLock) return
       this.DataLock = true
       this.IsRefreshing = true
       setTimeout(() => {
-        this.IsRefreshing = false
-        this.DataLock = false
+        this.Init() // 初始化
       }, 1000)
     }
   }

src/pages/HuiShengHuo/ActivityList/index.vue

@@ -6,30 +6,32 @@
       <scroll-view scroll-x="true">
         <view class="NavX">
           <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/jingcaihuodong.png"></image>
-          <view v-for="(item, index) in NavList" :key="index">{{item.name}}</view>
+          <view v-for="(item, index) in HuoDongNavList" :key="index" :class="{'active': CurrentNavId === index}" @tap="CutNav(item, index)">导航{{index + 1}}</view>
         </view>
       </scroll-view>
     </view>
 
     <!-- 列表 -->
     <view class="flex-item">
-      <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh">
+      <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh" @ScrollBottom="ScrollBottom">
 
         <view class="ActivityList">
           <view class="List">
-            <view class="Item" v-for="(item, index) in 20" :key="index">
-              <view class="Img"></view>
+            <view class="Item" v-for="(item, index) in ActivityList" :key="index">
+              <view class="Img" @tap="LinkTo('./ActivityDetail/index')">
+                <image mode="aspectFill" class="centerLabel" :src="ToolClass.DemoImg()"></image>
+              </view>
               <view class="Info">
-                <text>活动名称</text>
+                <text @tap="LinkTo('./ActivityDetail/index')">活动名称</text>
                 <view class="flex-h">
                   <text class="flex-item">参与截止时间：2020-08-20 16:00</text>
-                  <navigator url="./ActivityList/ActivityDetail/index" hover-class="other-navigator-hover" class="Btn">立即报名</navigator>
-                  <navigator url="./ActivityList/ActivityDetail/index" hover-class="other-navigator-hover" class="Btn">立即投票</navigator>
-                  <view>已结束</view>
+                  <navigator url="./ActivityDetail/index" hover-class="other-navigator-hover" class="Btn">立即报名</navigator>
+                  <navigator url="./ActivityDetail/index" hover-class="other-navigator-hover" class="Btn">立即投票</navigator>
+                  <view @tap="LinkTo('./ActivityDetail/index')">已结束</view>
                 </view>
               </view>
             </view>
-          <view style="width: 100%; height: 20px;"></view>
+            <view style="width: 100%; height: 20px;"></view>
           </view>
         </view>
 
@@ -40,39 +42,89 @@
 
 <script>
 import ScrollY from '../../../components/ScrollY/index'
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
 export default {
   name: 'JingCaiHuoDong',
   data () {
     return {
+      PageData: {
+        pageNum: 1,
+        pageSize: 15
+      },
+      CurrentNavId: null,
+      HasNextPage: true,
       IsRefreshing: false,
-      DataLock: false,
-      NavList: [
-        { name: '导航1', id: '1' },
-        { name: '导航2', id: '2' },
-        { name: '导航3', id: '3' },
-        { name: '导航4', id: '4' },
-        { name: '导航5', id: '5' },
-        { name: '导航6', id: '6' },
-        { name: '导航7', id: '7' }
-      ]
+      DataLock: false
     }
   },
+  computed: {
+    ...mapIndexState({
+      HuoDongNavList: x => x.HuoDongNavList, // 活动类型列表
+      ActivityList: x => x.ActivityList // 活动列表
+    })
+  },
   components: {
     ScrollY
   },
   created () {
-    this.Init()
+    this.EmptyActivityList() // 清空活动列表
+    this.GetHuoDongNavList({ queryData: { accountId: 5, pageNum: 1, pageSize: 10 } }).then(() => { // 获取活动类型列表
+      if (this.HuoDongNavList.length) {
+        this.CurrentNavId = 0
+        this.Init() // 初始化
+      }
+    })
   },
   methods: {
-    Init () {
+    ...mapIndexActions([
+      'GetHuoDongNavList', // 获取活动类型列表
+      'GetActivityList' // 获取活动列表
+    ]),
+    ...mapIndexMutations([
+      'EmptyHuoDongNavList', // 清空活动类型列表
+      'EmptyActivityList' // 清空活动列表
+    ]),
+    Init () { // 初始化
+      this.PageData.pageNum = 1
+      this.HasNextPage = true
+      this.EmptyActivityList() // 清空活动列表
+      this.ToGetPageList() // 获取列表
     },
-    Refresh (e) {
+    LinkTo (url) { // 跳转页面
+      wx.navigateTo({ url })
+    },
+    CutNav (item, index) { // 切换导航
       if (this.DataLock) return
       this.DataLock = true
-      this.IsRefreshing = true
+      this.EmptyActivityList() // 清空活动列表
+      this.CurrentNavId = index
       setTimeout(() => {
+        this.Init() // 初始化
+      }, 300)
+    },
+    ScrollBottom () { // 上拉加载
+      if (this.DataLock || !this.HasNextPage) return
+      this.DataLock = true
+      this.PageData.pageNum += 1
+      this.ToGetPageList() // 获取列表
+    },
+    ToGetPageList () { // 获取列表
+      this.GetActivityList({ queryData: { accountId: 5, ...this.PageData } }).then((res) => { // 获取活动列表
+        this.HasNextPage = res.data.data.hasNextPage
+        this.DataLock = false
         this.IsRefreshing = false
+      }).catch(() => {
         this.DataLock = false
+        this.IsRefreshing = false
+      })
+    },
+    Refresh (e) { // 页面下拉刷新
+      if (this.DataLock) return
+      this.DataLock = true
+      this.IsRefreshing = true
+      setTimeout(() => {
+        this.Init() // 初始化
       }, 1000)
     }
   }

src/pages/HuiShengHuo/PhotoList/index.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="page HuoDongZhaoPianQiang">
-    <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh">
+    <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh" @ScrollBottom="ScrollBottom">
 
       <!-- 活动照片墙 -->
       <view class="PhotoList">
@@ -27,10 +27,17 @@
 
 <script>
 import ScrollY from '../../../components/ScrollY/index'
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
 export default {
   name: 'HuoDongZhaoPianQiang',
   data () {
     return {
+      PageData: {
+        pageNum: 1,
+        pageSize: 15
+      },
+      HasNextPage: true,
       IsRefreshing: false,
       DataLock: false,
       List: [
@@ -41,22 +48,52 @@ export default {
       ]
     }
   },
+  computed: {
+    ...mapIndexState({
+      PhotoList: x => x.PhotoList // 照片墙列表
+    })
+  },
   components: {
     ScrollY
   },
   created () {
-    this.Init()
+    this.Init() // 初始化
   },
   methods: {
-    Init () {
+    ...mapIndexActions([
+      'GetPhotoList' // 获取照片墙列表
+    ]),
+    ...mapIndexMutations([
+      'EmptyPhotoList' // 清空照片墙列表
+    ]),
+    Init () { // 初始化
+      this.PageData.pageNum = 1
+      this.HasNextPage = true
+      this.EmptyPhotoList() // 清空照片墙列表
+      this.ToGetPageList() // 获取列表
+    },
+    ToGetPageList () { // 获取列表
+      this.GetPhotoList({ queryData: { accountId: 5, ...this.PageData } }).then((res) => { // 获取照片墙列表
+        this.HasNextPage = res.data.data.hasNextPage
+        this.DataLock = false
+        this.IsRefreshing = false
+      }).catch(() => {
+        this.DataLock = false
+        this.IsRefreshing = false
+      })
+    },
+    ScrollBottom () { // 上拉加载
+      if (this.DataLock || !this.HasNextPage) return
+      this.DataLock = true
+      this.PageData.pageNum += 1
+      this.ToGetPageList() // 获取列表
     },
-    Refresh (e) {
+    Refresh (e) { // 页面下拉刷新
       if (this.DataLock) return
       this.DataLock = true
       this.IsRefreshing = true
       setTimeout(() => {
-        this.IsRefreshing = false
-        this.DataLock = false
+        this.Init() // 获取列表
       }, 1000)
     }
   }

src/pages/WoDe/MyActivityList/index.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="page WoDeHuoDong">
-    <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh">
+    <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh" @ScrollBottom="ScrollBottom">
       <view class="Container">
 
         <!-- 标题 -->
@@ -9,15 +9,17 @@
         </view>
 
         <!-- 列表 -->
-        <view class="List">
-          <navigator v-for="(item, index) in 10" :key="index" url="../../HuiShengHuo/ActivityList/ActivityDetail/index" hover-class="other-navigator-hover" class="Item flex-h">
+        <view class="List" v-if="UserActivityList.length">
+          <navigator v-for="(item, index) in UserActivityList" :key="index" url="../../HuiShengHuo/ActivityList/ActivityDetail/index" hover-class="other-navigator-hover" class="Item flex-h">
             <view class="flex-item">
               <text>活动标题</text>
               <text>已报名123人</text>
               <text>已结束</text>
             </view>
             <view class="Img">
-              <view></view>
+              <view>
+                <image mode="aspectFill" class="centerLabel" :src="ToolClass.DemoImg()"></image>
+              </view>
             </view>
           </navigator>
         </view>
@@ -29,30 +31,67 @@
 
 <script>
 import ScrollY from '../../../components/ScrollY/index'
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
 export default {
   name: 'WoDeHuoDong',
   data () {
     return {
+      PageData: {
+        pageNum: 1,
+        pageSize: 15
+      },
+      HasNextPage: true,
       IsRefreshing: false,
       DataLock: false
     }
   },
+  computed: {
+    ...mapIndexState({
+      UserActivityList: x => x.UserActivityList // 我的活动列表
+    })
+  },
   components: {
     ScrollY
   },
   created () {
-    this.Init()
+    this.Init() // 初始化
   },
   methods: {
-    Init () {
+    ...mapIndexActions([
+      'GetUserActivityList' // 获取我的活动列表
+    ]),
+    ...mapIndexMutations([
+      'EmptyUserActivityList' // 清空我的活动列表
+    ]),
+    Init () { // 初始化
+      this.PageData.pageNum = 1
+      this.HasNextPage = true
+      this.EmptyUserActivityList() // 清空我的活动列表
+      this.ToGetPageList() // 获取列表
+    },
+    ToGetPageList () { // 获取列表
+      this.GetUserActivityList({ queryData: { accountId: 5, ...this.PageData } }).then((res) => { // 获取我的活动列表
+        this.HasNextPage = res.data.data.hasNextPage
+        this.DataLock = false
+        this.IsRefreshing = false
+      }).catch(() => {
+        this.DataLock = false
+        this.IsRefreshing = false
+      })
+    },
+    ScrollBottom () { // 上拉加载
+      if (this.DataLock || !this.HasNextPage) return
+      this.DataLock = true
+      this.PageData.pageNum += 1
+      this.ToGetPageList() // 获取列表
     },
-    Refresh (e) {
+    Refresh (e) { // 页面下拉刷新
       if (this.DataLock) return
       this.DataLock = true
       this.IsRefreshing = true
       setTimeout(() => {
-        this.IsRefreshing = false
-        this.DataLock = false
+        this.Init() // 获取列表
       }, 1000)
     }
   }

src/store/index/index.js

@@ -12,59 +12,105 @@ export default {
     YeZhuZiXunList: [], // 业主资讯列表
     HuiAiXinBanner: [], // 荟爱心banner
     MingXingYeZhuList: [], // 明星业主列表
-    ZhengNengLiangShiJiList: [] // 正能量事迹列表
+    ZhengNengLiangShiJiList: [], // 正能量事迹列表
+    HuoDongNavList: [], // 活动类型列表
+    UserActivityList: [] // 我的活动列表
   },
   mutations: {
     UpdateIndexBanner (state, data) { // 更新首页banner
-      state.IndexBanner = data || []
+      state.IndexBanner = state.IndexBanner.concat(data || [])
     },
     EmptyIndexBanner (state) { // 清空首页banner
       state.IndexBanner = []
     },
     UpdatePhotoList (state, data) { // 更新照片墙列表
-      state.PhotoList = data || []
+      state.PhotoList = state.PhotoList.concat(data || [])
     },
     EmptyPhotoList (state) { // 清空照片墙列表
       state.PhotoList = []
     },
     UpdateActivityList (state, data) { // 更新活动列表
-      state.ActivityList = data || []
+      state.ActivityList = state.ActivityList.concat(data || [])
     },
     EmptyActivityList (state) { // 清空活动列表
       state.ActivityList = []
     },
     UpdateQuanYiBanner (state, data) { // 更新荟权益banner
-      state.QuanYiBanner = data || []
+      state.QuanYiBanner = state.QuanYiBanner.concat(data || [])
     },
     EmptyQuanYiBanner (state) { // 清空荟权益banner
       state.QuanYiBanner = []
     },
     UpdateYeZhuZiXunList (state, data) { // 更新业主资讯列表
-      state.YeZhuZiXunList = data || []
+      state.YeZhuZiXunList = state.YeZhuZiXunList.concat(data || [])
     },
     EmptyYeZhuZiXunList (state) { // 清空业主资讯列表
       state.YeZhuZiXunList = []
     },
     UpdateHuiAiXinBanner (state, data) { // 更新荟爱心banner
-      state.HuiAiXinBanner = data || []
+      state.HuiAiXinBanner = state.HuiAiXinBanner.concat(data || [])
     },
     EmptyHuiAiXinBanner (state) { // 清空荟爱心banner
       state.HuiAiXinBanner = []
     },
     UpdateMingXingYeZhuList (state, data) { // 更新明星业主列表
-      state.MingXingYeZhuList = data || []
+      state.MingXingYeZhuList = state.MingXingYeZhuList.concat(data || [])
     },
     EmptyMingXingYeZhuList (state) { // 清空明星业主列表
       state.MingXingYeZhuList = []
     },
     UpdateZhengNengLiangShiJiList (state, data) { // 更新正能量事迹列表
-      state.ZhengNengLiangShiJiList = data || []
+      state.ZhengNengLiangShiJiList = state.ZhengNengLiangShiJiList.concat(data || [])
     },
     EmptyZhengNengLiangShiJiList (state) { // 清空正能量事迹列表
       state.ZhengNengLiangShiJiList = []
+    },
+    UpdateHuoDongNavList (state, data) { // 更新活动类型列表
+      state.HuoDongNavList = data || []
+    },
+    EmptyHuoDongNavList (state) { // 清空活动类型列表
+      state.HuoDongNavList = []
+    },
+    UpdateUserActivityList (state, data) { // 更新我的活动列表
+      state.UserActivityList = state.UserActivityList.concat(data || [])
+    },
+    EmptyUserActivityList (state) { // 清空我的活动列表
+      state.UserActivityList = []
     }
   },
   actions: {
+    GetUserActivityList (context, payload) { // 获取我的活动列表
+      return new Promise((resolve, reject) => {
+        ToolClass.WxRequest({
+          url: Api.GetUserActivityList.url,
+          method: Api.GetUserActivityList.method,
+          ...payload,
+          success (res) {
+            context.commit('UpdateUserActivityList', res.data.data.list)
+            resolve(res)
+          },
+          error (res) {
+            reject(res)
+          }
+        })
+      })
+    },
+    GetHuoDongNavList (context, payload) { // 获取活动类型列表
+      return new Promise((resolve, reject) => {
+        ToolClass.WxRequest({
+          url: Api.GetHuoDongNavList.url,
+          method: Api.GetHuoDongNavList.method,
+          ...payload,
+          success (res) {
+            context.commit('UpdateHuoDongNavList', res.data.data.list)
+            resolve(res)
+          },
+          error (res) {
+            reject(res)
+          }
+        })
+      })
+    },
     GetZhengNengLiangShiJiList (context, payload) { // 获取正能量事迹列表
       return new Promise((resolve, reject) => {
         ToolClass.WxRequest({

src/util/Api/index.js

@@ -33,6 +33,14 @@ const Api = {
   GetZhengNengLiangShiJiList: { // 获取正能量事迹列表
     method: 'get',
     url: `${prefix}/pieceGroup/listGroup`
+  },
+  GetHuoDongNavList: { // 获取活动类型列表
+    method: 'get',
+    url: `${prefix}/pieceGroup/listGroup`
+  },
+  GetUserActivityList: { // 获取我的活动列表
+    method: 'get',
+    url: `${prefix}/pieceGroup/listGroup`
   }
 }