接口请求完善

config/dev.js

     NODE_ENV: '"development"'
   },
   defineConstants: {
+    SERVER_API: '"https://dev.fangdeal.cn/liyuanhui/api/wx"'
   },
   mini: {},
   h5: {}

config/index.js

+const path = require('path')
+
 const config = {
   projectName: 'myApp',
   date: '2020-8-7',
         }
       }
     }
+  },
+  alias: {
+    '@/components': path.resolve(__dirname, '..', 'src/components'),
+    '@/util': path.resolve(__dirname, '..', 'src/util')
   }
 }
 

config/prod.js

     NODE_ENV: '"production"'
   },
   defineConstants: {
+    SERVER_API: '"https://dev.fangdeal.cn/liyuanhui/api/wx"'
   },
   mini: {},
   h5: {

package.json

   "license": "MIT",
   "dependencies": {
     "@babel/runtime": "^7.7.7",
+    "@tarojs/cli": "^3.0.7",
     "@tarojs/components": "3.0.7",
+    "@tarojs/mini-runner": "^3.0.7",
     "@tarojs/runtime": "3.0.7",
     "@tarojs/taro": "3.0.7",
     "qs": "^6.9.4",
     "vuex": "^3.5.1"
   },
   "devDependencies": {
-    "@types/webpack-env": "^1.13.6",
+    "@babel/core": "^7.8.0",
     "@tarojs/mini-runner": "3.0.7",
     "@tarojs/webpack-runner": "3.0.7",
-    "@babel/core": "^7.8.0",
+    "@types/webpack-env": "^1.13.6",
     "babel-preset-taro": "3.0.7",
-    "vue-loader": "^15.9.2",
-    "eslint-plugin-vue": "^6.x",
-    "eslint-config-taro": "3.0.7",
     "eslint": "^6.8.0",
-    "stylelint": "9.3.0"
+    "eslint-config-taro": "3.0.7",
+    "eslint-plugin-vue": "^6.x",
+    "stylelint": "9.3.0",
+    "vue-loader": "^15.9.2"
   }
 }

project.config.json

 	"appid": "wxd9ee3a9480a4e544",
 	"setting": {
 		"urlCheck": false,
+		"scopeDataCheck": false,
+		"coverView": true,
 		"es6": false,
-		"enhance": false,
 		"postcss": false,
+		"compileHotReLoad": false,
 		"preloadBackgroundData": false,
 		"minified": false,
+		"autoAudits": false,
 		"newFeature": false,
-		"coverView": true,
+		"uglifyFileName": false,
+		"uploadWithSourceMap": true,
+		"useIsolateContext": true,
 		"nodeModules": false,
-		"autoAudits": false,
+		"enhance": false,
+		"useCompilerModule": false,
+		"userConfirmedUseCompilerModuleSwitch": false,
 		"showShadowRootInWxmlPanel": true,
-		"scopeDataCheck": false,
-		"uglifyFileName": false,
 		"checkInvalidKey": true,
 		"checkSiteMap": true,
-		"uploadWithSourceMap": true,
-		"compileHotReLoad": false,
 		"babelSetting": {
 			"ignore": [],
 			"disablePlugins": [],
 			"outputPath": ""
-		},
-		"useIsolateContext": true,
-		"useCompilerModule": false,
-		"userConfirmedUseCompilerModuleSwitch": false
+		}
 	},
 	"compileType": "miniprogram",
 	"simulatorType": "wechat",

src/app.js

+import Taro from '@tarojs/taro'
 import Vue from 'vue'
+import BasicLayout from '@/components/Layout/Basic'
+import { vueAuthPlugin } from '@/util/auth-plugin'
 import store from './store/index'
 
 import './app.scss'
 import ToolClass from './util/PublicMethod/index'
 Vue.prototype.ToolClass = ToolClass
 
+Vue.use(vueAuthPlugin)
+Vue.component('BasicLayout', BasicLayout)
+
 const App = new Vue({
   store,
-  onShow (options) {
+  onLaunch (options) {
+    this.login(options)
   },
   render(h) {
     // this.$slots.default 是将要会渲染的页面
     return h('block', this.$slots.default)
+  },
+  methods: {
+    login(options) {
+      Taro.login({
+        success (res) {
+          if (res.code) {
+            store.dispatch(
+              'user/MainSignIn',
+              { queryData: { code: res.code } }
+            ).then((res) => { // 获取用户信息
+              store.commit(
+                'user/EditUserInfo',
+                { name: 'PersonId', value: res.data.data.person.personId }
+              )
+
+              store.commit(
+                'user/EditUserInfo',
+                { name: 'OpenId', value: res.data.data.person.openId }
+              )
+              
+              store.commit(
+                'user/EditUserInfo',
+                { name: 'SessionKey', value: res.data.data.person.sessionKey }
+              )
+              
+              store.commit(
+                'user/EditUserInfo',
+                { name: 'Phone', value: res.data.data.person.phone }
+              )
+            })
+          } else {
+            Taro.showToast({
+              title: '初始化失败, 请退出重试',
+              icon: 'none',
+              duration: 3000
+            })
+          }
+        }
+      })
+    }
   }
 })
 

src/components/BannerSwiper/index.vue

       <block v-for="(item, index) in List" :key="index">
         <swiper-item>
           <view class="swiper-item">
-            <image mode="aspectFill" class="centerLabel" :src="ToolClass.DemoImg()"></image>
+            <image mode="aspectFill" class="centerLabel" :src="item.image" @tap="LinkTo(item)"></image>
           </view>
         </swiper-item>
       </block>
     }
   },
   methods: {
+    LinkTo (item) {
+      if (item.srcId === null) return
+      wx.navigateTo({ url: `../../pages/HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.advId}`})
+    }
   }
 }
 </script>

src/components/GetUserIcon/index.vue

               scope: 'scope.userInfo',
               success () {
                 wx.getUserInfo({ // 授权成功时，获取用户信息
-                  success (res) {
-                    _that.EditUserInfo({ name: 'Icon', value: res.userInfo.avatarUrl })
-                    _that.EditUserInfo({ name: 'Name', value: res.userInfo.nickName })
+                  success (subRes) {
+                    _that.EditUserInfo({ name: 'Icon', value: subRes.userInfo.avatarUrl })
+                    _that.EditUserInfo({ name: 'Name', value: subRes.userInfo.nickName })
                   }
                 })
               }

src/components/Layout/Basic/index.vue

+<template>
+  <block>
+    <block v-if="user.PersonId">
+      <slot v-bind:user="user"></slot>
+    </block>
+    <Loading v-else />
+  </block>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import Loading from '@/components/Loading'
+
+export default {
+  name: 'BasicLayout',
+  components: {
+    Loading
+  },
+  computed: {
+    ...mapState({
+      user: s => s.user.UserInfo || {}
+    })
+  }
+}
+</script>

src/components/Loading/index.vue

+<template>
+  <view style="text-align: center; margin-top: 20vh">Loading</view>
+</template>

src/pages/HuiAiXin/EnergyStory/index.vue

         </view>
 
         <!-- 列表 -->
-        <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="List" v-if="PageList.length">
+          <navigator v-for="(item, index) in PageList" :key="index" :url="`../../HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Item flex-h">
             <view class="flex-item">
-              <text>事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题</text>
+              <text>{{item.name}}</text>
               <text>副标题</text>
               <text>来源</text>
             </view>
             <view class="Img">
               <view>
-                <image mode="aspectFill" class="centerLabel" :src="ToolClass.DemoImg()"></image>
+                <image mode="aspectFill" class="centerLabel" :src="item.thumb"></image>
               </view>
             </view>
           </navigator>
 import ScrollY from '../../../components/ScrollY/index'
 import { createNamespacedHelpers } from 'vuex'
 const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
+const { mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
 export default {
   name: 'ZhengNengLiangShiJi',
   data () {
     return {
+      PageList: [],
       PageData: {
         pageNum: 1,
         pageSize: 15
     ScrollY
   },
   created () {
-    this.Init()
+    this.$authed(() => {
+      this.Init()
+    })
   },
   methods: {
+    ...mapUserActions([
+      'MainSignIn' // 获取用户信息
+    ]),
+    ...mapUserMutations([
+      'EditUserInfo' // 编辑用户信息
+    ]),
     ...mapIndexActions([
       'GetZhengNengLiangShiJiList' // 获取正能量事迹列表
     ]),
       this.PageData.pageNum = 1
       this.HasNextPage = true
       this.EmptyZhengNengLiangShiJiList() // 清空正能量事迹列表
+      this.PageList = []
       this.ToGetPageList() // 获取列表
     },
     ToGetPageList () { // 获取列表
-      this.GetZhengNengLiangShiJiList({ queryData: { accountId: 5, ...this.PageData } }).then((res) => { // 获取正能量事迹列表
-        this.HasNextPage = res.data.data.hasNextPage
+      this.GetZhengNengLiangShiJiList({ queryData: { ...this.PageData, typeId: 6 } }).then((res) => { // 获取正能量事迹列表
+        this.PageList = [...this.ZhengNengLiangShiJiList]
+        this.HasNextPage = res.data.data.current < res.data.data.pages
         this.DataLock = false
         this.IsRefreshing = false
       }).catch(() => {

src/pages/HuiAiXin/StarOwner/index.vue

         </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="List" v-if="PageList.length">
+          <navigator v-for="(item, index) in PageList" :key="index" :url="`../../HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Item">
             <view class="Img">
-              <image mode="aspectFill" class="centerLabel" :src="ToolClass.DemoImg()"></image>
+              <image mode="aspectFill" class="centerLabel" :src="item.thumb"></image>
             </view>
-            <text class="Info">业主家庭名称</text>
+            <text class="Info">{{item.name}}</text>
           </navigator>
         </view>
 
 import ScrollY from '../../../components/ScrollY/index'
 import { createNamespacedHelpers } from 'vuex'
 const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
+const { mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
 export default {
   name: 'MingXingYeZhu',
   data () {
     return {
+      PageList: [],
       PageData: {
         pageNum: 1,
         pageSize: 15
     ScrollY
   },
   created () {
-    this.Init() // 初始化
+    this.$authed(() => {
+      this.Init()
+    })
   },
   methods: {
+    ...mapUserActions([
+      'MainSignIn' // 获取用户信息
+    ]),
+    ...mapUserMutations([
+      'EditUserInfo' // 编辑用户信息
+    ]),
     ...mapIndexActions([
       'GetMingXingYeZhuList' // 获取明星业主列表
     ]),
       this.PageData.pageNum = 1
       this.HasNextPage = true
       this.EmptyMingXingYeZhuList() // 清空明星业主列表
+      this.PageList = []
       this.ToGetPageList() // 获取列表
     },
     ToGetPageList () { // 获取列表
-      this.GetMingXingYeZhuList({ queryData: { accountId: 5, ...this.PageData } }).then((res) => { // 获取明星业主列表
-        this.HasNextPage = res.data.data.hasNextPage
+      this.GetMingXingYeZhuList({ queryData: { ...this.PageData, typeId: 1 } }).then((res) => { // 获取明星业主列表
+        this.PageList = [...this.MingXingYeZhuList]
+        this.HasNextPage = res.data.data.current < res.data.data.pages
         this.DataLock = false
         this.IsRefreshing = false
       }).catch(() => {

src/pages/HuiAiXin/index.vue

           </view>
           <navigator url="./StarOwner/index" hover-class="other-navigator-hover" class="More">更多 <text class="iconfont iconjiantouright"></text></navigator>
         </view>
-        <view class="ListContainer" v-if="MingXingYeZhuList.length">
+        <view class="ListContainer" v-if="PageStarList.length">
           <scroll-view scroll-x="true">
             <view class="List">
-              <navigator v-for="(item, index) in MingXingYeZhuList" :key="index" url="./StarOwner/StarOwnerDetail/index" hover-class="other-navigator-hover" class="Item">
+              <navigator v-for="(item, index) in PageStarList" :key="index" :url="`../HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Item">
                 <view class="Img">
-                  <image mode="aspectFill" class="centerLabel" :src="ToolClass.DemoImg()"></image>
+                  <image mode="aspectFill" class="centerLabel" :src="item.thumb"></image>
                 </view>
-                <text class="Info">业主家庭名称</text>
+                <text class="Info">{{item.name}}</text>
               </navigator>
             </view>
             <view style="width: 100%; height: 20px;"></view>
           </view>
           <navigator url="./EnergyStory/index" hover-class="other-navigator-hover" class="More">更多 <text class="iconfont iconjiantouright"></text></navigator>
         </view>
-        <view class="List" v-if="ZhengNengLiangShiJiList.length">
-          <navigator v-for="(item, index) in ZhengNengLiangShiJiList" :key="index" url="./EnergyStory/EnergyStoryDetail/index" hover-class="other-navigator-hover" class="Item flex-h">
+        <view class="List" v-if="PageStoryList.length">
+          <navigator v-for="(item, index) in PageStoryList" :key="index" :url="`../HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Item flex-h">
             <view class="flex-item">
-              <text>事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题</text>
+              <text>{{item.name}}</text>
               <text>副标题</text>
               <text>来源</text>
             </view>
             <view class="Img">
               <view>
-                <image mode="aspectFill" class="centerLabel" :src="ToolClass.DemoImg()"></image>
+                <image mode="aspectFill" class="centerLabel" :src="item.thumb"></image>
               </view>
             </view>
           </navigator>
 import BannerSwiper from '../../components/BannerSwiper/index'
 import { createNamespacedHelpers } from 'vuex'
 const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
+const { mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
 export default {
   name: 'HuiAiXin',
   data () {
     return {
+      PageStarList: [],
+      PageStoryList: [],
       RequestNum: 0,
       IsRefreshing: false,
       DataLock: false
     BannerSwiper
   },
   created () {
-    this.Init()
+    this.$authed(() => {
+      this.Init()
+    })
   },
   methods: {
+    ...mapUserActions([
+      'MainSignIn' // 获取用户信息
+    ]),
+    ...mapUserMutations([
+      'EditUserInfo' // 编辑用户信息
+    ]),
     ...mapIndexActions([
       'GetHuiAiXinBanner', // 获取荟爱心banner
       'GetMingXingYeZhuList', // 获取明星业主列表
       this.EmptyHuiAiXinBanner() // 清空荟爱心banner
       this.EmptyMingXingYeZhuList() // 清空明星业主列表
       this.EmptyZhengNengLiangShiJiList() // 清空正能量事迹列表
+      this.PageStarList = []
+      this.PageStoryList = []
       this.GetHuiAiXinBanner({ queryData: { pageNum: 1, pageSize: 10, position: 'love' } }).then(() => { // 获取荟爱心banner
         this.CheckRequestNum(3) // 判断请求接口个数
       }).catch(() => {
         this.CheckRequestNum(3) // 判断请求接口个数
       })
-      this.GetMingXingYeZhuList({ queryData: { accountId: 5, pageNum: 1, pageSize: 10 } }).then(() => { // 获取明星业主列表
+      this.GetMingXingYeZhuList({ queryData: { pageNum: 1, pageSize: 10, typeId: 2 } }).then(() => { // 获取明星业主列表
+        this.PageStarList = [...this.MingXingYeZhuList]
         this.CheckRequestNum(3) // 判断请求接口个数
       }).catch(() => {
         this.CheckRequestNum(3) // 判断请求接口个数
       })
-      this.GetZhengNengLiangShiJiList({ queryData: { accountId: 5, pageNum: 1, pageSize: 10 } }).then(() => { // 获取正能量事迹列表
+      this.GetZhengNengLiangShiJiList({ queryData: { pageNum: 1, pageSize: 10, typeId: 6 } }).then(() => { // 获取正能量事迹列表
+        this.PageStoryList = [...this.ZhengNengLiangShiJiList]
         this.CheckRequestNum(3) // 判断请求接口个数
       }).catch(() => {
         this.CheckRequestNum(3) // 判断请求接口个数

src/pages/HuiQuanYi/OwnersNews/NewsDetail/index.vue

 <template>
   <view class="page ZiXunXiangQing">
-    
     <!-- 标题 -->
-    <view class="MainTitle">
-      <text>标题</text>
-      <text class="iconfont iconguanbi"></text>
+    <view class="MainTitle" v-if="Info !== null">
+      <text>{{Info.title}}</text>
+      <text class="iconfont iconguanbi" @tap="GoBack"></text>
     </view>
 
     <!-- 内容 -->
-    <view class="Container"></view>
-    
+    <view class="Container" v-if="Info !== null">
+      <image mode="widthFix" class="Img" :src="Info.thumb"></image>
+      <text>{{Info.content}}</text>
+    </view>
   </view>
 </template>
 
 <script>
-
+import { getCurrentInstance } from "@tarojs/taro"
+import { createNamespacedHelpers } from "vuex"
+const { mapActions: mapIndexActions } = createNamespacedHelpers("index")
 export default {
-  name: 'ZiXunXiangQing',
-  data () {
+  name: "ZiXunXiangQing",
+  data() {
     return {
-
+      CurrnetId: null,
+      Info: null
     }
   },
-  components: {
-  },
-  created () {
-    this.Init()
+  components: {},
+  created() {
+    this.CurrnetId = getCurrentInstance().router.params.id
+    this.$authed(() => {
+      this.Init()
+    })
   },
   methods: {
-    Init () {
+    ...mapIndexActions([
+      "GetNewsDetail", // 获取资讯详情
+    ]),
+    Init() {
+      this.GetNewsDetail({
+        urlData: { id: this.CurrnetId }
+      }).then((res) => {
+        this.Info = res.data.data || null
+      })
+    },
+    GoBack () {
+      wx.navigateBack()
     }
-  }
+  },
 }
 </script>
 
 <style lang="scss">
-@import "page.scss";
+@import "page.scss"
 </style>

src/pages/HuiQuanYi/OwnersNews/NewsDetail/page.scss

     margin-top: 40px;
     padding: 0 20px;
     padding-bottom: 40px;
+    > image {
+      width: 100%;
+    }
+    > text {
+      display: block;
+      font-size: 28px;
+      line-break: 40px;
+      color: #666;
+      margin-top: 20px;
+    }
   }
 }

src/pages/HuiQuanYi/OwnersNews/index.vue

         </view>
 
         <!-- 列表 -->
-        <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="List" v-if="PageList.length">
+          <navigator :url="`./NewsDetail/index?id=${item.newsId}`" hover-class="other-navigator-hover" v-for="(item, index) in PageList" :key="index" class="Item flex-h">
             <view class="flex-item">
-              <text>资讯标题</text>
-              <text>4567</text>
+              <text>{{item.title}}</text>
+              <text></text>
             </view>
             <text class="iconfont iconjiantouright"></text>
           </navigator>
 import ScrollY from '../../../components/ScrollY/index'
 import { createNamespacedHelpers } from 'vuex'
 const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
+const { mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
 export default {
   name: 'YeZhuZiXun',
   data () {
     return {
+      PageList: [],
       PageData: {
         pageNum: 1,
         pageSize: 15
     ScrollY
   },
   created () {
-    this.Init() // 初始化
+    this.$authed(() => {
+      this.Init()
+    })
   },
   methods: {
+    ...mapUserActions([
+      'MainSignIn' // 获取用户信息
+    ]),
+    ...mapUserMutations([
+      'EditUserInfo' // 编辑用户信息
+    ]),
     ...mapIndexActions([
       'GetYeZhuZiXunList' // 获取资讯列表
     ]),
     Init () { // 初始化
       this.PageData.pageNum = 1
       this.HasNextPage = true
+      this.PageList = []
       this.EmptyYeZhuZiXunList() // 清空资讯列表
       this.ToGetPageList() // 获取列表
     },
     ToGetPageList () { // 获取列表
       this.GetYeZhuZiXunList({ queryData: { accountId: 5, ...this.PageData } }).then((res) => { // 获取资讯列表
-        this.HasNextPage = res.data.data.hasNextPage
+        this.PageList = [...this.YeZhuZiXunList]
+        this.HasNextPage = res.data.data.current < res.data.data.pages
         this.DataLock = false
         this.IsRefreshing = false
       }).catch(() => {

src/pages/HuiQuanYi/index.vue

           </view>
           <navigator url="./OwnersNews/index" hover-class="other-navigator-hover" class="More">更多 <text class="iconfont iconjiantouright"></text></navigator>
         </view>
-        <view class="List" v-if="YeZhuZiXunList.length">
-          <navigator v-for="(item, index) in YeZhuZiXunList" class="flex-h" :key="index" url="./OwnersNews/NewsDetail/index" hover-class="other-navigator-hover">
+        <view class="List" v-if="PageList.length">
+          <navigator v-for="(item, index) in PageList" class="flex-h" :key="index" :url="`./OwnersNews/NewsDetail/index?id=${item.newsId}`" hover-class="other-navigator-hover">
             <view class="Num"><text>{{index + 1}}</text></view>
             <view class="flex-item">
-              <text>资讯标题</text>
-              <text>1234</text>
+              <text>{{item.title}}</text>
+              <text></text>
             </view>
           </navigator>
         </view>
 import BannerSwiper from '../../components/BannerSwiper/index'
 import { createNamespacedHelpers } from 'vuex'
 const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
+const { mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
 export default {
   name: 'HuiQuanYi',
   data () {
     return {
+      PageList: [],
       RequestNum: 0,
       IsRefreshing: false,
       DataLock: false
     BannerSwiper
   },
   created () {
-    this.Init()
+    this.$authed(() => {
+      this.Init()
+    })
   },
   methods: {
+    ...mapUserActions([
+      'MainSignIn' // 获取用户信息
+    ]),
+    ...mapUserMutations([
+      'EditUserInfo' // 编辑用户信息
+    ]),
     ...mapIndexActions([
       'GetHuiQuanYiBanner', // 获取荟权益banner
       'GetYeZhuZiXunList' // 获取业主资讯列表
     ]),
     Init () {
       this.RequestNum = 0
+      this.PageList = []
       this.EmptyQuanYiBanner() // 清空荟权益banner
       this.EmptyYeZhuZiXunList() // 清空业主资讯列表
       this.GetHuiQuanYiBanner({ queryData: { pageNum: 1, pageSize: 10, position: 'rights' } }).then(() => { // 获取荟权益banner
         this.CheckRequestNum(2) // 判断请求接口个数
       })
       this.GetYeZhuZiXunList({ queryData: { pageNum: 1, pageSize: 10 } }).then(() => { // 获取业主资讯列表
+        this.PageList = [...this.YeZhuZiXunList]
         this.CheckRequestNum(2) // 判断请求接口个数
       }).catch(() => {
         this.CheckRequestNum(2) // 判断请求接口个数

src/pages/HuiShengHuo/ActivityList/ActivityDetail/JoinIn/index.vue

       <view class="flex-h">
         <text>姓名</text>
         <view class="flex-item">
-          <input type="text" placeholder="请输入" />
+          <input type="text" placeholder="请输入" v-model="Name" />
         </view>
       </view>
       <view class="flex-h">
         <text>手机号</text>
         <view class="flex-item">
-          <input type="number" placeholder="请输入" />
+          <input type="number" placeholder="请输入" v-model="Phone" />
         </view>
       </view>
       <view class="flex-h">
         <text>人数</text>
         <view class="flex-item">
-          <input type="number" placeholder="请输入" />
+          <input type="number" placeholder="请输入" v-model="Num" />
         </view>
       </view>
     </view>
-    
-    <text>提交</text>
+
+    <text @tap="ToJoin">提交</text>
 
   </view>
 </template>
 
 <script>
-
+import { getCurrentInstance } from '@tarojs/taro'
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapUserState, mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
 export default {
   name: 'LiJiBaoMing',
   data () {
     return {
-
+      Name: '',
+      Phone: '',
+      Num: '',
+      CurrnetId: null,
+      DataLock: false
     }
   },
+  computed: {
+    ...mapUserState({
+      UserInfo: x => x.UserInfo // 用户信息
+    })
+  },
   components: {
   },
   created () {
-    this.Init()
+    this.CurrnetId = getCurrentInstance().router.params.id
+    this.$authed(() => {
+      this.Init()
+    })
   },
   methods: {
+    ...mapUserActions([
+      'GetUserPhone',
+      'PostActivityJoin',
+      'MainSignIn' // 获取用户信息
+    ]),
+    ...mapUserMutations([
+      'EditUserInfo' // 编辑用户信息
+    ]),
     Init () {
+    },
+    ToJoin () { // 去报名
+      if (this.DataLock) return
+      this.DataLock = true
+      this.PostActivityJoin({
+        urlData: { id: this.ActivityInfo.activityId },
+        data: { data: { enrollName: this.Name, enrollPhone: this.Phone, enrollNum: this.Num } }
+      }).then((res) => {
+        this.DataLock = false
+        wx.showToast({
+          title: '报名成功',
+          icon: 'none',
+          duration: 2000
+        })
+      }).catch(() => {
+        this.DataLock = false
+      })
     }
   }
 }

src/pages/HuiShengHuo/ActivityList/ActivityDetail/index.vue

   <view class="page HuoDongXiangQing flex-v">
 
     <view class="flex-item">
-      <view>
+      <view v-if="ActivityInfo !== null">
 
         <!-- 活动主要信息 -->
         <view class="MainInfo">
-          <text>活动名称</text>
-          <view class="SubInfo flex-h">
-            <view class="flex-item">
-              <text class="iconfont iconxianshi"></text>
-              <text>1245</text>
-            </view>
-            <view class="Time">
-              <text class="iconfont iconshijian"></text>
-              <text>2020-08-07</text>
-            </view>
-          </view>
+          <text>{{ActivityInfo.name}}</text>
           <view class="Line flex-h">
             <text>活动时间：</text>
-            <text class="flex-item">2020-08-07 至 2020-08-08</text>
+            <text class="flex-item">{{ToolClass.DateFormat(new Date(ActivityInfo.startDate).getTime())}} 至 {{ToolClass.DateFormat(new Date(ActivityInfo.endDate).getTime())}}</text>
           </view>
           <view class="Line flex-h">
             <text>活动地址：</text>
-            <text class="flex-item">南京市江宁区丽园荟广场</text>
+            <text class="flex-item">{{ActivityInfo.address}}</text>
           </view>
           <view class="Line flex-h">
             <text>报名截止：</text>
-            <text class="flex-item">2020-08-06 18:30</text>
+            <text class="flex-item">{{ToolClass.DateFormat(new Date(ActivityInfo.enrollEnd).getTime())}}</text>
           </view>
         </view>
 
         <!-- 活动详情 -->
         <view class="DetailContainer">
           <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/huodongxiangqing.png"></image>
-          <view class="Text"></view>
+          <view class="Text">
+            <rich-text :nodes="ActivityInfo.detail"></rich-text>
+          </view>
         </view>
 
         <!-- 投票 -->
-        <view class="VoteContainer">
+        <view class="VoteContainer" v-if="IsVote">
           <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/toupiao.png"></image>
           <view class="List">
-            <view v-for="(item, index) in VoteList" :key="index">
-              <text>{{index + 1}}.{{item.Question}}</text>
-              <view class="flex-h" v-for="(subItem, subIndex) in item.Answer" :key="subIndex">
-                <text class="iconfont iconweigouxuan" v-if="!subItem.active"></text>
-                <text class="iconfont icongouxuan" v-else></text>
-                <view class="flex-item">
-                  <text>{{subItem.name}}</text>
-                </view>
+            <view v-for="(item, index) in VoteList" :key="index" class="flex-h" @tap="VoteIndex = index">
+              <text class="iconfont iconweigouxuan" v-if="VoteIndex !== index"></text>
+              <text class="iconfont icongouxuan" v-else></text>
+              <view class="flex-item">
+                <text>{{item.name}}</text>
               </view>
             </view>
           </view>
-          <text>提交</text>
+          <text @tap="ToPostActivityVote">提交</text>
+          <button open-type="getPhoneNumber" class="GetPhoneBtn" v-if="!DataLock && ShowGetPhoneBtn" @getphonenumber="GetPhoneNumber">授权手机号</button>
         </view>
 
       </view>
 
     <!-- 底部栏 -->
     <view class="Bottom flex-h">
-      <view class="flex-item">
+      <view class="flex-item" @tap="LinkTo('../../index')">
         <image class="centerLabel" mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/huishenghuo.png"></image>
       </view>
       <view class="flex-item">
         <image class="centerLabel" mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/fenxiang.png"></image>
       </view>
-      <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/lijibaomingbtn.png"></image>
+      <image mode="heightFix" v-if="IsEnroll" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/lijibaomingbtn.png" @tap="ToJoin"></image>
+      <button open-type="getPhoneNumber" class="GetPhoneBottomBtn" v-if="!DataLock && ShowGetPhoneBtn && IsEnroll" @getphonenumber="GetPhoneNumber">授权手机号</button>
     </view>
 
   </view>
 </template>
 
 <script>
+import { getCurrentInstance } from '@tarojs/taro'
 import { createNamespacedHelpers } from 'vuex'
 const { mapActions: mapIndexActions } = createNamespacedHelpers('index')
-const { mapState: mapUserState } = createNamespacedHelpers('user')
+const { mapState: mapUserState, mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
 export default {
   name: 'HuoDongXiangQing',
   data () {
     return {
-      DataLock: false,
-      VoteList: [
-        {
-          Question: '问题1',
-          Answer: [{ name: '答案1', active: false, id: '1' }, { name: '答案2', active: false, id: '2' }, { name: '答案3', active: false, id: '3' }]
-        }, {
-          Question: '问题2',
-          Answer: [{ name: '答案1', active: false, id: '1' }, { name: '答案2', active: false, id: '2' }, { name: '答案3', active: false, id: '3' }]
-        }, {
-          Question: '问题3',
-          Answer: [{ name: '答案1', active: false, id: '1' }, { name: '答案2', active: false, id: '2' }, { name: '答案3', active: false, id: '3' }]
-        }, {
-          Question: '问题4',
-          Answer: [{ name: '答案1', active: false, id: '1' }, { name: '答案2', active: false, id: '2' }, { name: '答案3', active: false, id: '3' }]
-        }, {
-          Question: '问题5',
-          Answer: [{ name: '答案1', active: false, id: '1' }, { name: '答案2', active: false, id: '2' }, { name: '答案3', active: false, id: '3' }]
-        }
-      ]
+      ShowGetPhoneBtn: false,
+      VoteIndex: null,
+      VoteList: [],
+      ActivityInfo: null,
+      IsVote: false,
+      IsEnroll: false,
+      CurrnetId: null,
+      DataLock: false
     }
   },
   computed: {
   },
   components: {
   },
+  onShareAppMessage () {
+    return {
+      title: this.ActivityInfo.shareTitle,
+      path: `/pages/HuiShengHuo/ActivityList/ActivityDetail/index?id=${this.ActivityInfo.activityId}`,
+      imageUrl: this.ActivityInfo.shareImg
+    }
+  },
   created () {
-    this.Init()
+    wx.showShareMenu({
+      withShareTicket: true,
+      menus: ['shareAppMessage', 'shareTimeline']
+    })
+    this.CurrnetId = getCurrentInstance().router.params.id
+    this.$authed(() => {
+      this.Init()
+    })
   },
   methods: {
+    ...mapUserActions([ // 活动投票
+      'PostActivityVote',
+      'GetUserPhone',
+      'PostActivityJoin',
+      'MainSignIn' // 获取用户信息
+    ]),
+    ...mapUserMutations([
+      'EditUserInfo' // 编辑用户信息
+    ]),
     ...mapIndexActions([
       'GetActivityDetail' // 获取活动详情
     ]),
     Init () {
-      this.GetActivityDetail({ urlData: { id: 1 } })
+      this.ShowGetPhoneBtn = this.UserInfo === null || this.UserInfo.Phone === undefined || this.UserInfo.Phone === null
+      this.GetActivityDetail({ urlData: { id: this.CurrnetId } }).then((res) => {
+        this.ActivityInfo = res.data.data
+        this.IsEnroll = this.ActivityInfo.isEnroll
+        if (this.ActivityInfo.isVote) {
+          this.VoteList = this.ActivityInfo.voteItemList.slice(0)
+        }
+        this.IsVote = this.ActivityInfo.isVote
+        wx.ShareAppMessage({
+          title: this.ActivityInfo.shareTitle,
+          imageUrl: this.ActivityInfo.shareImg
+        })
+      })
+    },
+    LinkTo (url) {
+      wx.switchTab({ url })
+    },
+    ToJoin () { // 报名
+      wx.navigateTo({ url: `./JoinIn/index?id=${this.ActivityInfo.activityId}` })
+    },
+    ToPostActivityVote () { // 活动投票
+      if (this.DataLock || this.VoteIndex === null) return
+      this.DataLock = true
+      this.PostActivityVote({
+        urlData: { id: this.ActivityInfo.activityId },
+        data: { data: { itemId: this.VoteList[this.VoteIndex].itemId } }
+      }).then(() => {
+        this.DataLock = false
+        wx.showToast({
+          title: '投票成功',
+          icon: 'none',
+          duration: 2000
+        })
+      }).catch(() => {
+        this.DataLock = false
+      })
+    },
+    GetPhoneNumber (e) {
+      if (this.DataLock) return
+      this.DataLock = true
+      this.GetUserPhone({
+        urlData: { personId: this.UserInfo.PersonId },
+        data: { data: { sessionKey: this.UserInfo.SessionKey, encryptedData: e.detail.encryptedData, iv: e.detail.iv } }
+      }).then((res) => {
+        this.ShowGetPhoneBtn = false
+        this.EditUserInfo({ name: 'OpenId', value: res.data.data.openId })
+        this.EditUserInfo({ name: 'Phone', value: res.data.data.phone })
+        this.DataLock = false
+      }).catch(() => {
+        this.DataLock = false
+      })
     }
   }
 }

src/pages/HuiShengHuo/ActivityList/ActivityDetail/page.scss

         }
         > .List {
           padding-top: 20px;
+          padding-left: 20px;
           > view {
-            padding-left: 20px;
             margin-bottom: 20px;
+            align-items: flex-start;
+            padding: 22px 0;
+            border-bottom: 2px solid #f5f5f5;
             > text {
-              display: block;
-              font-size: 28px;
-              color: #666;
+              font-size: 38px;
               line-height: 40px;
+              margin-right: 20px;
+              color: #fe4e45;
             }
             > view {
-              align-items: flex-start;
-              padding: 22px 0;
-              border-bottom: 2px solid #f5f5f5;
+              position: relative;
+              overflow: hidden;
               > text {
-                font-size: 38px;
+                display: block;
+                font-size: 28px;
+                color: #666;
                 line-height: 40px;
-                margin-right: 20px;
-                color: #fe4e45;
-              }
-              > view {
-                position: relative;
-                overflow: hidden;
-                > text {
-                  display: block;
-                  font-size: 28px;
-                  color: #666;
-                  line-height: 40px;
-                }
               }
             }
           }
           text-align: center;
           box-shadow: 0 5px 10px 5px rgba(253, 221, 57, 0.3);
         }
+        > .GetPhoneBtn {
+          line-height: 100px;
+          margin-top: -100px;
+          opacity: 0;
+        }
       }
     }
   }
   > .Bottom {
     background: #fff;
+    position: relative;
+    overflow: hidden;
     > view {
+      height: 90px;
       position: relative;
       overflow: hidden;
       > image {
     > image {
       height: 90px;
     }
+    > .GetPhoneBottomBtn {
+      height: 90px;
+      width: 380px;
+      display: block;
+      position: absolute;
+      right: 0;
+      top: 0;
+      opacity: 0;
+    }
   }
 }

src/pages/HuiShengHuo/ActivityList/index.vue

 
         <view class="ActivityList">
           <view class="List">
-            <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="Item" v-for="(item, index) in PageList" :key="index">
+              <navigator class="Img" :url="`./ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover">
+                <image mode="aspectFill" class="centerLabel" :src="item.thumb"></image>
+              </navigator>
               <view class="Info">
-                <text @tap="LinkTo('./ActivityDetail/index')">活动名称</text>
+                <text>{{item.name}}</text>
                 <view class="flex-h">
-                  <text class="flex-item">参与截止时间：2020-08-20 16:00</text>
-                  <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>
+                  <text class="flex-item">参与截止时间：{{ToolClass.DateFormat(new Date(item.enrollEnd).getTime())}}</text>
+                  <navigator :url="`./ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Btn" v-if="item.isEnroll">立即报名</navigator>
+                  <navigator :url="`./ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Btn" v-if="item.isVote">立即投票</navigator>
+                  <view v-if="new Date(item.endDate).getTime() <= Date.now()">已结束</view>
                 </view>
               </view>
             </view>
-            <view style="width: 100%; height: 20px;"></view>
+            <view style="width: 100%; height: 10px;"></view>
           </view>
         </view>
 
 import ScrollY from '../../../components/ScrollY/index'
 import { createNamespacedHelpers } from 'vuex'
 const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
+const { mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
 export default {
   name: 'JingCaiHuoDong',
   data () {
         pageNum: 1,
         pageSize: 15
       },
+      PageList: [],
       HuoDongNavList: [
         { Name: '暖场活动', Id: '1' },
         { Name: '六点半学堂', Id: '2' },
     ScrollY
   },
   created () {
-    this.Init() // 初始化
+    this.$authed(() => {
+      this.Init()
+    })
   },
   methods: {
+    ...mapUserActions([
+      'MainSignIn' // 获取用户信息
+    ]),
+    ...mapUserMutations([
+      'EditUserInfo' // 编辑用户信息
+    ]),
     ...mapIndexActions([
       'GetActivityList' // 获取活动列表
     ]),
     Init () { // 初始化
       this.PageData.pageNum = 1
       this.HasNextPage = true
+      this.PageList = []
       this.EmptyActivityList() // 清空活动列表
       this.ToGetPageList() // 获取列表
     },
     },
     ToGetPageList () { // 获取列表
       this.GetActivityList({ queryData: { ...this.PageData, typeId: this.CurrentNavId } }).then((res) => { // 获取活动列表
-        this.HasNextPage = res.data.data.hasNextPage
+        this.PageList = [...this.ActivityList]
+        this.HasNextPage = res.data.data.current < res.data.data.pages
         this.DataLock = false
         this.IsRefreshing = false
       }).catch(() => {

src/pages/HuiShengHuo/PhotoList/index.vue

           </view>
         </view>
         <view class="List">
-          <view v-for="(item, index) in List" :key="index">
+          <view v-for="(item, index) in PageList" :key="index">
             <text>{{item.Month}}</text>
             <view>
               <view v-for="(subItem, subIndex) in item.List" :key="subIndex">
-                <navigator url="./PhotoDetail/index" hover-class="other-navigator-hover" class="Img"></navigator>
+                <view class="Img" @tap="CheckBigImg(subItem.imgUrl)">
+                  <image mode="aspectFill" class="centerLabel" :src="subItem.imgUrl"></image>
+                </view>
               </view>
             </view>
           </view>
       </view>
 
     </ScrollY>
+
+    <view class="BigImg" v-if="ShowBigImg" @tap="ShowBigImg = false">
+      <image mode="aspectFit" class="centerLabel" :src="BigImgUrl"></image>
+    </view>
   </view>
 </template>
 
 import ScrollY from '../../../components/ScrollY/index'
 import { createNamespacedHelpers } from 'vuex'
 const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
+const { mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
 export default {
   name: 'HuoDongZhaoPianQiang',
   data () {
     return {
+      ShowBigImg: false,
+      BigImgUrl: null,
+      PageList: [],
       PageData: {
         pageNum: 1,
         pageSize: 15
       },
       HasNextPage: true,
       IsRefreshing: false,
-      DataLock: false,
-      List: [
-        { Month: '8月份', List: ['', '', '', '', '', '', '', '', '', ''] },
-        { Month: '7月份', List: ['', '', '', '', '', '', '', '', '', ''] },
-        { Month: '6月份', List: ['', '', '', '', '', '', '', '', '', ''] },
-        { Month: '5月份', List: ['', '', '', '', '', '', '', '', '', ''] }
-      ]
+      DataLock: false
     }
   },
   computed: {
     ScrollY
   },
   created () {
-    this.Init() // 初始化
+    this.$authed(() => {
+      this.Init()
+    })
   },
   methods: {
+    ...mapUserActions([
+      'MainSignIn' // 获取用户信息
+    ]),
+    ...mapUserMutations([
+      'EditUserInfo' // 编辑用户信息
+    ]),
     ...mapIndexActions([
       'GetPhotoList' // 获取照片墙列表
     ]),
     Init () { // 初始化
       this.PageData.pageNum = 1
       this.HasNextPage = true
+      this.PageList = []
       this.EmptyPhotoList() // 清空照片墙列表
       this.ToGetPageList() // 获取列表
     },
+    CheckBigImg (url) { // 查看大图
+      this.BigImgUrl = url
+      this.ShowBigImg = true
+    },
     ToGetPageList () { // 获取列表
-      this.GetPhotoList({ queryData: { accountId: 5, ...this.PageData } }).then((res) => { // 获取照片墙列表
-        this.HasNextPage = res.data.data.hasNextPage
+      this.GetPhotoList({ queryData: { ...this.PageData } }).then((res) => { // 获取照片墙列表
+        let Arr = []
+        this.PhotoList.map((item) => {
+          let Year = new Date(item.createDate).getFullYear()
+          let Month = new Date(item.createDate).getMonth() + 1
+          Month = Month > 9 ? Month : `0${Month}`
+          if (Arr.length && `${Year}-${Month}` === Arr[Arr.length - 1].Month) {
+            Arr[Arr.length - 1].List.push({ ...item })
+          } else {
+            Arr.push({ Month: `${Year}-${Month}`, List: [{ ...item} ] })
+          }
+        })
+        this.PageList = Arr
+        this.HasNextPage = res.data.data.current < res.data.data.pages
         this.DataLock = false
         this.IsRefreshing = false
       }).catch(() => {

src/pages/HuiShengHuo/PhotoList/page.scss

   width: 100%;
   height: 100%;
   background: #fff;
+  >.BigImg {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    z-index: 100;
+    background: rgba(0, 0, 0, 0.7);
+    overflow: hidden;
+  }
   .PhotoList {
     > .flex-h {
       padding: 0 20px;

src/pages/HuiShengHuo/index.vue

 <template>
-  <view class="page HuiShengHuo">
-    <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh">
+  <BasicLayout>
+    <view class="page HuiShengHuo">
+      <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh">
 
-      <!-- banner -->
-      <view class="Banner">
-        <view>
-          <BannerSwiper :List="IndexBanner"></BannerSwiper>
+        <!-- banner -->
+        <view class="Banner">
+          <view>
+            <BannerSwiper :List="IndexBanner"></BannerSwiper>
+          </view>
         </view>
-      </view>
 
-      <!-- 活动照片墙 -->
-      <view class="PhotoList">
-        <view class="flex-h">
-          <view class="flex-item">
-            <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/huodongzhaopianqiang.png"></image>
+        <!-- 活动照片墙 -->
+        <view class="PhotoList">
+          <view class="flex-h">
+            <view class="flex-item">
+              <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/huodongzhaopianqiang.png"></image>
+            </view>
+            <navigator url="./PhotoList/index" hover-class="other-navigator-hover" class="More">更多 <text class="iconfont iconjiantouright"></text></navigator>
           </view>
-          <navigator url="./PhotoList/index" hover-class="other-navigator-hover" class="More">更多 <text class="iconfont iconjiantouright"></text></navigator>
-        </view>
-        <view class="ListContainer" v-if="PhotoList.length">
-          <scroll-view scroll-x="true">
-            <view class="List">
-              <view v-for="(item, index) in PhotoList" :key="index">
-                <view>
-                  <image mode="aspectFill" class="centerLabel" :src="ToolClass.DemoImg()"></image>
+          <view class="ListContainer" v-if="PhotoList.length">
+            <scroll-view scroll-x="true">
+              <view class="List">
+                <view v-for="(item, index) in PhotoList" :key="index">
+                  <view @tap="CheckBigImg(item.imgUrl)">
+                    <image mode="aspectFill" class="centerLabel" :src="item.imgUrl"></image>
+                  </view>
                 </view>
               </view>
-            </view>
-          </scroll-view>
-        </view>
-      </view>
-
-      <!-- 精彩活动 -->
-      <view class="ActivityList">
-        <view class="flex-h">
-          <view class="flex-item">
-            <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/jingcaihuodong.png"></image>
+            </scroll-view>
           </view>
-          <navigator url="./ActivityList/index" hover-class="other-navigator-hover" class="More">更多 <text class="iconfont iconjiantouright"></text></navigator>
         </view>
-        <view class="List" v-if="ActivityList.length">
-          <view class="Item" v-for="(item, index) in ActivityList" :key="index">
-            <view class="Img">
-              <image mode="aspectFill" class="centerLabel" :src="ToolClass.DemoImg()"></image>
+
+        <!-- 精彩活动 -->
+        <view class="ActivityList">
+          <view class="flex-h">
+            <view class="flex-item">
+              <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/jingcaihuodong.png"></image>
             </view>
-            <view class="Info">
-              <text>活动名称</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="./ActivityList/index" hover-class="other-navigator-hover" class="More">更多 <text class="iconfont iconjiantouright"></text></navigator>
+          </view>
+          <view class="List" v-if="ActivityList.length">
+            <view class="Item" v-for="(item, index) in ActivityList" :key="index">
+              <navigator class="Img" :url="`./ActivityList/ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover">
+                <image mode="aspectFill" class="centerLabel" :src="item.thumb"></image>
+              </navigator>
+              <view class="Info">
+                <text>{{item.name}}</text>
+                <view class="flex-h">
+                  <text class="flex-item">参与截止时间：{{ToolClass.DateFormat(new Date(item.enrollEnd).getTime())}}</text>
+                  <navigator :url="`./ActivityList/ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Btn" v-if="item.isEnroll">立即报名</navigator>
+                  <navigator :url="`./ActivityList/ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Btn" v-if="item.isVote">立即投票</navigator>
+                  <view v-if="new Date(item.endDate).getTime() <= Date.now()">已结束</view>
+                </view>
               </view>
             </view>
+            <view style="width: 100%; height: 10px;"></view>
           </view>
         </view>
-      </view>
 
-    </ScrollY>
-  </view>
+      </ScrollY>
+
+      <view class="BigImg" v-if="ShowBigImg" @tap="ShowBigImg = false">
+        <image mode="aspectFit" class="centerLabel" :src="BigImgUrl"></image>
+      </view>
+    </view>
+  </BasicLayout>
 </template>
 
 <script>
 import BannerSwiper from '../../components/BannerSwiper/index'
 import { createNamespacedHelpers } from 'vuex'
 const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
+const { mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
 export default {
   name: 'HuiShengHuo',
   data () {
     return {
+      ShowBigImg: false,
+      BigImgUrl: null,
+      PageActivityList: [],
+      PagePhotoList: [],
       RequestNum: 0,
       IsRefreshing: false,
       DataLock: false
     BannerSwiper
   },
   created () {
-    this.Init()
+    this.$authed(() => {
+      this.Init()
+    })
   },
   methods: {
+    ...mapUserActions([
+      'MainSignIn' // 获取用户信息
+    ]),
+    ...mapUserMutations([
+      'EditUserInfo' // 编辑用户信息
+    ]),
     ...mapIndexActions([
       'GetIndexBanner', // 获取首页banner
       'GetPhotoList', // 获取照片墙列表
       this.EmptyIndexBanner() // 清空首页banner
       this.EmptyPhotoList() // 清空照片墙列表
       this.EmptyActivityList() // 清空活动列表
+      this.PageActivityList = []
+      this.PagePhotoList = []
       this.GetIndexBanner({ queryData: { pageNum: 1, pageSize: 10, position: 'life' } }).then(() => { // 获取首页banner
-        this.CheckRequestNum(2) // 判断请求接口个数
+        this.CheckRequestNum(3) // 判断请求接口个数
       }).catch(() => {
-        this.CheckRequestNum(2) // 判断请求接口个数
+        this.CheckRequestNum(3) // 判断请求接口个数
       })
-      // this.GetPhotoList({ queryData: { pageNum: 1, pageSize: 10, typeId: 2 } }).then(() => { // 获取照片墙列表
-      //   this.CheckRequestNum(2) // 判断请求接口个数
-      // }).catch(() => {
-      //   this.CheckRequestNum(2) // 判断请求接口个数
-      // })
-      this.GetActivityList({ queryData: { pageNum: 1, pageSize: 10, typeId: 1 } }).then(() => { // 获取活动列表
-        this.CheckRequestNum(2) // 判断请求接口个数
+      this.GetPhotoList({ queryData: { pageNum: 1, pageSize: 10 } }).then(() => { // 获取照片墙列表
+        this.CheckRequestNum(3) // 判断请求接口个数
       }).catch(() => {
-        this.CheckRequestNum(2) // 判断请求接口个数
+        this.CheckRequestNum(3) // 判断请求接口个数
       })
+      this.GetActivityList({ queryData: { pageNum: 1, pageSize: 10, typeId: 2 } }).then(() => { // 获取活动列表
+        this.PageActivityList = [...this.ActivityList]
+        this.CheckRequestNum(3) // 判断请求接口个数
+      }).catch(() => {
+        this.CheckRequestNum(3) // 判断请求接口个数
+      })
+    },
+    CheckBigImg (url) { // 查看大图
+      this.BigImgUrl = url
+      this.ShowBigImg = true
     },
     CheckRequestNum (num) { // 判断请求接口个数
       this.RequestNum += 1

src/pages/HuiShengHuo/page.scss

 .page.HuiShengHuo {
   width: 100%;
   height: 100%;
+  position: relative;
+  >.BigImg {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    z-index: 100;
+    background: rgba(0, 0, 0, 0.7);
+    overflow: hidden;
+  }
   .Banner {
     width: 100%;
     padding-bottom: 38%;

src/pages/WoDe/MyActivityList/index.vue

     },
     ToGetPageList () { // 获取列表
       this.GetUserActivityList({ queryData: { accountId: 5, ...this.PageData } }).then((res) => { // 获取我的活动列表
-        this.HasNextPage = res.data.data.hasNextPage
+        this.HasNextPage = res.data.data.current < res.data.data.pages
         this.DataLock = false
         this.IsRefreshing = false
       }).catch(() => {

src/pages/WoDe/index.vue

           <view class="flex-item">
             <navigator url="../SignIn/index" hover-class="other-navigator-hover" class="SiginIn" v-if="UserInfo === null || UserInfo.Phone === undefined || UserInfo.Phone === null">立即登录</navigator>
             <text v-else>{{UserInfo.Name}}</text>
-            <text v-else>{{UserInfo.Phone}}</text>
+            <text  v-if="!(UserInfo === null || UserInfo.Phone === undefined || UserInfo.Phone === null)">{{UserInfo.Phone}}</text>
           </view>
         </view>
       </view>
         <text class="flex-item">我的报名</text>
         <text class="iconfont iconjiantouright"></text>
       </navigator>
-      <navigator url="./Feedback/index" hover-class="other-navigator-hover" class="flex-h">
+      <!-- <navigator url="./Feedback/index" hover-class="other-navigator-hover" class="flex-h">
         <view>
           <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/wodeicon2.png"></image>
         </view>
         <text class="flex-item">意见反馈</text>
         <text class="iconfont iconjiantouright"></text>
-      </navigator>
+      </navigator> -->
     </view>
 
     <!-- 授权头像获取弹窗 -->
     GetUserIcon
   },
   created () {
-    this.Init() // 初始化
+    this.$authed(() => {
+      this.Init()
+    })
   },
   methods: {
     ...mapUserActions([
-      ''
+      'MainSignIn' // 获取用户信息
     ]),
     ...mapUserMutations([
-      ''
+      'EditUserInfo' // 编辑用户信息
     ]),
     Init () { // 初始化
     }

src/store/index.js

 import Vue from 'vue'
 import Vuex from 'vuex'
+import { storeAuthPlugin } from '@/util/auth-plugin'
+
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
+  plugins: [storeAuthPlugin],
   state: {
   },
   mutations: {

src/store/index/index.js

     }
   },
   actions: {
+    GetNewsDetail (context, payload) { // 获取资讯详情
+      return new Promise((resolve, reject) => {
+        ToolClass.WxRequest({
+          url: Api.GetNewsDetail.url,
+          method: Api.GetNewsDetail.method,
+          ...payload,
+          success (res) {
+            resolve(res)
+          },
+          error (res) {
+            reject(res)
+          }
+        })
+      })
+    },
     GetUserActivityList (context, payload) { // 获取我的活动列表
       return new Promise((resolve, reject) => {
         ToolClass.WxRequest({
           method: Api.GetUserActivityList.method,
           ...payload,
           success (res) {
-            context.commit('UpdateUserActivityList', res.data.data.list)
+            context.commit('UpdateUserActivityList', res.data.data.records)
             resolve(res)
           },
           error (res) {
           method: Api.GetHuoDongNavList.method,
           ...payload,
           success (res) {
-            context.commit('UpdateHuoDongNavList', res.data.data.list)
+            context.commit('UpdateHuoDongNavList', res.data.data.records)
             resolve(res)
           },
           error (res) {
           method: Api.GetZhengNengLiangShiJiList.method,
           ...payload,
           success (res) {
-            context.commit('UpdateZhengNengLiangShiJiList', res.data.data.list)
+            context.commit('UpdateZhengNengLiangShiJiList', res.data.data.records)
             resolve(res)
           },
           error (res) {
           method: Api.GetMingXingYeZhuList.method,
           ...payload,
           success (res) {
-            context.commit('UpdateMingXingYeZhuList', res.data.data.list)
+            context.commit('UpdateMingXingYeZhuList', res.data.data.records)
             resolve(res)
           },
           error (res) {
           method: Api.GetHuiAiXinBanner.method,
           ...payload,
           success (res) {
-            context.commit('UpdateHuiAiXinBanner', res.data.data.list)
+            context.commit('UpdateHuiAiXinBanner', res.data.data.records)
             resolve(res)
           },
           error (res) {
           method: Api.GetYeZhuZiXunList.method,
           ...payload,
           success (res) {
-            context.commit('UpdateYeZhuZiXunList', res.data.data.list)
+            context.commit('UpdateYeZhuZiXunList', res.data.data.records)
             resolve(res)
           },
           error (res) {
           method: Api.GetHuiQuanYiBanner.method,
           ...payload,
           success (res) {
-            context.commit('UpdateQuanYiBanner', res.data.data.list)
+            context.commit('UpdateQuanYiBanner', res.data.data.records)
             resolve(res)
           },
           error (res) {
           method: Api.GetIndexBanner.method,
           ...payload,
           success (res) {
-            context.commit('UpdateIndexBanner', res.data.data.list)
+            context.commit('UpdateIndexBanner', res.data.data.records)
             resolve(res)
           },
           error (res) {
           method: Api.GetPhotoList.method,
           ...payload,
           success (res) {
-            context.commit('UpdatePhotoList', res.data.data.list)
+            context.commit('UpdatePhotoList', res.data.data.records)
             resolve(res)
           },
           error (res) {
     GetActivityList (context, payload) { // 获取活动列表
       return new Promise((resolve, reject) => {
         ToolClass.WxRequest({
-          url: Api.GetPhotoList.url,
-          method: Api.GetPhotoList.method,
+          url: Api.GetActivityList.url,
+          method: Api.GetActivityList.method,
           ...payload,
           success (res) {
-            context.commit('UpdateActivityList', res.data.data.list)
+            context.commit('UpdateActivityList', res.data.data.records)
             resolve(res)
           },
           error (res) {

src/store/user/index.js

     }
   },
   actions: {
+    PostActivityJoin (context, payload) { // 活动报名
+      payload = { ...payload, IsSigIn: true }
+      return new Promise((resolve, reject) => {
+        ToolClass.WxRequest({
+          url: Api.PostActivityJoin.url,
+          method: Api.PostActivityJoin.method,
+          ...payload,
+          success (res) {
+            resolve(res)
+          },
+          error (res) {
+            reject(res)
+          }
+        })
+      })
+    },
+    PostActivityVote (context, payload) { // 活动投票
+      payload = { ...payload, IsSigIn: true }
+      return new Promise((resolve, reject) => {
+        ToolClass.WxRequest({
+          url: Api.PostActivityVote.url,
+          method: Api.PostActivityVote.method,
+          ...payload,
+          success (res) {
+            resolve(res)
+          },
+          error (res) {
+            reject(res)
+          }
+        })
+      })
+    },
     GetUserPhone (context, payload) { // 获取用户手机号
       payload = { ...payload, IsSigIn: true }
       return new Promise((resolve, reject) => {

src/util/Api/index.js

 const prefix = process.env.NODE_ENV === 'production' ? '' : ''
 
 const Api = {
+  GetNewsDetail: { // 获取资讯详情
+    method: 'get',
+    url: `${prefix}/news/:id`
+  },
+  PostActivityJoin: { // 活动报名
+    method: 'post',
+    url: `${prefix}/activity/:id/enroll`
+  },
+  PostActivityVote: { // 活动投票
+    method: 'post',
+    url: `${prefix}/activity/:id/vote`
+  },
   MainSignIn: { // 登录
     method: 'post',
     url: `${prefix}/login`
   },
   GetPhotoList: { // 获取照片墙列表
     method: 'get',
-    url: `${prefix}/activity`
+    url: `${prefix}/gallery`
   },
   GetActivityList: { // 获取活动列表
     method: 'get',

src/util/PublicMethod/index.js

   DemoImg () {
     return 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1597250549302&di=7483208ccacdeb49188263423a9c8316&imgtype=0&src=http%3A%2F%2Ft9.baidu.com%2Fit%2Fu%3D3363001160%2C1163944807%26fm%3D79%26app%3D86%26f%3DJPEG%3Fw%3D1280%26h%3D830'
   },
+  DateFormat (timestamp) { // 格式化时间
+    if (timestamp) {
+      let YY = new Date(timestamp).getFullYear()
+      let MM = new Date(timestamp).getMonth() + 1
+      let DD = new Date(timestamp).getDate()
+      let hh = new Date(timestamp).getHours()
+      let mm = new Date(timestamp).getMinutes()
+      return `${YY}-${MM > 9 ? MM : '0' + MM}-${DD > 9 ? DD : '0' + DD} ${hh > 9 ? hh : '0' + hh}:${mm > 9 ? mm : '0' + mm}`
+    }
+  },
   ReplaceURLParams (url, params) {
     const args = { ...(params || {}), org: 'MQ' }
     return Object.keys(args).reduce((acc, k) => { // 此方法对每个元素进行处理
     }
     let Header = {}
     if (wx.getStorageSync('token') !== '') { // 本地获取token
-      Header['X-Authorization-JWT'] = wx.getStorageSync('token')
+      Header['X-Authorization-Jwt'] = wx.getStorageSync('token')
     }
     wx.request({
-      url: `https://dev.fangdeal.cn/liyuanhui/wx${config.url}`,
+      url: `${SERVER_API}${config.url}`,
       method: config.method,
       ...(config.data || {}),
       header: { ...Header },
       success: (res) => {
-        if (res.header['X-Authorization-JWT'] !== undefined) { // 更新本地存储token
-          wx.setStorageSync('token', res.header['X-Authorization-JWT'])
+        const token = res.header['X-Authorization-Jwt'] || res.header['X-Authorization-JWT']
+        if (token) { // 更新本地存储token
+          wx.setStorageSync('token', token)
         }
         if (res.data.code - 0 === 1001) { // token失效
-          wx.login({ // 微信获取code
-            success (subRes) {
-              wx.request({ // 登录获取token
-                url: `https://dev.fangdeal.cn/liyuanhui/wx/login?code=${subRes.code}`,
-                method: `post`,
-                success: (cRes) => {
-                  if (cRes.header['X-Authorization-JWT'] !== undefined) { // 更新本地存储token
-                    wx.setStorageSync('token', cRes.header['X-Authorization-JWT'])
-                    _that.WxRequest(config) // 获得token之后重新请求接口
-                  }
-                }
-              })
-            }
-          })
+          // wx.login({ // 微信获取code
+          //   success (subRes) {
+          //     wx.request({ // 登录获取token
+          //       url: `${SERVER_API}/login?code=${subRes.code}`,
+          //       method: `post`,
+          //       success: (cRes) => {
+          //         const token = cRes.header['X-Authorization-Jwt'] || cRes.header['X-Authorization-JWT']
+          //         if (token) { // 更新本地存储token
+          //           wx.setStorageSync('token', token)
+          //           _that.WxRequest(config) // 获得token之后重新请求接口
+          //         }
+          //       }
+          //     })
+          //   }
+          // })
         }
         if (config.success !== undefined && res.data.code - 0 === 1000) {
           config.success(res)
         }
         if (config.error !== undefined && res.data.code - 0 !== 1000) {
           config.error(res)
+          wx.showToast({
+            title: res.data.message,
+            icon: 'none',
+            duration: 2000
+          })
         }
       },
       fail: (res) => {
-        if (res.header['X-Authorization-JWT'] !== undefined) { // 更新本地存储token
-          wx.setStorageSync('token', res.header['X-Authorization-JWT'])
+        if (res.header['X-Authorization-Jwt'] !== undefined) { // 更新本地存储token
+          wx.setStorageSync('token', res.header['X-Authorization-Jwt'])
         }
         if (res.data.code - 0 === 1001) { // token失效
           wx.navigateTo({ url: '../../pages/SignIn/index' })

src/util/auth-plugin.js

+import observe from './observe'
+
+const monitor = observe()
+
+// 只执行一次
+let done = false
+
+// VUEX 插件
+export function storeAuthPlugin(store) {
+  store.subscribe((mutation, state) => {
+    if (!done && mutation.type === 'user/EditUserInfo') {
+      monitor.notify()
+      done = true
+    }
+  })
+}
+
+// VUE 插件
+export function vueAuthPlugin(Vue, options) {
+  // 添加实例 $authed 方法
+  Vue.prototype.$authed = function(next) {
+    if (done) {
+      next()
+    } else {
+      monitor.subscribe(next)
+    }
+  }
+}

src/util/observe.js

+
+export default function observe() {
+  const listeners = []
+
+  function notify(...args) {
+    listeners.forEach(listener => listener(...args))
+  }
+
+  function subscribe (listener) {
+    listeners.push(listener)
+
+    return function unsubscribe() {
+      const index = listeners.indexOf(listener)
+      listeners.splice(index, 1)
+    }
+  }
+
+  return {
+    notify,
+    subscribe
+  }
+}