报名

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

@@ -32,6 +32,7 @@
 import { getCurrentInstance } from '@tarojs/taro'
 import { createNamespacedHelpers } from 'vuex'
 const { mapState: mapUserState, mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
+const { mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
 export default {
   name: 'LiJiBaoMing',
   data () {
@@ -67,6 +68,9 @@ export default {
     ...mapUserMutations([
       'EditUserInfo' // 编辑用户信息
     ]),
+    ...mapIndexMutations([
+      'EditActivityDetail'
+    ]),
     Init () {
     },
     ToJoin () { // 去报名
@@ -77,6 +81,7 @@ export default {
         data: { data: { enrollName: this.Name, enrollPhone: this.Phone, enrollNum: this.Num } }
       }).then((res) => {
         this.DataLock = false
+        this.EditActivityDetail({ name: 'status', value: 1 })
         wx.showToast({
           title: '报名成功',
           icon: 'none',

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

@@ -2,32 +2,32 @@
   <view class="page HuoDongXiangQing flex-v">
 
     <view class="flex-item">
-      <view v-if="ActivityInfo !== null">
+      <view v-if="ActivityDetail !== null">
 
         <!-- 活动主要信息 -->
         <view class="MainInfo">
-          <text>{{ActivityInfo.name}}</text>
+          <text>{{ActivityDetail.name}}</text>
           <view class="SubInfo flex-h">
             <view class="flex-item">
               <text class="iconfont iconxianshi"></text>
-              <text>{{ActivityInfo.pv || ''}}</text>
+              <text>{{ActivityDetail.pv || ''}}</text>
             </view>
             <view class="Time">
               <text class="iconfont iconshijian"></text>
-              <text>{{ToolClass.DateFormat(new Date(ActivityInfo.createDate).getTime())}}</text>
+              <text>{{ToolClass.DateFormat(new Date(ActivityDetail.createDate).getTime())}}</text>
             </view>
           </view>
           <view class="Line flex-h">
             <text>活动时间：</text>
-            <text class="flex-item">{{ToolClass.DateFormat(new Date(ActivityInfo.startDate).getTime())}} 至 {{ToolClass.DateFormat(new Date(ActivityInfo.endDate).getTime())}}</text>
+            <text class="flex-item">{{ToolClass.DateFormat(new Date(ActivityDetail.startDate).getTime())}} 至 {{ToolClass.DateFormat(new Date(ActivityDetail.endDate).getTime())}}</text>
           </view>
           <view class="Line flex-h">
             <text>活动地址：</text>
-            <text class="flex-item">{{ActivityInfo.address}}</text>
+            <text class="flex-item">{{ActivityDetail.address}}</text>
           </view>
           <view class="Line flex-h">
             <text>报名截止：</text>
-            <text class="flex-item">{{ToolClass.DateFormat(new Date(ActivityInfo.enrollEnd).getTime())}}</text>
+            <text class="flex-item">{{ToolClass.DateFormat(new Date(ActivityDetail.enrollEnd).getTime())}}</text>
           </view>
         </view>
 
@@ -35,8 +35,8 @@
         <view class="DetailContainer">
           <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/huodongxiangqing.png"></image>
           <view class="Text">
-            <!-- <rich-text :nodes="ActivityInfo.detail"></rich-text> -->
-            <Markdown :value="ActivityInfo.detail" />
+            <!-- <rich-text :nodes="ActivityDetail.detail"></rich-text> -->
+            <Markdown :value="ActivityDetail.detail" />
           </view>
         </view>
 
@@ -52,8 +52,8 @@
               </view>
             </view>
           </view>
-          <text @tap="ToPostActivityVote" v-if="!ShowVoteRes && ActivityStatus">提交</text>
-          <button open-type="getPhoneNumber" class="GetPhoneBtn" v-if="!DataLock && ShowGetPhoneBtn &&　!ShowVoteRes && ActivityStatus" @getphonenumber="GetPhoneNumber">授权手机号</button>
+          <text @tap="ToPostActivityVote" v-if="!ShowVoteRes && (ActivityDetail.status - 0 !== 2)">提交</text>
+          <button open-type="getPhoneNumber" class="GetPhoneBtn" v-if="!DataLock && ShowGetPhoneBtn &&　!ShowVoteRes && (ActivityDetail.status - 0 !== 2)" @getphonenumber="GetPhoneNumber">授权手机号</button>
           <view class="ResList" v-if="ShowVoteRes">
             <view v-for="(item, index) in VoteResList" :key="index">
               <view class="Text flex-h">
@@ -81,10 +81,10 @@
         <image class="centerLabel" mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/fenxiang.png"></image>
       </view>
       <button open-type="share" class="ShareBottomBtn" :class="{'active': IsEnroll}">分享</button>
-      <image mode="heightFix" v-if="IsEnroll && !HasEnroll && ActivityStatus" 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 && !HasEnroll && ActivityStatus" @getphonenumber="GetPhoneNumber">授权手机号</button>
-      <text v-if="IsEnroll && HasEnroll && ActivityStatus">已报名</text>
-      <text v-if="!ActivityStatus">已过期</text>
+      <image mode="heightFix" v-if="IsEnroll && !HasEnroll && (ActivityDetail.status - 0 !== 2)" 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 && !HasEnroll && (ActivityDetail.status - 0 !== 2)" @getphonenumber="GetPhoneNumber">授权手机号</button>
+      <text v-if="IsEnroll && HasEnroll && (ActivityDetail.status - 0 !== 2)">已报名</text>
+      <text v-if="!(ActivityDetail.status - 0 !== 2)">已过期</text>
     </view>
 
     <!-- 授权头像获取弹窗 -->
@@ -104,14 +104,12 @@ export default {
   data () {
     return {
       From: null,
-      ActivityStatus: false,
       HasEnroll: false,
       ShowVoteRes: false,
       VoteResList: [],
       ShowGetPhoneBtn: false,
       VoteIndex: null,
       VoteList: [],
-      ActivityInfo: null,
       IsVote: false,
       IsEnroll: false,
       CurrnetId: null,
@@ -121,6 +119,9 @@ export default {
   computed: {
     ...mapUserState({
       UserInfo: x => x.UserInfo // 用户信息
+    }),
+    ...mapIndexState({
+      ActivityDetail: x => x.ActivityDetail // 活动详情
     })
   },
   components: {
@@ -128,9 +129,9 @@ export default {
   },
   onShareAppMessage () {
     return {
-      title: this.ActivityInfo.shareTitle,
-      path: `/pages/HuiShengHuo/ActivityList/ActivityDetail/index?id=${this.ActivityInfo.activityId}&from=life`,
-      imageUrl: this.ActivityInfo.shareImg
+      title: this.ActivityDetail.shareTitle,
+      path: `/pages/HuiShengHuo/ActivityList/ActivityDetail/index?id=${this.ActivityDetail.activityId}&from=life`,
+      imageUrl: this.ActivityDetail.shareImg
     }
   },
   created () {
@@ -162,18 +163,16 @@ export default {
     Init () {
       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
-        this.ActivityStatus = this.ActivityInfo.status - 0 !== 2
+        this.IsEnroll = this.ActivityDetail.isEnroll
         if (this.IsEnroll) {
-          this.HasEnroll = this.ActivityInfo.isSelfEnrolled
+          this.HasEnroll = this.ActivityDetail.isSelfEnrolled
         }
-        if (this.ActivityInfo.isVote) {
-          this.VoteList = this.ActivityInfo.voteItemList.slice(0)
+        if (this.ActivityDetail.isVote) {
+          this.VoteList = this.ActivityDetail.voteItemList.slice(0)
           this.CreateVoteResList()
-          this.ShowVoteRes = !!this.ActivityInfo.selfVoted
+          this.ShowVoteRes = !!this.ActivityDetail.selfVoted
         }
-        this.IsVote = this.ActivityInfo.isVote
+        this.IsVote = this.ActivityDetail.isVote
       })
     },
     CreateVoteResList () { // 计算投票结果
@@ -183,7 +182,7 @@ export default {
         VoteTotal += item.voteNum - 0
       })
       this.VoteList.map((item) => {
-        this.VoteResList.push({ name: item.name, pec: Math.floor((item.voteNum / VoteTotal) * 100), total: VoteTotal, num: item.voteNum, selfVoted: this.ActivityInfo.selfVoted === item.itemId })
+        this.VoteResList.push({ name: item.name, pec: Math.floor((item.voteNum / VoteTotal) * 100), total: VoteTotal, num: item.voteNum, selfVoted: this.ActivityDetail.selfVoted === item.itemId })
       })
     },
     ToShare () {
@@ -196,13 +195,13 @@ export default {
       wx.switchTab({ url })
     },
     ToJoin () { // 报名
-      wx.navigateTo({ url: `./JoinIn/index?id=${this.ActivityInfo.activityId}` })
+      wx.navigateTo({ url: `./JoinIn/index?id=${this.ActivityDetail.activityId}` })
     },
     ToPostActivityVote () { // 活动投票
       if (this.DataLock || this.VoteIndex === null) return
       this.DataLock = true
       this.PostActivityVote({
-        urlData: { id: this.ActivityInfo.activityId },
+        urlData: { id: this.ActivityDetail.activityId },
         data: { data: { itemId: this.VoteList[this.VoteIndex].itemId } }
       }).then(() => {
         this.DataLock = false
@@ -211,7 +210,7 @@ export default {
           icon: 'none',
           duration: 2000
         })
-        this.ActivityInfo.selfVoted = this.VoteList[this.VoteIndex].itemId
+        this.ActivityDetail.selfVoted = this.VoteList[this.VoteIndex].itemId
         this.CreateVoteResList()
         this.ShowVoteRes = true
       }).catch(() => {

src/store/index/index.js

@@ -5,6 +5,7 @@ import ToolClass from '../../util/PublicMethod/index'
 export default {
   namespaced: true,
   state: {
+    ActivityDetail: null, // 活动详情
     IndexBanner: [], // 首页banner
     ActivityList: [], // 活动列表
     PhotoList: [], // 照片墙列表
@@ -76,6 +77,12 @@ export default {
     },
     EmptyUserActivityList (state) { // 清空我的活动列表
       state.UserActivityList = []
+    },
+    UpdateActivityDetail (state, data) { // 更新活动详情
+      state.ActivityDetail = data || null
+    },
+    EditActivityDetail (state, data) { // 编辑活动详情
+      state.ActivityDetail = { ...state.ActivityDetail, [data.name]: data.value }
     }
   },
   actions: {
@@ -245,6 +252,7 @@ export default {
           method: Api.GetActivityDetail.method,
           ...payload,
           success (res) {
+            context.commit('UpdateActivityDetail', res.data.data)
             resolve(res)
           },
           error (res) {