yichael %!s(int64=4) %!d(string=hai) anos
pai
achega
931159a4b9

+ 1 - 2
App.vue

@@ -7,8 +7,7 @@
 	// import Home from './pages/home.vue'
 	export default {
 		globalData:{
-			bLogin:false,
-			bShowWebview:false,
+			bLogin:false
 		},
 		// data() {
 		// 	return {}

+ 1 - 16
components/startLearning/learningAndExperiment/learningAndExperiment.vue

@@ -27,7 +27,6 @@
 				<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==4'>进入虚拟资源库</view>
 			</view>
 		</view>
-		<web-view class="webview720" :src="url" v-show='bShowWebview'></web-view>
 	</view>
 
 </template>
@@ -65,13 +64,9 @@
 				this.$emit("onClick_KSRZ")
 			},
 			onClick_KSKC(){
-				// https://www.yuyekeji.cn/H5/720/
-				this.bShowWebview = true;
+				this.$emit("onShowWebview720");
 				// this.$emit("onClick_KSKC")
 			},
-			onClick_shutWebview(){
-				this.bShowWebview = false;
-			}
 		}
 	}
 </script>
@@ -113,14 +108,4 @@
 		line-height: px2vw(31);
 		margin-bottom: px2vw(63);
 	}
-	.webview720{
-		width: 100%;
-		height: 100%;
-	}
-	// .shut_down{
-	// 	width: px2vw(58);
-	// 	height: px2vw(58);
-	// 	background: #000000;
-	// 	border-radius: px2vw(8);
-	// }
 </style>

+ 1 - 1
components/topMenu.vue

@@ -391,7 +391,7 @@
 		background: #FFFFFF;
 		box-shadow: 3px 0px 6px 0px rgba(0, 0, 0, 0.1);
 		position: fixed;
-		z-index: 1;
+		z-index: 0;
 	}
 
 	.topMenu-lefticon {

+ 28 - 2
pages/home.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="mybody bgclF8 df fdc">
+		
 		<TopMenu ref="TopMenu" v-on:onTopSYClick="onTopSYClick" v-on:onTopQXZBClick="onTopQXZBClick" v-on:onLoginClick="onLoginClick"
 		 v-on:onTopXXYSYClick="onTopXXYSYClick" v-on:onTopMenuIconClick="onTopMenuIconClick" v-on:onClick_return="onClick_return"
 		 v-on:onClick_avatar="onClick_avatar" v-on:onClick_topMenu_sy="onClick_topMenu_sy" v-on:onClick_exit="onClick_userExit"></TopMenu>
@@ -12,7 +13,7 @@
 			<!-- <image v-show="bShow[4]" class="homeBG" mode="aspectFill" src="../assets/home/homeBG.png"></image> -->
 			<SY ref="SY" v-show="bShow[4]" v-on:onClick_menu_btn="onClick_sy_btn"></SY>
 			<QXZB ref="QXZB" v-show="bShow[5]"></QXZB>
-			<XXYSY ref="XXYSY" v-show="bShow[6]" v-on:onClick_KSRZ="onClick_KSRZ" v-on:onClick_KSKC="onClick_KSKC"></XXYSY>
+			<XXYSY ref="XXYSY" v-show="bShow[6]" v-on:onClick_KSRZ="onClick_KSRZ" v-on:onClick_KSKC="onClick_KSKC" v-on:onShowWebview720="onShowWebview720"></XXYSY>
 			<YLRZ ref="YLRZ" v-show="bShow[7]"></YLRZ>
 			<SYJJ2 ref="SYJJ2" v-show="bShow[8]"></SYJJ2>
 			<simulation ref="simulation" v-show="bShow[9]"></simulation>
@@ -32,6 +33,10 @@
 		</view>
 		<!-- 左侧导航栏永远保持在最上层 -->
 		<LeftMenu ref="LeftMenu" v-on:onLeftMenuClick="onLeftMenuClick"></LeftMenu>
+	
+		<!-- <web-view class="webview720" :src="url" v-if='bShowWebview'></web-view> -->
+		<webview720 ref="webview720"></webview720>
+		<shutDownWebview ref="shutDownWebview" v-on:onHideWebview="onHideWebview"></shutDownWebview>
 	</view>
 </template>
 
@@ -69,6 +74,8 @@
 	import XXZLXZ from '../components/learningProcess/xxzlxz.vue' //学习资料下载
 	import SJKC from '../components/startLearning/learningAndExperiment/ksxx_xxysy_sjkc/ksxx_xxysy_sjkc.vue' //实景勘察
 
+	import shutDownWebview from '../components/home/shutDownWebview.vue' //实景勘察720
+	import webview720 from '../components/home/webview720.vue' //实景勘察720
 	export default {
 		components: {
 			LeftMenu,
@@ -96,10 +103,14 @@
 			vstudentPlatform,
 			survey,
 			SJKC,
-			XXZLXZ
+			XXZLXZ,
+			shutDownWebview,
+			webview720
 		},
 		data() {
 			return {
+				url:'https://www.yuyekeji.cn/H5/720/',
+				bShowWebview:true,
 				curShowPage: 4,
 				//这里记录当前需要显示哪个页面。每新添加一个页面,都需要在这里注册。
 				bShow: [
@@ -516,6 +527,15 @@
 				this.showPage(0);
 				this.$refs.Login.initData();
 				this.$refs.TopMenu.switchMiddleState(topMenuS.SY, -1);
+			},
+			onHideWebview()
+			{
+				console.log('22222')
+				this.$refs.webview720.onClickShutWebview();
+			},
+			onShowWebview720(){
+				this.$refs.shutDownWebview.onClickShow();
+				this.$refs.webview720.onClickShow();
 			}
 		}
 	}
@@ -530,4 +550,10 @@
 	.homeContent {
 		margin-top: px2vw(120);
 	}
+
+.webview720{
+		width: 100%;
+		height: 100%;
+		// z-index: 3;
+	}
 </style>