Merge remote-tracking branch 'origin/master'

src/projects/pension/views/Master/Live/Info.vue

@@ -2,7 +2,7 @@
 <div>
 
 	<common @asynCallBack="asynCallBack"></common>
-	<top-header :pageTitle="pageTitle"     ></top-header>
+	<top-header :pageTitle="pageTitle"   :routeName="routeName"    ></top-header>
 
 	<div class="mui-content vongi-fklist vongi-spkh" v-if="buystatus&&list.length" >
 				<div class="vongi-spkh-title flew">
@@ -84,6 +84,7 @@
 				list: [],
 				endtime: null,
 				isLoading: false,
+				routeName:'Master'
 
 			}
 		},

src/projects/pension/views/Master/Live/PaySuccess.vue

@@ -49,7 +49,7 @@
     methods:  {
       back(){
         this.$router.push({
-          name: 'master',
+          name: 'Master',
           query: {}
         })
       },

src/projects/pension/views/Master/Live/Room.vue

@@ -32,13 +32,29 @@
 				<div class="vongi-popup-ceter vongi-zbfj-pop" style="top:10%">
 					<div class="vongi-popup-inner">
 						<div class="vongi-popup-ma">
-							<img src="~$project/assets/img/lad.png" width="50%">
+							<img src="~$project/assets/img/lad.png" width="50%"  v-if="banner==null">
+							<template v-if="banner!=null">
+
+
+								<template v-if="banner.linkUrl.indexOf('http:')==0">
+									<a :href="banner.linkUrl" class="linkurl">
+										<img :src="banner.picUrl" :alt="banner.name" width="50%">
+									</a>
+								</template>
+
+								<template v-if="banner.linkUrl.indexOf('http:')!=0">
+									<router-link :to="{name: banner.linkUrl}">
+										<img :src="banner.picUrl" :alt="banner.name" width="50%">
+									</router-link>
+								</template>
+
+							</template>
 							<h3>还在观看吗？</h3>
 
 						</div>
 						<div class="vongi-btn vongi-login-btn">
-							<button class="mui-btn mui-btn-pink"><spn class="iconfont icon-bofang"></spn>继续观看</button>
-							<button class="mui-btn "><spn class="iconfont icon-tuichu4"></spn>结束观看</button>
+							<button class="mui-btn mui-btn-pink" @click="mystart"><spn class="iconfont icon-bofang" ></spn>继续观看</button>
+							<button class="mui-btn " @click="myback"><spn class="iconfont icon-tuichu4"></spn>结束观看</button>
 						</div>
 					</div>
 
@@ -76,7 +92,7 @@
 		},
 		data() {
 			return {
-				pageTitle: '教室直播间',
+				pageTitle: '视频看护直播间',
 				id: this.$route.query.id,
 				detail: {
 					status: 0
@@ -123,7 +139,7 @@
 
 			},myback(){
 				this.$router.push({
-					name: 'Student',
+					name: 'Master',
 				})
 			},
 			mystart(){
@@ -161,7 +177,7 @@
 							console.log(this.bannerList)
 							console.log(x)
 						}else{
-							this.getSchoolServeList();
+							this.getBannerInfo();
 						}
 
 						setTimeout(()=> {