邀请助力后跳转活动详情页

packageOperate/activity/index.vue

@@ -171,7 +171,11 @@
 		</u-popup> -->
 
 		<!-- <u-popup v-if="info.status && JSON.parse(info.status).value == 4"   mode="bottom" @close="close" closeable> -->
-		<u-popup v-if="info.status && JSON.parse(info.status).value == 4" show="true" mode="center" @close="close"
+		
+		<!-- 助力邀请弹框组件 -->
+		<activity-help :activity-show="activityShow" :inviteCode="inviteCodeTa" :marketingId="marketingId" @close="close" @success="toActivity" v-if="activityShow && info.status && JSON.parse(info.status).value == 3" />
+		<!-- 活动结束弹框 -->
+		<u-popup v-if="info.status && JSON.parse(info.status).value == 4 || info.isOn == -1" show="true" mode="center" @close="close"
 			round="11">
 			<view style="text-align: center;width: 600rpx; height: 500rpx;">
 				<view style="color: #666;margin-top: 110rpx;font-size: 40rpx;">来晚了，活动已结束</view>
@@ -186,7 +190,11 @@
 <script>
 	import env from '../../config/env.js'
 	import $http from '@/utils/request.js'
+	import ActivityHelp from '@/components/activity-help/activity-help.vue'
 	export default {
+		components: {
+			ActivityHelp
+		},
 		data() {
 			return {
 				popupShow: false,
@@ -199,10 +207,26 @@
 				activityTime: 0,
 				activityTimeTwo: 0,
 				pagesNum: "",
+				activityShow: false,//助力邀请弹框
+				inviteCodeTa: '', //邀请码
+				marketingId: '',//活动id
 			}
 		},
 		onLoad(opthios) {
-			this.id = opthios.id
+			if(opthios.id){
+				this.id = opthios.id
+			}
+			/**
+			 * 免费活动邀请助力分享跳转接收参数
+			 * inviteCodeTa: 邀请码
+			 * marketingId: 活动id
+			 * */
+			if (opthios.inviteCode && opthios.marketingId) {
+				this.inviteCodeTa = opthios.inviteCode
+				this.marketingId = opthios.marketingId
+				this.id = opthios.marketingId
+				this.activityShow = true
+			}
 			this.getDetail()
 		},
 		onShow() {
@@ -268,6 +292,9 @@
 			close() {
 				//弹出层收起
 				this.popupShow = false
+				// 关闭支付弹框
+				this.payShow = false
+				this.activityShow = false
 			},
 
 			//公众号
@@ -308,7 +335,7 @@
 		onShareAppMessage(res) {
 			return {
 				title: '超值宝贝免费抽，参与活动仅需3秒',
-				path: `/pages/index/index?marketingId=${ this.info.id }&inviteCode=${ this.inviteCode }`,
+				path: `/packageOperate/activity/index?marketingId=${ this.info.id }&inviteCode=${ this.inviteCode }`,
 				imageUrl: 'https://mp-public-1310078123.cos.ap-shanghai.myqcloud.com/v2/free_draw_bkg.jpeg',
 			}
 		},

pages/index/index.vue

@@ -120,8 +120,6 @@
 		<custom-tab-bar :activeValue="'index'" />
 		<!-- 支付弹框组件 -->
 		<pay-popup :pay-show="payShow" :pay-info="payInfo" @close="close" @success="toProcess" v-if="payShow" />
-		<!-- 助力邀请弹框组件 -->
-		<activity-help :activity-show="activityShow" :inviteCode="inviteCode" :marketingId="marketingId" @close="close" @success="toActivity" v-if="activityShow" />
 	</view>
 </template>
 
@@ -130,12 +128,10 @@
 	import $http from '@/utils/request.js'
 	import CustomTabBar from '../../components/custom-tab-bar/custom-tab-bar.vue'
 	import PayPopup from '../../components/pay-popup/pay-popup.vue'
-	import ActivityHelp from '@/components/activity-help/activity-help.vue'
 	export default {
 		components: {
 			CustomTabBar,
 			PayPopup,
-			ActivityHelp
 		},
 		data() {
 			return {
@@ -154,25 +150,12 @@
 				list: [1,2,3,4,5],
 				percentage: 0,
 				checkStatus: true, 
-				inviteCode: '',//助力邀请码
-				marketingId: '',//活动id
-				activityShow: false,//助力邀请弹框
 				filterActivityList: [],
 				activityTime: null,
 				ticketInfo: {}
 			};
 		},
 		onLoad(opthios) {
-			/**
-			 * 免费活动邀请助力分享跳转接收参数
-			 * inviteCode: 邀请码
-			 * marketingId: 活动id
-			 * */
-			if (opthios.inviteCode && opthios.marketingId) {
-				this.inviteCode = opthios.inviteCode
-				this.marketingId = opthios.marketingId
-				this.activityShow = true
-			}
 			
 			/**
 			 * 票赢天下小程序分享盲票跳转接受的参数
@@ -360,7 +343,6 @@
 			// 关闭支付弹框
 			close() {
 				this.payShow = false
-				this.activityShow = false
 			},
 
 			changeList() {