Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp into master

pages/kotra/billboard/billboarddetails.vue

@@ -273,7 +273,7 @@
 			<view v-if="detailsData && detailsData.ListState==1  && 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>
+						<view class="box_conent_basic_img_t">参赛内容</view>
 					</view>
 					<view class="box_conent_basic_c" style="padding: 0 5px;" >
 						<view class="cans_c">
@@ -332,7 +332,7 @@
 				</view>
 			</view>
 			
-			<view v-if='type==1 && detailsData'>
+			<view v-if='detailsData'>
 				<view class="btn_bm" v-if="detailsData.ListState==1" @click="gosignUp">立即报名</view>
 				<view class="btn_bm" style="background: #CCCCCC;" v-if="detailsData.ListState!=1">报名已截止</view>
 			</view>
@@ -360,16 +360,13 @@
 				Id:0,
 				detailsData:null,
 				RankList:[],
-				type:1,//1位列表过来的 2 为自己报名列表过来的
+				
 				controls:false,
 				showAuth:false,
 				u: {}
 			}
 		},
 		onLoad(options) {
-			// uni.setNavigationBarTitle({
-			// 	title: "详情"
-			// })
 			uni.setNavigationBarColor({
 				frontColor: '#ffffff',
 				backgroundColor: '#111111',
@@ -392,9 +389,6 @@
 				}
 				
 			}
-			if(options && options.type){
-				this.type = options.type
-			}
 		},
 		methods:{
 			reloadUserinfo() {

pages/kotra/billboard/listsignUp.vue

@@ -119,7 +119,7 @@
 				ObjectName:'',
 				show:false,
 				companyStatus:0,
-				type:1
+				
 			}
 		},
 		created() {
@@ -136,7 +136,6 @@
 			if (option && option.formData) { //解码
 				this.formData = JSON.parse(decodeURIComponent(option.formData))
 				if(this.formData.ObjectId && this.formData.ObjectId>0){
-					this.type=2
 					this.addMsg.Id = this.formData.Id
 					this.addMsg.ListId = this.formData.ListId
 					this.addMsg.ObjectType = this.formData.ObjectType
@@ -320,6 +319,7 @@
 					}
 					
 				})
+				console.log('调用接口')
 				
 				this.addMsg.Content = JSON.stringify(dataList) 
 				let that = this
@@ -338,14 +338,6 @@
 										title: '申请成功',
 										icon: 'none'
 									})
-									
-									if(that.type==1){
-										setTimeout(() => {
-											uni.redirectTo({
-												url: "/pages/kotra/billboard/mybillbordList"
-											})
-										}, 1000)
-									}else{
 									setTimeout(() => {
 											uni.navigateBack({
 												 success: function() {
@@ -353,7 +345,7 @@
 												 }
 											});
 									}, 1000)
-									}
+								
 									
 									
 								}