修改榜单

pages/kotra/billboard/billboarddetails.vue

@@ -270,7 +270,7 @@
 					</view>
 				</view>
 			</view>
-			<view v-if="detailsData && detailsData.State==1  && detailsData.EnrollList.length>0">
+			<view v-if="detailsData && (detailsData.State==1 ||detailsData.State==2 ) && detailsData.EnrollList.length>0">
 				<view class="box_conent_basic"  v-for="(x,y) in detailsData.EnrollList">
 					<view class="box_conent_basic_img">
 						<view class="box_conent_basic_img_t">参赛内容</view>
@@ -326,15 +326,18 @@
 								</view>
 							</view>
 						</view>
-						<view class="btn_bm" v-if="detailsData.State==1" @click="goeditsignUp(x)">编辑</view>
+						<view class="btn_bm" v-if="detailsData.State==1 " @click="goeditsignUp(x)">编辑</view>
 						
 					</view>
 				</view>
 			</view>
 			
-			<view v-if='detailsData&& (detailsData.RankList==null  || detailsData.RankList.length==0)'>
+			<view v-if='detailsData && detailsData.EnrollList.length==0'>
+				
 					<view class="btn_bm" v-if="detailsData.State==1" @click="gosignUp">立即报名</view>
 					<view class="btn_bm" style="background: #CCCCCC;" v-if="detailsData.State==2">报名已截止</view>
+				
+				
 			</view>
 			<view style="width: 100%;height: 20px;"></view>
 			
@@ -446,6 +449,7 @@
 				let data = {
 					Id : this.detailsData.Id,
 					ListType:this.detailsData.ListType,
+					ObjectTypeIds:this.detailsData.ObjectTypeIds,
 					template_message_list : this.detailsData.template_message_list
 				}
 				uni.navigateTo({//编码
@@ -457,6 +461,7 @@
 				
 				data.template_message_list = this.detailsData.template_message_list;
 				data.ListId = this.detailsData.Id;
+				data.ObjectTypeIds = this.detailsData.ObjectTypeIds;
 				uni.navigateTo({//编码
 					url: "/pages/kotra/billboard/listsignUp?formData="+encodeURIComponent(JSON.stringify(data)),
 				});

pages/kotra/billboard/listsignUp.vue

@@ -45,7 +45,7 @@
 			<view style="width: 100%;padding: 15px;border-radius: 15px;background: #FFF;">
 				<view>
 					<view class="single_Phone" style="margin-top: 0;">
-						<span style="color:red;margin-right:5rpx;" >*</span>参与品牌/载体
+						<span style="color:red;margin-right:5rpx;" >*</span>{{getNameids()}}
 					</view>
 					<view class="single_Input" @click="show=true" style="width: 100%;display: flex;align-items: center;justify-content: space-between;">
 						<input style="width: 90%"  v-model="ObjectName" :disabled="true" placeholder="请选择" />
@@ -363,7 +363,22 @@
 					
 				}
 				
+			},
+			getNameids(){
+				
+				let text = '';
+				if(this.formData.ObjectTypeIds.indexOf('1')!=-1){
+					text='参与品牌'
+				}
+				if(this.formData.ObjectTypeIds.indexOf('2')!=-1){
+					text='参与载体'
 				}
+				if(this.formData.ObjectTypeIds.indexOf('1')!=-1 && this.formData.ObjectTypeIds.indexOf('2')!=-1){
+					text='参与品牌/载体'
+				}
+				
+				return text
+			},
 		}
 	}
 </script>