1

pages.json

@@ -529,6 +529,8 @@
 				
 		    },{
 		        "path": "traineeList"//预约的学员列表
+		    },{
+		        "path": "order-success"//预约成功页面
 		    },{
 				"path": "personal/teacherOrderList" //约课列表-老师
 			},{

pages/appointment/appointment.vue

@@ -159,12 +159,15 @@
 											<view  style="font-size: 12px;color: #666666;">{{item.TeacherName}}</view>
 											<view style="display: flex;flex-direction: row;align-items: flex-end;color: #DD0000;" v-if="showteacher==0">
 												
-												<text style='font-size: 16px;'>
+												<text style='font-size: 16px;' v-if="item.PointNum>0">
 													{{item.PointNum}}
 												</text>
-												<text style='font-size: 12px;'>
+												<text style='font-size: 12px;' v-if="item.PointNum>0">
 													点
 												</text>
+												<text style='font-size: 16px;' v-if="item.PointNum==0">
+													免费
+												</text>
 											</view>
 										</view>
 										

pages/appointment/confirmAppointment.vue

@@ -117,23 +117,7 @@
 					<text class="t-item-r" v-else>{{addMsg.StudyDate}}</text>
 				</view>
 			</view>
-			<!-- 甲鹤暂时不用 先写在这里 -->
-			<!-- <view class="box-top" style="margin-top: 15px;" v-if="data.RoomId!=null && data.RoomId>0">
-				<view class="top-item" style="border: none;">
-					<text>直播订阅</text>
-					<view style="width: 100px;">
-						<subscribe
-						    :room-id="data.RoomId"
-							:width='100'
-							:height='30'
-							:fontSize='13'
-							@tap.stop
-							 @subscribe="onSubscribe"
-						    >
-						</subscribe>
-					</view>
-				</view>
-			</view> -->
+		
 			<view class="box-top" style="margin-top: 15px;" v-if="data.orderList.length>0 && data.StudentNumType==1">
 				<view class="row-c">
 					<view style="font-size: 14px;color: #111111;font-weight: bold;">已预约的时间段<text style="font-size: 11px;color: #666666;">(下列的时间段不能预约)</text></view>
@@ -149,9 +133,12 @@
 		</view>
 		<view style="width: 100%;height: 130px;"></view>
 		<view class="bottoms">
-			<view class="bottoms-box" @click="xiadan">
+			<view class="bottoms-box" @click="xiadan" v-if="addMsg.TotalPointNum>0">
 				支付 {{addMsg.TotalPointNum}}点
 			</view>
+			<view class="bottoms-box" @click="xiadan" v-if="addMsg.TotalPointNum==0">
+				免费预约
+			</view>
 			<view style="font-size: 11px;color: #666666;">*需要订阅了才能预约下单<text style="color: #DD0000;">(虚拟商品支付成功后不支持退款)</text></view>
 		</view>
 		
@@ -268,6 +255,11 @@
 					})
 					return
 				}
+				let  RoomId = 0;
+				if(that.data.RoomId!=null && that.data.RoomId>0){
+					RoomId = that.data.RoomId
+				}
+				
 				//直播订阅 //甲鹤暂时不用 先写在这里
 				// if(that.data.RoomId!=null && that.data.RoomId>0){
 				// 	let livePlayer = requirePlugin('live-player-plugin')
@@ -309,7 +301,7 @@
 						  			icon:'none'
 						  		})
 								uni.redirectTo({//下单成功跳入订单列表
-									url: "/pages/appointment/personal/studentAppointmentList",
+									url: "/pages/appointment/order-success?RoomId="+RoomId 
 								});
 						  	}
 						  );

pages/appointment/order-success.vue

+<template>
+	<view class="edsucess">
+		<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/edsucess.png" style="width: 80px;height: auto;margin-top: 50px;" mode="widthFix"></image>
+		<text style="font-size: 18px;color: #111111;font-weight: bold;margin: 26px 0;">报名成功</text>
+		<text style="font-size: 14px;color: #333333;" >稍后系统会推送直播间相关信息,注意查收！</text>
+		<!-- <text style="font-size: 14px;color: #333333;" v-if="RoomId==0">稍后系统会推送直播间相关信息,注意查收！</text> -->
+		<!-- <view v-if="RoomId>0" style='margin-top:15px'>
+			<subscribe
+				:room-id="RoomId"
+				:width='100'
+				:height='30'
+				:fontSize='13'
+				@tap.stop
+				 @subscribe="onSubscribe"
+				>
+			</subscribe>
+		</view> -->
+		
+		<view class="btn" :style="{background:mainColor}" @click="gourl()">我知道了</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				mainColor:''
+			}
+			
+		},
+		onLoad(options) {
+			if(options && options.RoomId){
+				this.RoomId = options.RoomId
+			}
+			
+		},
+		created(){
+			this.mainColor = this.$uiConfig.mainColor;
+		},
+		methods:{
+			gourl(){
+				uni.reLaunch({
+					url: "/pages/appointment/personal/studentAppointmentList",
+				});
+			},
+			onSubscribe(){
+				
+			},
+		}
+	}
+</script>
+
+<style>
+	.edsucess{
+		width: 100%;
+		height: 100vh;
+		background: #FFF;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 15px;
+	}
+	.btn{
+		width: 125px;
+		height: 40px;
+		margin-top: 35px;
+		border-radius: 20px;
+		color: #FFF;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		font-size: 15px;
+		
+	}
+</style>