列表渲染

src/components/BannerSwiper/index.vue

@@ -4,7 +4,7 @@
       <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"></image>
           </view>
         </swiper-item>
       </block>

src/pages/HuiAiXin/EnergyStory/index.vue

@@ -9,16 +9,16 @@
         </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="`./StarOwnerDetail/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>
@@ -33,10 +33,12 @@
 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
@@ -55,9 +57,28 @@ export default {
     ScrollY
   },
   created () {
-    this.Init()
+    let _that = this
+    wx.login({
+      success (res) {
+        _that.MainSignIn({ queryData: { code: res.code } }).then((res) => { // 获取用户信息
+          _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
+          _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
+          _that.EditUserInfo({ name: 'SessionKey', value: res.data.data.extraInfo.sessionKey })
+          if (res.data.data.person.phone !== undefined && res.data.data.person.phone !== null) {
+            _that.EditUserInfo({ name: 'Phone', value: res.data.data.person.phone })
+          }
+          _that.Init()
+        })
+      }
+    })
   },
   methods: {
+    ...mapUserActions([
+      'MainSignIn' // 获取用户信息
+    ]),
+    ...mapUserMutations([
+      'EditUserInfo' // 编辑用户信息
+    ]),
     ...mapIndexActions([
       'GetZhengNengLiangShiJiList' // 获取正能量事迹列表
     ]),
@@ -68,11 +89,13 @@ export default {
       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

@@ -9,12 +9,12 @@
         </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="`./StarOwnerDetail/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>
 
@@ -27,10 +27,12 @@
 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
@@ -49,9 +51,28 @@ export default {
     ScrollY
   },
   created () {
-    this.Init() // 初始化
+    let _that = this
+    wx.login({
+      success (res) {
+        _that.MainSignIn({ queryData: { code: res.code } }).then((res) => { // 获取用户信息
+          _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
+          _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
+          _that.EditUserInfo({ name: 'SessionKey', value: res.data.data.extraInfo.sessionKey })
+          if (res.data.data.person.phone !== undefined && res.data.data.person.phone !== null) {
+            _that.EditUserInfo({ name: 'Phone', value: res.data.data.person.phone })
+          }
+          _that.Init()
+        })
+      }
+    })
   },
   methods: {
+    ...mapUserActions([
+      'MainSignIn' // 获取用户信息
+    ]),
+    ...mapUserMutations([
+      'EditUserInfo' // 编辑用户信息
+    ]),
     ...mapIndexActions([
       'GetMingXingYeZhuList' // 获取明星业主列表
     ]),
@@ -62,11 +83,13 @@ export default {
       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

@@ -17,14 +17,14 @@
           </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="`./StarOwner/StarOwnerDetail/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>
@@ -40,16 +40,16 @@
           </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="./EnergyStory/EnergyStoryDetail/index" 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>
@@ -65,10 +65,13 @@ import ScrollY from '../../components/ScrollY/index'
 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
@@ -86,9 +89,28 @@ export default {
     BannerSwiper
   },
   created () {
-    this.Init()
+    let _that = this
+    wx.login({
+      success (res) {
+        _that.MainSignIn({ queryData: { code: res.code } }).then((res) => { // 获取用户信息
+          _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
+          _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
+          _that.EditUserInfo({ name: 'SessionKey', value: res.data.data.extraInfo.sessionKey })
+          if (res.data.data.person.phone !== undefined && res.data.data.person.phone !== null) {
+            _that.EditUserInfo({ name: 'Phone', value: res.data.data.person.phone })
+          }
+          _that.Init()
+        })
+      }
+    })
   },
   methods: {
+    ...mapUserActions([
+      'MainSignIn' // 获取用户信息
+    ]),
+    ...mapUserMutations([
+      'EditUserInfo' // 编辑用户信息
+    ]),
     ...mapIndexActions([
       'GetHuiAiXinBanner', // 获取荟爱心banner
       'GetMingXingYeZhuList', // 获取明星业主列表
@@ -104,17 +126,21 @@ export default {
       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/index.vue

@@ -9,11 +9,11 @@
         </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>
@@ -28,10 +28,12 @@
 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
@@ -50,9 +52,28 @@ export default {
     ScrollY
   },
   created () {
-    this.Init() // 初始化
+    let _that = this
+    wx.login({
+      success (res) {
+        _that.MainSignIn({ queryData: { code: res.code } }).then((res) => { // 获取用户信息
+          _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
+          _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
+          _that.EditUserInfo({ name: 'SessionKey', value: res.data.data.extraInfo.sessionKey })
+          if (res.data.data.person.phone !== undefined && res.data.data.person.phone !== null) {
+            _that.EditUserInfo({ name: 'Phone', value: res.data.data.person.phone })
+          }
+          _that.Init()
+        })
+      }
+    })
   },
   methods: {
+    ...mapUserActions([
+      'MainSignIn' // 获取用户信息
+    ]),
+    ...mapUserMutations([
+      'EditUserInfo' // 编辑用户信息
+    ]),
     ...mapIndexActions([
       'GetYeZhuZiXunList' // 获取资讯列表
     ]),
@@ -62,12 +83,14 @@ export default {
     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

@@ -17,12 +17,12 @@
           </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>
@@ -37,10 +37,12 @@ import ScrollY from '../../components/ScrollY/index'
 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
@@ -57,9 +59,28 @@ export default {
     BannerSwiper
   },
   created () {
-    this.Init()
+    let _that = this
+    wx.login({
+      success (res) {
+        _that.MainSignIn({ queryData: { code: res.code } }).then((res) => { // 获取用户信息
+          _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
+          _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
+          _that.EditUserInfo({ name: 'SessionKey', value: res.data.data.extraInfo.sessionKey })
+          if (res.data.data.person.phone !== undefined && res.data.data.person.phone !== null) {
+            _that.EditUserInfo({ name: 'Phone', value: res.data.data.person.phone })
+          }
+          _that.Init()
+        })
+      }
+    })
   },
   methods: {
+    ...mapUserActions([
+      'MainSignIn' // 获取用户信息
+    ]),
+    ...mapUserMutations([
+      'EditUserInfo' // 编辑用户信息
+    ]),
     ...mapIndexActions([
       'GetHuiQuanYiBanner', // 获取荟权益banner
       'GetYeZhuZiXunList' // 获取业主资讯列表
@@ -70,6 +91,7 @@ export default {
     ]),
     Init () {
       this.RequestNum = 0
+      this.PageList = []
       this.EmptyQuanYiBanner() // 清空荟权益banner
       this.EmptyYeZhuZiXunList() // 清空业主资讯列表
       this.GetHuiQuanYiBanner({ queryData: { pageNum: 1, pageSize: 10, position: 'rights' } }).then(() => { // 获取荟权益banner
@@ -78,6 +100,7 @@ export default {
         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

@@ -6,44 +6,94 @@
       <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
+    let _that = this
+    wx.login({
+      success (res) {
+        _that.MainSignIn({ queryData: { code: res.code } }).then((res) => { // 获取用户信息
+          _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
+          _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
+          _that.EditUserInfo({ name: 'SessionKey', value: res.data.data.extraInfo.sessionKey })
+          if (res.data.data.person.phone !== undefined && res.data.data.person.phone !== null) {
+            _that.EditUserInfo({ name: 'Phone', value: res.data.data.person.phone })
+          }
+          _that.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

@@ -2,57 +2,47 @@
   <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>
@@ -66,39 +56,30 @@
       <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: {
@@ -109,14 +90,88 @@ export default {
   components: {
   },
   created () {
-    this.Init()
+    wx.showShareMenu({
+      withShareTicket: true,
+      menus: ['shareAppMessage', 'shareTimeline']
+    })
+    this.CurrnetId = getCurrentInstance().router.params.id
+    let _that = this
+    wx.login({
+      success (res) {
+        _that.MainSignIn({ queryData: { code: res.code } }).then((res) => { // 获取用户信息
+          _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
+          _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
+          _that.EditUserInfo({ name: 'SessionKey', value: res.data.data.extraInfo.sessionKey })
+          if (res.data.data.person.phone !== undefined && res.data.data.person.phone !== null) {
+            _that.EditUserInfo({ name: 'Phone', value: res.data.data.person.phone })
+          }
+          _that.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
+        })
+      })
+    },
+    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

@@ -97,34 +97,26 @@
         }
         > .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;
-                }
               }
             }
           }
@@ -141,12 +133,20 @@
           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 {
@@ -161,5 +161,14 @@
     > image {
       height: 90px;
     }
+    > .GetPhoneBottomBtn {
+      height: 90px;
+      width: 380px;
+      display: block;
+      position: absolute;
+      right: 0;
+      top: 0;
+      opacity: 0;
+    }
   }
 }

src/pages/HuiShengHuo/ActivityList/index.vue

@@ -17,21 +17,21 @@
 
         <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>
 
@@ -44,6 +44,7 @@
 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 () {
@@ -52,6 +53,7 @@ export default {
         pageNum: 1,
         pageSize: 15
       },
+      PageList: [],
       HuoDongNavList: [
         { Name: '暖场活动', Id: '1' },
         { Name: '六点半学堂', Id: '2' },
@@ -75,9 +77,28 @@ export default {
     ScrollY
   },
   created () {
-    this.Init() // 初始化
+    let _that = this
+    wx.login({
+      success (res) {
+        _that.MainSignIn({ queryData: { code: res.code } }).then((res) => { // 获取用户信息
+          _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
+          _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
+          _that.EditUserInfo({ name: 'SessionKey', value: res.data.data.extraInfo.sessionKey })
+          if (res.data.data.person.phone !== undefined && res.data.data.person.phone !== null) {
+            _that.EditUserInfo({ name: 'Phone', value: res.data.data.person.phone })
+          }
+          _that.Init()
+        })
+      }
+    })
   },
   methods: {
+    ...mapUserActions([
+      'MainSignIn' // 获取用户信息
+    ]),
+    ...mapUserMutations([
+      'EditUserInfo' // 编辑用户信息
+    ]),
     ...mapIndexActions([
       'GetActivityList' // 获取活动列表
     ]),
@@ -87,6 +108,7 @@ export default {
     Init () { // 初始化
       this.PageData.pageNum = 1
       this.HasNextPage = true
+      this.PageList = []
       this.EmptyActivityList() // 清空活动列表
       this.ToGetPageList() // 获取列表
     },
@@ -110,7 +132,8 @@ export default {
     },
     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

@@ -10,7 +10,7 @@
           </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">
@@ -29,10 +29,12 @@
 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 {
+      PageList: [],
       PageData: {
         pageNum: 1,
         pageSize: 15
@@ -57,9 +59,28 @@ export default {
     ScrollY
   },
   created () {
-    this.Init() // 初始化
+    let _that = this
+    wx.login({
+      success (res) {
+        _that.MainSignIn({ queryData: { code: res.code } }).then((res) => { // 获取用户信息
+          _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
+          _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
+          _that.EditUserInfo({ name: 'SessionKey', value: res.data.data.extraInfo.sessionKey })
+          if (res.data.data.person.phone !== undefined && res.data.data.person.phone !== null) {
+            _that.EditUserInfo({ name: 'Phone', value: res.data.data.person.phone })
+          }
+          _that.Init()
+        })
+      }
+    })
   },
   methods: {
+    ...mapUserActions([
+      'MainSignIn' // 获取用户信息
+    ]),
+    ...mapUserMutations([
+      'EditUserInfo' // 编辑用户信息
+    ]),
     ...mapIndexActions([
       'GetPhotoList' // 获取照片墙列表
     ]),
@@ -69,12 +90,14 @@ export default {
     Init () { // 初始化
       this.PageData.pageNum = 1
       this.HasNextPage = true
+      this.PageList = []
       this.EmptyPhotoList() // 清空照片墙列表
       this.ToGetPageList() // 获取列表
     },
     ToGetPageList () { // 获取列表
-      this.GetPhotoList({ queryData: { accountId: 5, ...this.PageData } }).then((res) => { // 获取照片墙列表
-        this.HasNextPage = res.data.data.hasNextPage
+      this.GetPhotoList({ queryData: { ...this.PageData } }).then((res) => { // 获取照片墙列表
+        this.PageList = [...this.PhotoList]
+        this.HasNextPage = res.data.data.current < res.data.data.pages
         this.DataLock = false
         this.IsRefreshing = false
       }).catch(() => {

src/pages/HuiShengHuo/index.vue

@@ -40,19 +40,20 @@
         </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>
+            <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>活动名称</text>
+              <text>{{item.name}}</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>
+                <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>
 
@@ -65,10 +66,13 @@ import ScrollY from '../../components/ScrollY/index'
 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 {
+      PageActivityList: [],
+      PagePhotoList: [],
       RequestNum: 0,
       IsRefreshing: false,
       DataLock: false
@@ -79,16 +83,35 @@ export default {
       IndexBanner: x => x.IndexBanner, // 首页banner
       PhotoList: x => x.PhotoList, // 照片墙列表
       ActivityList: x => x.ActivityList // 活动列表
-    })
+    }),
   },
   components: {
     ScrollY,
     BannerSwiper
   },
   created () {
-    this.Init()
+    let _that = this
+    wx.login({
+      success (res) {
+        _that.MainSignIn({ queryData: { code: res.code } }).then((res) => { // 获取用户信息
+          _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
+          _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
+          _that.EditUserInfo({ name: 'SessionKey', value: res.data.data.extraInfo.sessionKey })
+          if (res.data.data.person.phone !== undefined && res.data.data.person.phone !== null) {
+            _that.EditUserInfo({ name: 'Phone', value: res.data.data.person.phone })
+          }
+          _that.Init()
+        })
+      }
+    })
   },
   methods: {
+    ...mapUserActions([
+      'MainSignIn' // 获取用户信息
+    ]),
+    ...mapUserMutations([
+      'EditUserInfo' // 编辑用户信息
+    ]),
     ...mapIndexActions([
       'GetIndexBanner', // 获取首页banner
       'GetPhotoList', // 获取照片墙列表
@@ -104,6 +127,8 @@ export default {
       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) // 判断请求接口个数
       }).catch(() => {
@@ -114,7 +139,8 @@ export default {
       // }).catch(() => {
       //   this.CheckRequestNum(2) // 判断请求接口个数
       // })
-      this.GetActivityList({ queryData: { pageNum: 1, pageSize: 10, typeId: 1 } }).then(() => { // 获取活动列表
+      this.GetActivityList({ queryData: { pageNum: 1, pageSize: 10, typeId: 2 } }).then(() => { // 获取活动列表
+        this.PageActivityList = [...this.ActivityList]
         this.CheckRequestNum(2) // 判断请求接口个数
       }).catch(() => {
         this.CheckRequestNum(2) // 判断请求接口个数

src/pages/WoDe/MyActivityList/index.vue

@@ -72,7 +72,7 @@ export default {
     },
     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

@@ -62,14 +62,27 @@ export default {
     GetUserIcon
   },
   created () {
-    this.Init() // 初始化
+    let _that = this
+    wx.login({
+      success (res) {
+        _that.MainSignIn({ queryData: { code: res.code } }).then((res) => { // 获取用户信息
+          _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
+          _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
+          _that.EditUserInfo({ name: 'SessionKey', value: res.data.data.extraInfo.sessionKey })
+          if (res.data.data.person.phone !== undefined && res.data.data.person.phone !== null) {
+            _that.EditUserInfo({ name: 'Phone', value: res.data.data.person.phone })
+          }
+          _that.Init()
+        })
+      }
+    })
   },
   methods: {
     ...mapUserActions([
-      ''
+      'MainSignIn' // 获取用户信息
     ]),
     ...mapUserMutations([
-      ''
+      'EditUserInfo' // 编辑用户信息
     ]),
     Init () { // 初始化
     }

src/store/index/index.js

@@ -86,7 +86,7 @@ export default {
           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) {
@@ -102,7 +102,7 @@ export default {
           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) {
@@ -118,7 +118,7 @@ export default {
           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) {
@@ -134,7 +134,7 @@ export default {
           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) {
@@ -150,7 +150,7 @@ export default {
           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) {
@@ -166,7 +166,7 @@ export default {
           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) {
@@ -182,7 +182,7 @@ export default {
           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) {
@@ -198,7 +198,7 @@ export default {
           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) {
@@ -214,7 +214,7 @@ export default {
           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) {
@@ -245,7 +245,7 @@ export default {
           method: Api.GetPhotoList.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

@@ -17,6 +17,38 @@ export default {
     }
   },
   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

@@ -2,6 +2,14 @@
 const prefix = process.env.NODE_ENV === 'production' ? '' : ''
 
 const Api = {
+  PostActivityJoin: { // 活动报名
+    method: 'post',
+    url: `${prefix}/activity/:id/enroll`
+  },
+  PostActivityVote: { // 活动投票
+    method: 'post',
+    url: `${prefix}/activity/:id/vote`
+  },
   MainSignIn: { // 登录
     method: 'post',
     url: `${prefix}/login`

src/util/PublicMethod/index.js

@@ -3,6 +3,16 @@ const ToolClass = {
   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) => { // 此方法对每个元素进行处理
@@ -26,7 +36,7 @@ const ToolClass = {
     }
     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}`,
@@ -34,8 +44,8 @@ const ToolClass = {
       ...(config.data || {}),
       header: { ...Header },
       success: (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.login({ // 微信获取code
@@ -44,8 +54,8 @@ const ToolClass = {
                 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'])
+                  if (cRes.header['X-Authorization-Jwt'] !== undefined) { // 更新本地存储token
+                    wx.setStorageSync('token', cRes.header['X-Authorization-Jwt'])
                     _that.WxRequest(config) // 获得token之后重新请求接口
                   }
                 }
@@ -58,11 +68,16 @@ const ToolClass = {
         }
         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' })