no message

@@ -17,7 +17,7 @@ function getComanyList(params) {
 }
 }
 function getTrainDetail(id) {
 function getTrainDetail(id) {
 	return request({
 	return request({
-		url: `/train/info/${id}`,
+		url: `/train/info/getTrainByUser/${id}`,
 		method: 'get',
 		method: 'get',
 		params: id
 		params: id
 	})
 	})
@@ -168,10 +168,10 @@ function cancelOrder2(orderId) {
 }
 }
 
 
 function payForOrder(orderId) {
 function payForOrder(orderId) {
-	const nowOpenId = uni.getStorageSync('nowOpenId');
+	// const nowOpenId = uni.getStorageSync('nowOpenId');
 	return request({
 	return request({
 		// url: `/logex/order/payForOrder?orderId=${orderId}&openId=${nowOpenId}`,
 		// url: `/logex/order/payForOrder?orderId=${orderId}&openId=${nowOpenId}`,
-		url: `/logex/norder/payForOrder?orderId=${orderId}&openId=${nowOpenId}`,
+		url: `/train/order/payForOrder?orderId=${orderId}`,
 		method: 'post',
 		method: 'post',
 		params: orderId
 		params: orderId
 	})
 	})

@@ -53,7 +53,7 @@
 			</view>
 			</view>
 			<view class="contentbox" style="padding: 0;">
 			<view class="contentbox" style="padding: 0;">
 					<view class="content">
 					<view class="content">
-						<uni-grid :column="4" :highlight="true" :showBorder="false">
+						<uni-grid :column="3" :highlight="true" :showBorder="false">
 							<uni-grid-item v-for="(item, index) in list" :index="index" :key="index">
 							<uni-grid-item v-for="(item, index) in list" :index="index" :key="index">
 								<view class="grid-item-box" @click="goItem(item)">
 								<view class="grid-item-box" @click="goItem(item)">
 									<image :src="item.partLogo" class="image" mode="aspectFill" />
 									<image :src="item.partLogo" class="image" mode="aspectFill" />
@@ -127,13 +127,8 @@
 		partLogo:'/static/btn01.png',
 		partLogo:'/static/btn01.png',
 		path: '/pages_hotel/hotel/index'
 		path: '/pages_hotel/hotel/index'
 	}, {
 	}, {
-		id: 1,
-		name: '预订',
-		partLogo:'/static/btn02.png',
-		path: '/pages_hotel/hotel/index'
-	}, {
 		id: 2,
 		id: 2,
-		name: '在线学习',
+		name: '校园风采',
 		partLogo:'/static/btn03.png',
 		partLogo:'/static/btn03.png',
 		path: ''
 		path: ''
 	}, {
 	}, {

@@ -91,7 +91,8 @@
 		onShow,
 		onShow,
 		onPullDownRefresh
 		onPullDownRefresh
 	} from '@dcloudio/uni-app';
 	} from '@dcloudio/uni-app';
-	import config from '@/config';
+	import config from '@/config';
+	import dayjs from 'dayjs'
 	const app = getApp();
 	const app = getApp();
 	const popYanZheng = ref(null);
 	const popYanZheng = ref(null);
 	const loading = ref(false);
 	const loading = ref(false);
@@ -128,14 +129,14 @@
 			};
 			};
 		}
 		}
 	})
 	})
-	onShow(() => {
-		getData()
-	})
 	let goPath
 	let goPath
 
 
 	function getData() {
 	function getData() {
 		hotel.getTrainDetail(id.value).then(res => {
 		hotel.getTrainDetail(id.value).then(res => {
-			form.value = res.data
+			form.value = res.data
+			if(form.value.isApply){
+				isApply.value = form.value.isApply
+			}
 		})
 		})
 	}
 	}
 
 
@@ -154,6 +155,16 @@
 				}
 				}
 			})
 			})
 			return
 			return
+		}
+		const today = dayjs().valueOf()
+		const start = dayjs(form.value.trainStart).valueOf()
+		// console.log(today,start)
+		if(start<today){
+			uni.showToast({
+				title:'培训已过期，不能报名',
+				icon:'none'
+			})
+			return
 		}
 		}
 		let path = `/pages/form/index?id=${form.value.id}`;
 		let path = `/pages/form/index?id=${form.value.id}`;
 		uni.navigateTo({
 		uni.navigateTo({

@@ -38,7 +38,7 @@
 
 
 		<view class="fixedBottom" v-if="type == 0">
 		<view class="fixedBottom" v-if="type == 0">
 			<view>总金额：<text class="price">¥{{totalMoney}}</text></view>
 			<view>总金额：<text class="price">¥{{totalMoney}}</text></view>
-			<button class="subBtn btn" @click="submit">费用缴纳</button>
+			<!-- <button class="subBtn btn" @click="submit">费用缴纳</button> -->
 		</view>
 		</view>
 	</view>
 	</view>
 	
 	

@@ -25,17 +25,17 @@
 						<view class="pp" v-if="s.orderType==2">就餐次数：{{s.repastNum}}次</view>
 						<view class="pp" v-if="s.orderType==2">就餐次数：{{s.repastNum}}次</view>
 						<!-- 0:代付款  1:已付款  2:取消支付 -->
 						<!-- 0:代付款  1:已付款  2:取消支付 -->
 						<view class="status">
 						<view class="status">
-							<text class="gary" v-if="b.status == '0'&&b.surplus!='0,0'&&b.surplus!='0'"
+							<text class="gary" v-if="s.status == '0'&&s.surplus!='0,0'&&s.surplus!='0'"
 								style="margin-right: 48rpx;"> 待支付
 								style="margin-right: 48rpx;"> 待支付
 							</text>
 							</text>
-							<text class="success" v-if="b.status == '1'">已付款</text>
-							<text class="warning" v-if="b.status == '2'">取消支付</text>
+							<text class="success" v-if="s.status == '1'">已付款</text>
+							<text class="warning" v-if="s.status == '2'">取消支付</text>
 						</view>
 						</view>
-						<view class="time" v-if="b.status == '0'&&(b.surplus&&b.surplus!='0,0'&&b.surplus!='0')">
+						<view class="time" v-if="s.status == '0'&&(s.surplus&&s.surplus!='0,0'&&s.surplus!='0')">
 							（<uni-countdown style="display: inline-block;" :font-size="12" color="#999"
 							（<uni-countdown style="display: inline-block;" :font-size="12" color="#999"
 								splitorColor="#999" @timeup="timeup" :show-day="false" :show-hour="false" :start="true"
 								splitorColor="#999" @timeup="timeup" :show-day="false" :show-hour="false" :start="true"
-								:minute="Number(b.surplus?.split(',')[0])"
-								:second="Number(b.surplus?.split(',')[1])"></uni-countdown>)
+								:minute="Number(s.surplus?.split(',')[0])"
+								:second="Number(s.surplus?.split(',')[1])"></uni-countdown>)
 						</view>
 						</view>
 
 
 						<view class="billFoot">
 						<view class="billFoot">
@@ -44,8 +44,8 @@
 
 
 
 
 								<view style="display: flex;">
 								<view style="display: flex;">
-									<button class="billbtn" @click.stop="showDetail(b,s.orderType)">详情</button>
-									<button class="billbtn sxbtn" v-if="b.status == '0'" @click="goPay(b)">
+									<button class="billbtn" @click.stop="showDetail(s,s.orderType)">详情</button>
+									<button class="billbtn sxbtn" v-if="s.status == '0'" @click="goPay(b)">
 										支付</button>
 										支付</button>
 								</view>
 								</view>
 							</view>
 							</view>
@@ -183,7 +183,7 @@
 		padding: 0 25rpx 70rpx;
 		padding: 0 25rpx 70rpx;
 	}
 	}
 
 
-	.sonArea {min-height: 500px;
+	.sonArea {min-height: 560px;
 		.billItem {
 		.billItem {
 			padding: 40rpx 0 10rpx;
 			padding: 40rpx 0 10rpx;
 
 

@@ -116,16 +116,16 @@ function submit(){
 		}
 		}
 	}
 	}
 	function goPayForOrder(){
 	function goPayForOrder(){
-		// hotel.payForOrder(orderId.value).then(res=>{
-		// 	isClick.value = false
-		// 	if (res.data.weixinData) {
-		// 		wePay(res.data.weixinData)
-		// 	} else {
+		hotel.payForOrder(orderId.value).then(res=>{
+			isClick.value = false
+			if (res.data.weixinData) {
+				wePay(res.data.weixinData)
+			} else {
 				uni.hideLoading()
 				uni.hideLoading()
 				uni.showModal({
 				uni.showModal({
 					title: '提示',
 					title: '提示',
-					// content: '暂时无法支付，请稍后重试',
-					content: '支付成功',
+					content: '暂时无法支付，请稍后重试',
+					// content: '支付成功',
 					showCancel: false,
 					showCancel: false,
 					success: function (res) {
 					success: function (res) {
 						// uni.navigateBack()
 						// uni.navigateBack()
@@ -135,8 +135,8 @@ function submit(){
 						});
 						});
 					}
 					}
 				});
 				});
-		// 	}
-		// })
+			}
+		})
 	}
 	}
 	
 	
 	function wePay(configdata){
 	function wePay(configdata){