1

pages.json

@@ -501,6 +501,12 @@
 		//约课
 		{
 		    "root": "pages/appointment",
+			// "plugins": {
+			//     "live-player-plugin": {
+			//         "version": "1.2.5",
+			//         "provider": "wx2b03c6e691cd7370"
+			//     }
+			// },
 		    "pages": [{
 		        "path": "appointment"//约课
 		    },{
@@ -515,6 +521,12 @@
 		        "path": "appointmentList"//约课列表
 		    },{
 		        "path": "confirmAppointment"//预约课程
+				// "style":{
+				// 	"usingComponents": {
+				// 		"subscribe": "plugin-private://wx2b03c6e691cd7370/components/subscribe/subscribe"
+				// 	}
+				// }
+				
 		    },{
 		        "path": "traineeList"//预约的学员列表
 		    },{

pages/appointment/appointment.vue

@@ -463,7 +463,7 @@ import tabbars from '@/components/tabbar/index';
 			goconfirm(item){
 				
 				uni.navigateTo({
-					url: '/pages/appointment/confirmAppointment?CourseId='+item.ID+'&WeekStr='+this.WeekStr
+					url: '/pages/appointment/confirmAppointment?CourseId='+item.ID
 				});
 			},
 			gostudent(item){//学员列表

pages/appointment/confirmAppointment.vue

@@ -62,6 +62,13 @@
 		color: #FFF;
 		margin-top: 5px;
 	}
+	.subs{
+		width: 100px;
+		height: 30px;
+		background: #E03997;
+		font-size: 12px;
+		color: FFF;
+	}
 </style>
 <template>
 	<view class="confirmAppointment">
@@ -73,7 +80,7 @@
 				</view>	
 				<view class="top-item" style="margin-top: 10px;">
 					<text>上课时间</text>
-					<text class="t-item-r">{{data.StudyDateStr}} 周{{WeekStr}} {{data.StudyStartDate}}-{{data.StudyEndDate}}</text>
+					<text class="t-item-r">{{data.StudyDateStr}} {{data.WeekStr}} {{data.StudyStartDate}}-{{data.StudyEndDate}}</text>
 				</view>
 				<view class="top-item">
 					<text>上课老师</text>
@@ -110,6 +117,23 @@
 					<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>
@@ -121,6 +145,7 @@
 				</view>
 			</view>
 			
+			
 		</view>
 		<view style="width: 100%;height: 130px;"></view>
 		<view class="bottoms">
@@ -129,6 +154,8 @@
 			</view>
 			<view style="font-size: 11px;color: #666666;">*需要订阅了才能预约下单</view>
 		</view>
+		
+
 		<u-picker mode="time" v-model="show" :params="params" @confirm = 'confirm'></u-picker>
 	</view>
 </template>
@@ -164,15 +191,12 @@
 				},
 				classDay:1,
 				ifvalue:1,
-				WeekStr:'',
+				
 			}
 		},
 		onLoad(options) {
 			console.log(options,'options')
 			this.getPointCourseDetail(options.CourseId)
-			if(options && options.WeekStr){
-				this.WeekStr = options.WeekStr
-			}
 			
 		},
 		created() {
@@ -244,6 +268,24 @@
 					})
 					return
 				}
+				//直播订阅 //甲鹤暂时不用 先写在这里
+				// if(that.data.RoomId!=null && that.data.RoomId>0){
+				// 	let livePlayer = requirePlugin('live-player-plugin')
+				// 	const roomId = data.RoomId // 房间 id
+				// 	livePlayer.getSubscribeStatus({ room_id: roomId })
+				// 		.then(res => {
+				// 			if(res.is_subscribe==false){
+				// 				uni.showToast({
+				// 					title: '订阅了直播才能预约！',
+				// 					icon:'none'
+				// 				})
+				// 				return
+				// 			}
+				// 		}).catch(err => {
+				// 			console.log('get subscribe status', err)
+				// 			return
+				// 		})
+				// }
 				let msg = JSON.parse(JSON.stringify(that.addMsg))
 				msg.StudyDate = that.data.StudyDateStr+' '+that.addMsg.StudyDate+':00'
 				uni.requestSubscribeMessage({
@@ -280,12 +322,16 @@
 					  
 				  },
 				  fail(err){
+					  console.log(err)
 					  uni.showToast({
 					  	title: '没订阅不能预约课程哦！',
 					  	icon:'none'
 					  })
 				  }
 				})
+			},
+			onSubscribe(e){
+				console.log(e)
 			}
 		}
 	}