1

pages/kotra/activeInnerDetail.vue

@@ -117,7 +117,7 @@
 		<template v-if="isShowBtn">
 			<view v-if="dataList.IsJoinActivity==0">
 				<view class="acdetailBtn" v-if="dataList.ActivityStatus==2">报名活动（已结束）</view>
-				<view class="acdetailBtn" v-if="dataList.ActivityStatus==1&&dataList.IsSignUp!=1">不可报名</view>
+				<view class="acdetailBtn" v-if="dataList.ActivityStatus==1&&dataList.IsSignUp!=1">报名时间已过</view>
 				<view class="acdetailBtn" @click="IsOpenMiAi==1?gosignUp():showModal=true" :style="{'background-color':IsOpenMiAi==1?mainColor:'#1F1F1F'}" v-if="dataList.ActivityStatus==1&&dataList.IsSignUp==1">马上报名</view>
 				<view class="acdetailBtn" :style="{'background-color':IsOpenMiAi==1?mainColor:'#80808A'}" v-if="dataList.ActivityStatus==0">未开始</view>
 			</view>

pages/share/index/index.vue

@@ -218,6 +218,7 @@
 	export default {
 		components: {
 			orderPopup,
+			auth
 		},
 		data() {
 			return {

pages/user-center/components/blinddate-user.vue

@@ -177,7 +177,10 @@
 				uni.navigateTo({
 					url: '/pages/blindDate/personal/buyvip?Id='+id
 				});
-			}
+			},
+			login(name) {
+				this.$emit('fatherMethod',name);
+			},
 		}
 	}
 </script>

pages/user-center/user-center.vue

@@ -191,6 +191,7 @@
 			:modelstype='modelstype'
 			:bottommargin='bottommargin'
 			:PointNum='PointNum'
+			@fatherMethod="login"
 			>
 				
 			</blinddate>