yichael před 4 roky
rodič
revize
aae54d620c

+ 1 - 0
App.vue

@@ -8,6 +8,7 @@
 	export default {
 	export default {
 		globalData:{
 		globalData:{
 			bLogin:false,
 			bLogin:false,
+			bShowWebview:false,
 		},
 		},
 		// data() {
 		// data() {
 		// 	return {}
 		// 	return {}

+ 27 - 1
components/login/loginByPWD.vue

@@ -100,6 +100,33 @@
 							mydata_userInfo.UserID = data.UserID;
 							mydata_userInfo.UserID = data.UserID;
 							mydata_userInfo.Position = data.Position;
 							mydata_userInfo.Position = data.Position;
 							mydata_userInfo.role = data.Type;
 							mydata_userInfo.role = data.Type;
+							
+							// let url = this.$Api + "/user/setusertype";
+							// console.log('url=',url)
+							// let aData = {
+							// 	"UserID" : data.UserID,                //虚拟仿真用户ID
+							// 	"Type":"老师"
+							// }
+							// console.log('data=',aData)
+							// uni.request({
+							// 	header: {
+							// 		'Content-Type': 'application/json;charset=UTF-8'
+							// 	},
+							// 	url: url,
+							// 	method: 'POST',
+							// 	data: {
+							// 		"UserID" : data.UserID,                //虚拟仿真用户ID
+							// 		"Type":"老师"
+							// 	},
+							// 	dataType: 'json',
+							// 	success: (res) => {
+							// 		console.log("success+++**+*", res)
+							// 	},
+							// 	fail: (res) => {
+							// 		console.log("fail+**+*", res)
+							// 	}
+							// });
+							
 							// console.log("登陆成功,个人信息", mydata_userInfo);
 							// console.log("登陆成功,个人信息", mydata_userInfo);
 							if (mydata_userInfo.role == '老师') {
 							if (mydata_userInfo.role == '老师') {
 								userController.updateStudentList(null,null);
 								userController.updateStudentList(null,null);
@@ -110,7 +137,6 @@
 							MyRequest.SetUserType(mydata_userInfo.role,null,null);
 							MyRequest.SetUserType(mydata_userInfo.role,null,null);
 							
 							
 							this.$emit("onLogin");
 							this.$emit("onLogin");
-							console.log("登陆成功",res);
 						}
 						}
 						//密码错误
 						//密码错误
 						else {
 						else {

+ 21 - 3
components/startLearning/learningAndExperiment/learningAndExperiment.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<!-- 学习与实验 -->
 	<!-- 学习与实验 -->
 	<view class="myComRoot df jcc bgclF8">
 	<view class="myComRoot df jcc bgclF8">
-		<view class="df fdc contentBox">
+		<view class="df fdc contentBox" v-show='!bShowWebview'>
 			<!-- 换行的段落文字 -->
 			<!-- 换行的段落文字 -->
 			<view class="df content-paragraph" v-for="(paragraph,i) in data_XXYSY[checkedIndex_topTitle].content.paragraphList"
 			<view class="df content-paragraph" v-for="(paragraph,i) in data_XXYSY[checkedIndex_topTitle].content.paragraphList"
 			 :key="i">
 			 :key="i">
@@ -27,8 +27,9 @@
 				<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==4'>进入虚拟资源库</view>
 				<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==4'>进入虚拟资源库</view>
 			</view>
 			</view>
 		</view>
 		</view>
-
+		<web-view class="webview720" :src="url" v-show='bShowWebview'></web-view>
 	</view>
 	</view>
+
 </template>
 </template>
 
 
 <script>
 <script>
@@ -50,6 +51,8 @@
 				checkedColor: "#EA252C",
 				checkedColor: "#EA252C",
 				unCheckedColor_text: "#0E0E0E",
 				unCheckedColor_text: "#0E0E0E",
 				unCheckedColor_border: "#C4C4C4",
 				unCheckedColor_border: "#C4C4C4",
+				url:'https://www.yuyekeji.cn/H5/720/',
+				bShowWebview:getApp().globalData.bShowWebview,
 			}
 			}
 		},
 		},
 		methods: {
 		methods: {
@@ -62,7 +65,12 @@
 				this.$emit("onClick_KSRZ")
 				this.$emit("onClick_KSRZ")
 			},
 			},
 			onClick_KSKC(){
 			onClick_KSKC(){
-				this.$emit("onClick_KSKC")
+				// https://www.yuyekeji.cn/H5/720/
+				this.bShowWebview = true;
+				// this.$emit("onClick_KSKC")
+			},
+			onClick_shutWebview(){
+				this.bShowWebview = false;
 			}
 			}
 		}
 		}
 	}
 	}
@@ -105,4 +113,14 @@
 		line-height: px2vw(31);
 		line-height: px2vw(31);
 		margin-bottom: px2vw(63);
 		margin-bottom: px2vw(63);
 	}
 	}
+	.webview720{
+		width: 100%;
+		height: 100%;
+	}
+	// .shut_down{
+	// 	width: px2vw(58);
+	// 	height: px2vw(58);
+	// 	background: #000000;
+	// 	border-radius: px2vw(8);
+	// }
 </style>
 </style>