1

pages/kotra/activeInnerDetail.vue

@@ -115,9 +115,12 @@
 			<view class="acdetail_Intro" v-html="richtext"></view>
 		</view>
 		<template v-if="isShowBtn">
-			<view class="acdetailBtn" v-if="dataList.ActivityStatus==2">报名活动（已结束）</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 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" @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>
 			<view class="acdetailBtn" v-if="dataList.IsJoinActivity==1">已报名</view>
 		</template>
 		<u-popup v-model="showModal" mode="center" length="80%">
@@ -180,6 +183,9 @@
 			}
 			this.getList();
 		},
+		onShow() {
+			this.getList();
+		},
 		methods: {
 			getList(){
 				this.request2({

pages/kotra/baomingorder.vue

@@ -262,7 +262,7 @@ export default {
 						if(this.msg.EnrollState==1){
 							this.g.splice(this.bmobj.index,1)
 						}else{
-							this.g[this.bmobj.index].Status=2
+							this.g[this.bmobj.index].Status=1
 						}
 						
 					}else{