浏览代码

delete no use vue

eraser 4 年之前
父节点
当前提交
2257f854ea

+ 0 - 77
components/home/simulation.vue

@@ -1,77 +0,0 @@
-<template>
-	<view class="s_container">
-		<image src="../../assets/home/homeBG.png" class="s_logo" mode=""></image>
-		<view class="s_content_container">
-			<view class="s_title" v-text="'虚拟仿真1号摄影棚'">
-
-			</view>
-			<view class="s_content">
-				<view class="">
-					影视现场实时特效是虚拟制片的一种影视创作流程与创作技术,处于虚 拟制片前、中、后期中的中期现场创作环节,与虚拟制片的前期艺术设 计、虚拟制作联系尤为密切。影视现场实时特效的核心
-					是通过实时渲染、数据跟踪、CG制作等核心技术,在影视拍摄现场实现虚拟创作与现 实创作的实时同步与实时协作,并在现场呈现影像最终效果。除现场摄 制以外,影视现场实时特效还包括
-					前期虚拟艺术(数字制景、数字道具、数字角色)的再创作和后期处理(合成、调色)的现场创作。
-				</view>
-			</view>
-		</view>
-
-		<view class="s_footer" style="text-align: center;padding: 80rpx;">
-			<button size="mini" class="m_btn_download" style="">客户端下载</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: "simulation",
-		data() {
-			return {
-
-			}
-		},
-		created() {
-
-		},
-		methods: {
-
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.s_container {
-		width: 100%;
-		height: 100%;
-	}
-
-	.s_logo {
-		width: 100%;
-		height: 1000rpx;
-	}
-
-
-	.s_content_container {
-		padding: 0 206rpx;
-
-		.s_title {
-			font-weight: bold;
-			text-align: center;
-			line-height: 200rpx;
-			font-size: 45rpx;
-		}
-
-		.s_content {
-			font-weight: 500;
-			font-size: 40rpx;
-			line-height: 70rpx;
-		}
-	}
-
-	.m_btn_download {
-		height: 80rpx;
-		line-height: 80rpx;
-		padding: 0 70rpx;
-		background: #EA252C;
-		color: #fff;
-		font-family: MicrosoftYaHei;
-	}
-</style>

+ 0 - 93
components/home/simulationLibrary.vue

@@ -1,93 +0,0 @@
-<template>
-	<view class="s_container">
-		<image src="../../assets/home/homeBG.png" class="s_logo" mode=""></image>
-		<view class="s_content_container">
-			<view class="s_search" style="">
-				<input type="text" value="" class="s_search_input" placeholder="请输入搜索内容" />
-				<button type="warn" size="mini" class="s_btn_search">搜索</button>
-			</view>
-			<view class="s_search_condition">
-			
-			<select name="" id="">
-				<option value="">项目类型</option>
-			</select>
-			</view>
-		</view>
-
-		<view class="s_footer" style="text-align: center;padding: 80rpx;">
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: "simulationLibrary",
-		data() {
-			return {
-
-			}
-		},
-		created() {
-
-		},
-		methods: {
-
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.s_container {
-		width: 100%;
-		height: 100%;
-	}
-
-	.s_logo {
-		width: 100%;
-		height: 400rpx;
-	}
-
-
-
-
-	.m_btn_download {
-		height: 80rpx;
-		line-height: 80rpx;
-		padding: 0 70rpx;
-		background: #EA252C;
-		color: #fff;
-		font-family: MicrosoftYaHei;
-	}
-
-	.s_content_container {
-		padding: 40rpx 100rpx;
-
-		.s_search {
-			display: flex;
-			justify-content: space-between;
-
-			.s_search_input {
-				border: 2rpx solid #DDDDDD;
-				width: 100%;
-				height: 80rpx;
-				line-height: 80rpx;
-				padding: 0 40rpx;
-				border-radius: 10rpx;
-				font-size: 20rpx;
-			}
-
-			.s_btn_search {
-				width: 130rpx;
-				height: 80rpx;
-				line-height: 80rpx;
-				margin-left: 20rpx;
-			}
-		}
-
-		.s_search_condition {
-			background-color: #F9F9F9;
-			height: 100rpx;
-			width: 100%;
-		}
-	}
-</style>

+ 0 - 64
components/introductionToTheExperiment/introductionToTheExperiment.vue

@@ -1,64 +0,0 @@
-<template>
-	<!-- 实验简介 -->
-	<view class="df jcc aic myComRoot">
-		<view class="df content-box jcsb">
-			<view v-for="(item,i) in btn1List" :key="i" class="df jcc aic fdc btn1-box" @click="onClick_Btn1(i)">
-				<view class="btn1-icon">
-					<img :src="item.src"></img>
-				</view>
-				<view class="btn1-text">{{item.text}}</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import TopMenu from '../../components/topMenu.vue'
-	export default {
-		components: {
-			TopMenu,
-		},
-		onLoad() {
-
-		},
-		data() {
-			return {
-				btn1List: [{
-						"src": require("../../assets/topMenu/preludePreparation.png"),
-						"text": "评审账号"
-					},
-					{
-						"src": require("../../assets/topMenu/learningAndExperiment.png"),
-						"text": "快速进入实验"
-					},
-					{
-						"src": require("../../assets/topMenu/testAndResult.png"),
-						"text": "实验概述"
-					},
-					{
-						"src": require("../../assets/topMenu/testAndResult.png"),
-						"text": "使用环境/技术架构"
-					},
-					{
-						"src": require("../../assets/topMenu/testAndResult.png"),
-						"text": "实验简介视频"
-					},
-				],
-			}
-		},
-		methods: {
-			onClick_Btn1(index){
-				this.$emit("onClick_Btn1",index);
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	$btnN:5;
-
-	.content-box {
-		width: px2vw(312*$btnN+34*(($btnN)-1));
-		height: px2vw(367);
-	}
-</style>

+ 0 - 114
components/introductionToTheExperiment/syjj_second.vue

@@ -1,114 +0,0 @@
-<template>
-	<!-- 实验简介二级 -->
-	<view class="myComRoot df jcc syjj-root">
-		<view class="syjj-body" v-for="(page,pageI) in data_SYJJ" v-show="checkedIndex_second==pageI">
-			<!-- 标题 -->
-			<view class="titleBox df fdr jcc" v-show="data_SYJJ[checkedIndex_second].page.length>1">
-				<view v-for="(item,i) in data_SYJJ[checkedIndex_second].page" :key="i" @click="onTitleClick(i)" class="df fdc aic jcc title-item"
-				 :style="{color:checkedIndex_bodyTitle==i?checkedColor:unCheckedColor_text,
-			 borderColor:checkedIndex_bodyTitle==i?checkedColor:unCheckedColor_border,
-			 borderLeftStyle:checkedIndex_bodyTitle==i-1?'none':((i!=0&&checkedIndex_bodyTitle!=i)?'none':'solid'),
-			 borderRightStyle:checkedIndex_bodyTitle==i+1?'none':'solid'}">
-					{{item.title}}
-				</view>
-			</view>
-			<!-- 内容 -->
-			<view class="df fdc">
-				<view class="syjj-content" v-for="(content,contentI) in data_SYJJ[checkedIndex_second].page[checkedIndex_bodyTitle].content" :key="contentI">
-					<!-- 文字 -->
-					<view v-show="content.type=='text'">
-						<text v-for="(text,textI) in content.textList" :key="textI" :class="'syjj-text-'+text.textType">
-							{{text.text}}
-						</text>
-					</view>
-					<!-- 图片 -->
-					<view class="syjj-pic" v-show="content.type=='pic'">
-						<img :src="content.src"></img>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	// import '../../assets/myData/mydata_SYJJ.js';
-	export default {
-		data() {
-			return {
-				checkedIndex_second: 0, //二级页面选择、外部调用:如,评审账号、快速进入实验等
-				checkedIndex_bodyTitle: 0, //正文小标题选择
-
-
-				//以下为静态
-				data_SYJJ: [
-					myData_SYJJ_PSZH, //评审账号
-					myData_SYJJ_KSJRSY, //快速进入实验
-					myData_SYJJ_SYGS, //实验概述
-					myData_SYJJ_SYHJYJSGJ, //使用环境与技术构架
-					myData_SYJJ_XMJJSP //项目简介视频
-				],
-				checkedColor: "#EA252C",
-				unCheckedColor_text: "#0E0E0E",
-				unCheckedColor_border: "#C4C4C4",
-			}
-		},
-		methods: {
-			// initData(){
-			// 	this.checkedIndex_second=0;
-			// 	this.checkedIndex_bodyTitle=0;
-			// },
-			onTitleClick(index) {
-				this.checkedIndex_bodyTitle = index
-				// console.log("***", this.data_SYJJ[this.checkedIndex_second][this.checkedIndex_bodyTitle].content.src.type);
-			},
-			showPage(pageIndex) {
-				// console.log("切换页面", pageIndex);
-				this.checkedIndex_second = pageIndex;
-				this.checkedIndex_bodyTitle = 0;
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.syjj-root{
-		background: #FFFFFF;
-		box-shadow: 3px 0px 6px 0px rgba(0, 0, 0, 0.1);
-	}
-	.syjj-body {
-		width: px2vw(1789);
-		margin-bottom: px2vw(63);
-	}
-
-	.titleBox {
-		margin-top: px2vw(63);
-		margin-bottom: px2vw(63);
-	}
-
-	.title-item {
-		font-size: px2vw(20);
-		padding: px2vw(15) px2vw(56) px2vw(15) px2vw(56);
-		border: 1px solid;
-	}
-	.syjj-content{
-		margin-top: px2vw(34);
-	}
-	.syjj-content text{
-		font-size: px2vw(22);
-		line-height: px2vw(46);
-	}
-
-	.syjj-text-nor{
-		color: #020202;
-	}
-	.syjj-text-dif{
-		color: #EA252C;
-	}
-	.syjj-text-link{
-		color: #EA252C;
-	}
-	.syjj-pic img {
-		max-width: 100%;
-	}
-</style>

+ 0 - 62
components/learningProcess/learningProcess.vue

@@ -1,62 +0,0 @@
-<template>
-	<!-- 学习流程 -->
-	<view class="df jcc aic myComRoot">
-		<view class="df content-box jcsb">
-			<view v-for="(item,i) in btn1List" :key="i" class="df jcc aic fdc btn1-box">
-				<view class="btn1-icon">
-					<img :src="item.src"></img>
-				</view>
-				<view class="btn1-text">{{item.text}}</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import TopMenu from '../../components/topMenu.vue'
-	export default {
-		components: {
-			TopMenu,
-		},
-		onLoad() {
-
-		},
-		data() {
-			return {
-				btn1List: [{
-						"src": require("../../assets/topMenu/preludePreparation.png"),
-						"text": "原理认知"
-					},
-					{
-						"src": require("../../assets/topMenu/learningAndExperiment.png"),
-						"text": "实景勘察"
-					},
-					{
-						"src": require("../../assets/topMenu/testAndResult.png"),
-						"text": "虚拟技术搭建"
-					},
-					{
-						"src": require("../../assets/topMenu/testAndResult.png"),
-						"text": "虚拟艺术创作"
-					},
-					{
-						"src": require("../../assets/topMenu/testAndResult.png"),
-						"text": "虚拟资源库建设"
-					},
-				],
-			}
-		},
-		methods: {
-
-		}
-	}
-</script>
-
-<style lang="scss">
-	$btnN:5;
-
-	.content-box {
-		width: px2vw(312*$btnN+34*(($btnN)-1));
-		height: px2vw(367);
-	}
-</style>

+ 0 - 64
components/login/chooseRole.vue

@@ -1,64 +0,0 @@
-<template>
-	<view class="df jcc fdc">
-		<view class="login-righttitle">请选择角色</view>
-		<view class="df jcc aic chooseBox">
-			<view class="df aic fdc">
-				<view>
-					<img src="../../assets/login/loginPic2.png" />
-				</view>
-				<view class="chooseRole-btn-checked chooseRole-btn" @click="onChooseTClick">我是老师</view>
-			</view>
-			<view class="df aic fdc role-stu-box">
-				<view>
-					<img src="../../assets/login/loginPic3.png" />
-				</view>
-				<view class="chooseRole-btn-checked chooseRole-btn" @click="onChooseSClick">我是学生</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		methods: {
-			onChooseTClick() {
-				this.$emit("onChoose", "T")
-			},
-			onChooseSClick() {
-				this.$emit("onChoose", "S")
-			}
-		}
-	}
-</script>
-
-<style>
-	.chooseBox {
-		margin-top: 8vw;
-	}
-
-	.role-stu-box {
-		margin-left: 5.2vw;
-	}
-	.chooseRole-btn{
-		width: 12vw;
-		height: 3.12vw;
-		border-radius: 10px;
-		font-size: 1.15vw;
-		font-family: MicrosoftYaHei;
-		line-height: 1.5vw;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		margin-top: 3.43vw;
-	}
-
-	.chooseRole-btn-unchecked {
-		background: #F4F4F4;
-		color: #626262;
-	}
-
-	.chooseRole-btn-checked {
-		background: #EA252C;
-		color: #FFFFFF;
-	}
-</style>

+ 20 - 20
components/login/login.vue

@@ -10,28 +10,28 @@
 			</view>
 			<!-- 中间竖线 -->
 			<view class="login-middleline"></view>
-			<ChooseRole v-show="visibleChooseRole" v-on:onChoose="onChoose"></ChooseRole>
+			<!-- <ChooseRole v-show="visibleChooseRole" v-on:onChoose="onChoose"></ChooseRole> -->
 			<LoginByPWD class="showborder" v-show="visibleLoginByPWD" v-on:onLogin="onLogin" v-on:onForget="onForget"></LoginByPWD>
-			<ResetPWD v-show="visibleResetPWD" v-on:onLogin="onLogin"></ResetPWD>
+			<!-- <ResetPWD v-show="visibleResetPWD" v-on:onLogin="onLogin"></ResetPWD> -->
 		</view>
 	</view>
 </template>
 
 <script>
-	import ChooseRole from './chooseRole.vue'
+	// import ChooseRole from './chooseRole.vue'
 	import LoginByPWD from './loginByPWD.vue'
-	import ResetPWD from './resetPWD.vue'
+	// import ResetPWD from './resetPWD.vue'
 	export default {
 		components: {
-			ChooseRole,
+			// ChooseRole,
 			LoginByPWD,
-			ResetPWD
+			// ResetPWD
 		},
 		data() {
 			return {
-				visibleChooseRole: false,
+				// visibleChooseRole: false,
 				visibleLoginByPWD: true,
-				visibleResetPWD: false,
+				// visibleResetPWD: false,
 				//当前登录类型T教师S学生
 				roleType: '',
 			}
@@ -40,20 +40,20 @@
 			onLogin: function() {
 				// console.log("登录成功login");
 				this.$emit("onLogin");
-				this.visibleChooseRole = false;
+				// this.visibleChooseRole = false;
 				this.visibleLoginByPWD = false;
-				this.visibleResetPWD = false;
+				// this.visibleResetPWD = false;
 			},
-			onChoose(type) {
-				console.log("onChoose", type)
-				this.roleType = type;
-				this.visibleChooseRole = false;
-				this.visibleLoginByPWD = true;
-			},
-			onForget() {
-				this.visibleLoginByPWD = false;
-				this.visibleResetPWD = true;
-			}
+			// onChoose(type) {
+			// 	console.log("onChoose", type)
+			// 	this.roleType = type;
+			// 	this.visibleChooseRole = false;
+			// 	this.visibleLoginByPWD = true;
+			// },
+			// onForget() {
+			// 	this.visibleLoginByPWD = false;
+			// 	this.visibleResetPWD = true;
+			// }
 		}
 	}
 </script>

+ 1 - 18
components/login/loginByPWD.vue

@@ -19,26 +19,9 @@
 				<input @focus="inputFocus" class="loginByPWD-inputbox-input" type="password" placeholder="密码" @input="onPWDInput" />
 			</view>
 			<!-- 横线 -->
-			<view class="loginByPWD-line"></view>
-			<!-- 支持使用实验空间账号登录 -->
-			<!-- <view class="df aic loginByPWD-tip1box">
-				<view class="loginByPWD-tip1box-checkbox df aic">
-					<img src="../../assets/login/loginIcon5.png" />
-				</view>
-				<view class="loginByPWD-tip1box-tip">支持使用实验空间账号登录</view>
-			</view> -->
-			<!-- 评审账号和密码 -->
-			<!-- <view class="df loginByPWD-tip2box">
-				<view class="loginByPWD-tip2box-account">评审账号:teststudent01</view>
-				<view class="loginByPWD-tip2box-pwd">密码:qgsTest002</view>
-			</view> -->
+			<view class="loginByPWD-line"></view>		
 			<!-- 登录按钮 -->
 			<view class="loginByPWD-loginbtn df jcc aic btn-hover" @click="onLogin">登录</view>
-			<!-- 注册账号忘记密码 -->
-			<!-- <view class="df fdr loginByPWD-registerOrForgetBox">
-				<a :href="regURL" class="loginByPWD-register">注册实验空间账号</a>
-				<view class="loginByPWD-forget" @click="onForget">忘记密码</view>
-			</view> -->
 			<view :style="{'opacity': isShowTip}" class="loginByPWD-failTip df jcc">登录失败!请查看账号及密码是否正确!</view>
 		</view>
 	</view>

+ 0 - 188
components/login/resetPWD.vue

@@ -1,188 +0,0 @@
-<template>
-	<view class="df jcc fdc">
-		<view class="login-righttitle">重置密码</view>
-		<view class="fdc df jcc resetPWD-listbox">
-			<!-- 手机号 -->
-			<view class="df resetPWD-inputbox aic">
-				<view class="resetPWD-inputbox-icon">
-					<img class="df" src="../../assets/login/loginIcon4.png" />
-				</view>
-				<input @input="onPhoneNumInput" class="resetPWD-inputbox-input" type="text" placeholder="手机号" />
-			</view>
-			<!-- 横线 -->
-			<view class="resetPWD-line"></view>
-			<!-- 验证码 -->
-			<view class="df resetPWD-inputbox aic">
-				<view class="resetPWD-inputbox-icon">
-					<img class="df" src="../../assets/login/loginIcon6.png" />
-				</view>
-				<input @input="onCodeInput" class="resetPWD-inputbox-input" type="text" placeholder="验证码" />
-				<view class="resetPWD-sendcodebtn df jcc aic">获取验证码</view>
-			</view>
-			<!-- 横线 -->
-			<view class="resetPWD-line"></view>
-			<!-- 新密码 -->
-			<view class="df resetPWD-inputbox aic">
-				<view class="resetPWD-inputbox-icon">
-					<img class="df" src="../../assets/login/loginIcon1.png" />
-				</view>
-				<input @input="onNewPWDInput" class="resetPWD-inputbox-input" type="password" placeholder="新密码:6-16位字符,包含字母和数字" />
-			</view>
-			<!-- 横线 -->
-			<view class="resetPWD-line"></view>
-			<!-- 登录按钮 -->
-			<view class="resetPWD-loginbtn df jcc aic btn-hover" @click="onLogin">登录</view>
-			<!-- 注册账号 -->
-			<view class="df fdr resetPWD-registerOrForgetBox  jcc aic">
-				<a :href="regURL" class="loginByPWD-register">注册实验空间账号</a>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				phoneNum: '',
-				code:'',
-				newPassword: '',
-				regURL: 'http://www.ilab-x.com/register',
-			}
-		},
-		methods: {
-			onPhoneNumInput: function(event) {
-				this.phoneNum = event.target.value
-			},
-			onCodeInput: function(event) {
-				this.code = event.target.value
-			},
-			onNewPWDInput: function(event) {
-				this.newPassword = event.target.value
-			},
-			onLogin: function(type) {
-				// this.$emit("onLogin", "onLogin")
-				this.findUser();
-				
-				// let url = "http://39.105.166.141:8085/user/addusers";
-				// uni.request({
-				// 	header: {
-				// 		'Content-Type': 'application/json;charset=UTF-8'
-				// 	},
-				// 	url: url,
-				// 	method: 'POST',
-				// 	data: {
-				// 		"IlabAccount": this.account,
-				// 		"Password": this.password
-				// 	},
-				// 	dataType: 'json',
-				// 	success: (res) => {
-				// 		// let data = res.data;
-				// 		// //登录成功
-				// 		// if (data.Code == 100) {
-				// 		// 	this.$emit("onLogin")
-				// 		// }
-				// 		// //密码错误
-				// 		// else {
-				// 		// 	this.isShowTip=1;
-				// 		// }
-				// 		console.log("success+++**+*", res)
-				// 	},
-				// 	fail: (res) => {
-				// 		console.log("fail+**+*", res)
-				// 	}
-				// });
-			},
-			findUser(){
-				console.log(this.phoneNum);
-				let url = "http://39.105.166.141:8085/user/finduser";
-				uni.request({
-					header: {
-						'Content-Type': 'application/json;charset=UTF-8'
-					},
-					url: url,
-					method: 'POST',
-					data: {
-						"IlabAccount": this.phoneNum,
-					},
-					dataType: 'json',
-					success: (res) => {
-						let data = res.data;
-						if (data.Code == 100) {
-							// this.$emit("onLogin")
-							console.log("userinfo",data);
-						}
-						else {
-							// this.isShowTip=1;
-							console.log("用户未注册");
-						}
-						console.log("success+++**+*", res)
-					},
-					fail: (res) => {
-						console.log("fail+**+*", res)
-					}
-				});
-			}
-		}
-	}
-</script>
-
-<style>
-	.resetPWD-listbox {
-		margin-top: 2.19vw;
-	}
-
-	.resetPWD-inputbox {
-		margin-top: 2.5vw;
-	}
-
-	.resetPWD-inputbox-icon {
-		margin-left: 0.47vw;
-	}
-
-	.resetPWD-inputbox-input {
-		font-size: 1.04vw;
-		border: none;
-		margin-left: 1.25vw;
-		flex-grow: 1;
-	}
-
-	.resetPWD-line {
-		margin-top: 0.73vw;
-		width: 23.54vw;
-		height: 0.104vw;
-		background-color: #E6E6E6;
-	}
-
-	.resetPWD-sendcodebtn {
-		width: 5.26vw;
-		height: 1.979vw;
-		background: #F4F4F4;
-		border-radius: 7px;
-		font-size: 0.729vw;
-		font-family: MicrosoftYaHei;
-		color: #999999;
-		line-height: 0.989vw;
-	}
-
-	.resetPWD-loginbtn {
-		height: 3.125vw;
-		font-size: 0.989vw;
-		font-family: MicrosoftYaHei;
-		line-height: 1.302vw;
-		margin-top: 2.083vw;
-		border-radius: 8px;
-	}
-
-	.resetPWD-registerOrForgetBox {
-		margin-top: 1.56vw;
-		font-size: 0.78vw;
-		font-family: MicrosoftYaHei;
-		color: #EA252C;
-		line-height: 1.04vw;
-	}
-
-	.resetPWD-register {
-		margin-left: 2px;
-	}
-</style>

+ 0 - 243
components/startLearning/learningAndExperiment/ksxx_xxysy_ylrz/ksxx_xxysy_ylrz.vue

@@ -1,243 +0,0 @@
-<template>
-	<!-- 原理认知 -->
-	<view class="myComRoot ylrz-box df fdr">
-		<!-- 左边导航栏 -->
-		<view class="leftBox">
-			<view class="df fdc leftMenu" v-for="(menu1,i) in btnList" :key="i">
-				<view class="leftMenu-btn1 df fdr aic jcsb" @click="onLeftBtn1Click(i)">
-					<view class=" df fdr aic ">
-						<view class="leftMenu-btn1-icon df">
-							<img :src="menu1.icon_btn1_unchecked"></img>
-						</view>
-						<view class="leftMenu-btn1-text" :style="{color:color_unchecked_01}">{{menu1.text}}</view>
-					</view>
-					<view class="leftMenu-btn1-arrow df">
-						<img :src="arrowSrc"></img>
-					</view>
-				</view>
-				<view class="leftMenu-btn2-box2 df fdr aic" v-for="(menu2,m) in menu1.list" :key="m" @click="onLeftBtn2Click(i,m)">
-					<view class="leftMenu-btn2-icon df">
-						<img :src="(checkedIndex1==i&& checkedIndex2==m)?icon_btn2_checked:icon_btn2_unchecked"></img>
-					</view>
-					<view class="leftMenu-btn2-text" :style="{color:(checkedIndex1==i&& checkedIndex2==m)?color_checked:color_unchecked_02}">{{menu2}}</view>
-				</view>
-			</view>
-		</view>
-		<!-- 右边详情页 -->
-		<view class="rightBox">
-			<!-- 学习知识点 -->
-			<view class="right-content df fdc" v-show="checkedIndex1==0">
-				<view v-for="(content,n) in myData_YLRZ_ZSD[checkedIndex2].content" :key="n">
-					<view class="right-title df aic" v-show="content.type=='title'">
-						<view class="right-title-line"></view>
-						<view class="right-title-text">{{content.details}}</view>
-					</view>
-					<view class="right-text" v-show="content.type=='text'">{{content.details}}</view>
-					<view class="right-pic df" v-show="content.type=='pic'">
-						<img :src="content.src"></img>
-					</view>
-					<view class="right-space" v-show="content.type=='space'"></view>
-				</view>
-				<view class="df jcc">
-					<view class="right-btn-next df aic jcc" @click="onClick_next">下一步</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				isShow: false,
-				checkedIndex1: 0,
-				checkedIndex2: 0,
-
-				// ------以下为静态
-				arrowSrc: require('../../../../assets/learning/icon_ylrz_arrow.png'),
-				btnList: [{
-						"text": '学习知识点',
-						"icon_btn1_checked": require('../../../../assets/learning/icon_ylrz_menu_02.png'),
-						"icon_btn1_unchecked": require('../../../../assets/learning/icon_ylrz_menu_01.png'),
-						"list": ['课程地图及知识点位置', '知识点:虚拟纸片流程:', '知识点:虚拟引擎', '知识点:影视现场实时特效']
-					},
-					{
-						"text": '测验(完成获得10分)',
-						"icon_btn1_checked": require('../../../../assets/learning/icon_ylrz_menu_02.png'),
-						"icon_btn1_unchecked": require('../../../../assets/learning/icon_ylrz_menu_01.png'),
-						"list": ['测验']
-					},
-					{
-						"text": '结论',
-						"icon_btn1_checked": require('../../../../assets/learning/icon_ylrz_menu_02.png'),
-						"icon_btn1_unchecked": require('../../../../assets/learning/icon_ylrz_menu_01.png'),
-						"list": ['结论']
-					}
-				],
-				icon_btn2_checked: require('../../../../assets/learning/icon_ylrz_menu_02.png'),
-				icon_btn2_unchecked: require('../../../../assets/learning/icon_ylrz_menu_01.png'),
-				color_checked: '#EA252C',
-				color_unchecked_01: '#070707', //1级菜单
-				color_unchecked_02: '#555555', //2级菜单
-				myData_YLRZ_ZSD: [
-					YLRZ_ZSD_01,
-					YLRZ_ZSD_02,
-					YLRZ_ZSD_03,
-					YLRZ_ZSD_04
-				]
-			}
-		},
-		methods: {
-			initData() {
-				// this.checkedIndex1 = 0;
-				// this.checkedIndex2 = 0;
-			},
-			onLeftBtn1Click(index) {
-				if (index != this.checkedIndex1) {
-					this.checkedIndex2 = 0;
-					this.checkedIndex1 = index;
-				}
-			},
-			onLeftBtn2Click(index1, index2) {
-				this.checkedIndex1 = index1;
-				this.checkedIndex2 = index2;
-			},
-			onClick_next() {
-				if (this.checkedIndex2 < this.btnList[this.checkedIndex1].list.length - 1) {
-					this.checkedIndex2 += 1;
-				} else {
-					if (this.checkedIndex1 + 1 < this.btnList.length) {
-						this.checkedIndex1 += 1;
-						this.checkedIndex2 = 0;
-					} else {
-						// 先空着
-					}
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.ylrz-box {
-		background: #F4F4F4;
-	}
-
-	.leftBox {
-		background-color: #FFFFFF;
-		width: px2vw(374);
-		height: 100%;
-		box-shadow: px2vw(3) 0px px2vw(6) 0px rgba(0, 0, 0, 0.1);
-		margin-top: px2vw(11);
-	}
-
-	.rightBox {
-		flex: 1;
-		height: 100%;
-		background: #FFFFFF;
-		box-shadow: px2vw(3) 0px px2vw(6) 0px rgba(0, 0, 0, 0.1);
-		margin-top: px2vw(11);
-		margin-left: px2vw(11);
-	}
-
-	.leftMenu-btn1 {
-		width: 100%;
-		height: px2vw(70);
-		background: #F2F2F2;
-	}
-
-	.leftMenu-btn1-icon {
-		margin-left: px2vw(38);
-	}
-
-	.leftMenu-btn1-icon img {
-		width: px2vw(18);
-	}
-
-	.leftMenu-btn1-text {
-		margin-left: px2vw(14);
-		font-size: px2vw(20);
-	}
-
-	.leftMenu-btn2-box1 {
-		margin-top: px2vw(30);
-		margin-bottom: px2vw(30);
-	}
-
-	.leftMenu-btn2-box2 {
-		margin-left: px2vw(48);
-		margin-top: px2vw(25);
-	}
-
-	.leftMenu-btn2-text {
-		margin-left: px2vw(14);
-		font-size: px2vw(20);
-	}
-
-	.leftMenu-btn2-icon img {
-		width: px2vw(16);
-	}
-
-	.leftMenu-btn1-arrow {
-		margin-right: px2vw(38);
-	}
-
-	.leftMenu-btn1-arrow img {
-		width: px2vw(15);
-	}
-
-	.leftMenu {
-		margin-bottom: px2vw(25);
-	}
-
-	.right-content {
-		margin-top: px2vw(40);
-		margin-left: px2vw(50);
-		margin-bottom: px2vw(40);
-		margin-right: px2vw(50);
-	}
-
-	.right-title {}
-
-	.right-title-line {
-		width: px2vw(8);
-		height: px2vw(24);
-		background: #EA252C;
-	}
-
-	.right-title-text {
-		font-size: px2vw(24);
-		margin-left: px2vw(23);
-		color: #070707;
-	}
-
-	.right-text {
-		font-size: px2vw(22);
-		color: #020202;
-		line-height: px2vw(46);
-		margin-top: px2vw(40);
-	}
-
-	.right-space {
-		margin-top: px2vw(50);
-	}
-
-	.right-pic {
-		margin-top: px2vw(40);
-	}
-
-	.right-pic img {
-		max-width: px2vw(1397);
-	}
-
-	.right-btn-next {
-		width: px2vw(200);
-		height: px2vw(58);
-		background: #EA252C;
-		border-radius: px2vw(8);
-		margin-top: px2vw(60);
-		font-size: px2vw(24);
-		color: #FFFFFF;
-	}
-</style>

+ 0 - 103
components/startLearning/learningAndExperiment/learningAndExperiment.vue

@@ -1,103 +0,0 @@
-<template>
-	<!-- 学习与实验 -->
-	<view class="myComRoot df jcc bgclF8">
-		<view class="df fdc contentBox">
-			<!-- 换行的段落文字 -->
-			<view class="df content-paragraph" v-for="(paragraph,i) in data_XXYSY[checkedIndex_topTitle].content.paragraphList"
-			 :key="i">
-				<!-- 不换行文字 -->
-				<view class="contentText">
-					<text v-for="(text,m) in paragraph" :key="m" :style="{color:text.color,fontWeight:text.fontWeight}">
-						{{text.text}}
-					</text>
-				</view>
-			</view>
-			<!-- 媒体文件 -->
-			<view class="contentMedia df jcc">
-				<view v-for="(media,n) in data_XXYSY[checkedIndex_topTitle].content.src.list" :key="n">
-					<img v-show='data_XXYSY[checkedIndex_topTitle].content.src.type=== "image"' :src="media"></img>
-				</view>
-			</view>
-			<!-- 按钮 -->
-			<view class="df jcc">
-				<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==0' @click="onClick_KSRZ">开始认知</view>
-				<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==1'>开始勘察</view>
-				<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==2'>下载客户端</view>
-				<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==3'>下载客户端</view>
-			</view>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				checkedIndex_topTitle: 0, //顶部标题选择
-
-
-				//以下为静态
-				myData_QXZB_SYQY: myData_QXZB_SYQY,
-				data_XXYSY: [
-					myData_XXYSY_YLRZ, //原理认知
-					myData_XXYSY_SJKC, //实景勘察
-					myData_XXYSY_XNJSDJ, //虚拟技术搭建
-					myData_XXYSY_XNYSZZ, //虚拟艺术创作
-					myData_XXYSY_XNZYKJS, //虚拟资源库建设
-				],
-				checkedColor: "#EA252C",
-				unCheckedColor_text: "#0E0E0E",
-				unCheckedColor_border: "#C4C4C4",
-			}
-		},
-		methods: {
-			onTopXXYSYClick(index) {
-				this.checkedIndex_topTitle = index;
-				// console.log("2级点击", index, this.data_XXYSY[index].content);
-				// console.log("***",this.myData_QXZB_SYQY);
-			},
-			onClick_KSRZ(){
-				this.$emit("onClick_KSRZ")
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.contentBox {
-		width: px2vw(1789);
-		margin-top: px2vw(66);
-	}
-
-	.content-paragraph {}
-
-	.contentText {
-		// width: px2vw(1789);
-		font-size: px2vw(22);
-		line-height: px2vw(46);
-	}
-
-	.contentMedia {
-		margin-top: px2vw(66);
-	}
-
-	.contentMedia img {
-		width: px2vw(780);
-		margin-bottom: px2vw(63);
-	}
-
-	// .contentMedia video {
-	// 	width: px2vw(1306);
-	// }
-	.btn-xxysy {
-		width: px2vw(200);
-		height: px2vw(58);
-		background: #EA252C;
-		border-radius: px2vw(8);
-		font-size: px2vw(24);
-		color: #FFFFFF;
-		line-height: px2vw(31);
-		margin-bottom: px2vw(63);
-	}
-</style>

+ 0 - 116
components/startLearning/preludePreparation/preludePreparation.vue

@@ -1,116 +0,0 @@
-<template>
-	<!-- 前序准备df fdc -->
-	<view class="myComRoot df fdc bgclF8">
-		<!-- 标题 -->
-		<view class="titleBox df fdr jcc" v-show="data_QXZB[checkedIndex_topTitle].length>1">
-			<view v-for="(item,i) in data_QXZB[checkedIndex_topTitle]" :key="i" @click="onTitleClick(i)" class="df fdc aic jcc title-item"
-			 :style="{color:checkedIndex_bodyTitle==i?checkedColor:unCheckedColor_text,
-			 borderColor:checkedIndex_bodyTitle==i?checkedColor:unCheckedColor_border,
-			 borderLeftStyle:checkedIndex_bodyTitle==i-1?'none':((i!=0&&checkedIndex_bodyTitle!=i)?'none':'solid'),
-			 borderRightStyle:checkedIndex_bodyTitle==i+1?'none':'solid'}">
-				{{item.text}}
-			</view>
-		</view>
-		<!-- 内容 -->
-		<view class="df aic fdc">
-			<!-- 文字 -->
-			<view class="contentText">
-				<text v-for="(item,i) in data_QXZB[checkedIndex_topTitle][checkedIndex_bodyTitle].content.text" :key="i+1" :style="{color:item.color}">
-					{{item.text}}
-				</text>
-			</view>
-			<!-- 媒体文件 -->
-			<view class="contentMedia">
-				<!-- <img v-show='data_QXZB[checkedIndex_topTitle][checkedIndex_bodyTitle].content.src.type=== "image"' v-for="(item,i) in data_QXZB[checkedIndex_topTitle][checkedIndex_bodyTitle].content.src.list"
-				 :key="i+2" :src="item"></img> -->
-				<!-- <video id="myVideo" src="https://img.cdn.aliyun.dcloud.net.cn/guide/uniapp/%E7%AC%AC1%E8%AE%B2%EF%BC%88uni-app%E4%BA%A7%E5%93%81%E4%BB%8B%E7%BB%8D%EF%BC%89-%20DCloud%E5%AE%98%E6%96%B9%E8%A7%86%E9%A2%91%E6%95%99%E7%A8%8B@20200317.mp4"
-				  enable-danmu danmu-btn controls></video> -->
-				<!-- <video v-show='data_QXZB[checkedIndex_topTitle][checkedIndex_bodyTitle].content.src.type=== "video"' v-for="(item,i) in data_QXZB[checkedIndex_topTitle][checkedIndex_bodyTitle].content.src.list"
-				 :key="i+2" :src="item"></video> -->
-				<view v-for="(item,i) in data_QXZB[checkedIndex_topTitle][checkedIndex_bodyTitle].content.src.list" :key="i+2">
-					<img v-show='data_QXZB[checkedIndex_topTitle][checkedIndex_bodyTitle].content.src.type=== "image"' :src="item"></img>
-					<!-- <video v-show='data_QXZB[checkedIndex_topTitle][checkedIndex_bodyTitle].content.src.type=== "video"' :src="item" id="myVideo" ></video> -->
-				</view>
-			</view>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	// import '../../assets/myData/myData_QXZB.js';
-	export default {
-		data() {
-			return {
-				checkedIndex_topTitle: 0, //顶部标题选择
-				checkedIndex_bodyTitle: 0, //正文小标题选择
-
-
-				//以下为静态
-				// myData_QXZB_SYQY: myData_QXZB_SYQY,
-				data_QXZB: [
-					myData_QXZB_SYQY, //实验前言
-					myData_QXZB_SYLCBZ, //实验流程步骤
-					myData_QXZB_JXYDSP, //教学引导视频
-					myData_QXZB_JCZS, //基础知识
-				],
-				checkedColor: "#EA252C",
-				unCheckedColor_text: "#0E0E0E",
-				unCheckedColor_border: "#C4C4C4",
-
-				scrollTop: 0,
-				old: {
-					scrollTop: 0
-				}
-			}
-		},
-		methods: {
-			// initData(){
-			// 	this.checkedIndex_topTitle=0;
-			// 	this.checkedIndex_bodyTitle=0;
-			// },
-			onTitleClick(index) {
-				this.checkedIndex_bodyTitle = index
-				// console.log("***", this.data_QXZB[this.checkedIndex_topTitle][this.checkedIndex_bodyTitle].content.src.type);
-			},
-			onTopQXZBClick(index) {
-				// console.log("顶部点击",index);
-				this.checkedIndex_topTitle = index;
-				this.checkedIndex_bodyTitle = 0;
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	.titleBox {
-		margin-top: px2vw(63);
-		margin-bottom: px2vw(63);
-	}
-
-	.title-item {
-		font-size: px2vw(20);
-		padding: px2vw(15) px2vw(56) px2vw(15) px2vw(56);
-		border: 1px solid;
-	}
-
-	.contentText {
-		width: px2vw(1789);
-		font-size: px2vw(22);
-		line-height: px2vw(46);
-
-	}
-
-	.contentMedia {
-		margin-top: px2vw(66);
-	}
-
-	.contentMedia img {
-		width: px2vw(780);
-		margin-bottom: px2vw(63);
-	}
-
-	// .contentMedia video {
-	// 	width: px2vw(1306);
-	// }
-</style>

+ 0 - 133
components/startLearning/startLearning.vue

@@ -1,133 +0,0 @@
-<template>
-	<!-- 开始学习 -->
-	<view class="myComRoot df fdc  bgclF8">
-		<view class="df jcc aic fdc firstTitleBox">
-			<view class="df content-box jcsb">
-				<view v-for="(item,i) in btn1List" :key="i" class="df jcc aic fdc btn1-box" @click="onClickBtn1(i)" :style=" {borderColor: current===i?btn1CheckedColor:btn1UncheckedColor, borderWidth: current===i?btn1CheckedPX:btn1UncheckedPX}">
-					<view class="btn1-icon">
-						<img :src="item.src"></img>
-					</view>
-					<view class="btn1-text">{{item.text}}</view>
-				</view>
-			</view>
-		</view>
-		<view class="secondTitleBox df" v-show="current ===0||current ===1">
-			<!-- 前序准备二级QXZB -->
-			<view class="df fdr secondTitleBox2" v-show="current === 0">
-				<view v-for="(item,i) in btn1List[0].list" :key="i"  class="secondTitleBox-item" @click="onQXZB2Click(i)">
-					<view class="secondTitleBox-itemIndex">0{{i+1}}</view>
-					<view class="secondTitleBox-itemText">{{item}}</view>
-				</view>
-			</view>
-			<!-- 学习与实验二级XXYSY -->
-			<view class="df fdr secondTitleBox2" v-show="current === 1">
-				<view v-for="(item,i) in btn1List[1].list" :key="i"  class="secondTitleBox-item" @click="onXXYSY2Click(i)">
-					<view class="secondTitleBox-itemIndex">0{{i+1}}</view>
-					<view class="secondTitleBox-itemText">{{item}}</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import TopMenu from '../../components/topMenu.vue'
-	export default {
-		components: {
-			TopMenu,
-		},
-		onLoad() {
-
-		},
-		data() {
-			return {
-				//0前序准备1学习与实验
-				current: -1,
-				
-				//以下为静态
-				btn1CheckedColor: "#EA252C",
-				btn1CheckedPX: "2px",
-				btn1UncheckedColor: "#C2C2C2",
-				btn1UncheckedPX: "1px",
-
-				btn1List: [{
-						"src": require("../../assets/topMenu/preludePreparation.png"),
-						"text": "前序准备",
-						"list": ["实验前言", "实验流程步骤", "教学引导视频", "基础知识"]
-					},
-					{
-						"src": require("../../assets/topMenu/learningAndExperiment.png"),
-						"text": "学习与实验",
-						"list": ["原理认知", "实景勘察", "虚拟技术搭建", "虚拟艺术创作", "虚拟资源库建设"]
-					},
-					{
-						"src": require("../../assets/topMenu/testAndResult.png"),
-						"text": "测试与结果",
-						"list": []
-					},
-				],
-			}
-		},
-		methods: {
-			initData(){
-				this.current=-1
-			},
-			//大标题
-			onClickBtn1(index) {
-				this.current = index
-			},
-			//前序准备二级
-			onQXZB2Click(index){
-				this.$emit("on2thTitleClick","QXZB-"+index)
-			},
-			//学习与实验二级
-			onXXYSY2Click(index){
-				this.$emit("on2thTitleClick","XXYSY-"+index)
-			},
-			//切换二级选择页,如:切换为“学习与实验”的展开页
-			switchSecondTitle(index){
-				this.current=index;
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	$btnN:3;
-
-	.content-box {
-		width: px2vw(312*$btnN+67*(($btnN)-1));
-		height: px2vw(367);
-	}
-	.firstTitleBox{
-		flex: 1;
-	}
-
-	.secondTitleBox {
-		width: 100%;
-		height: 37%;
-		background: #FFFFFF;
-		box-shadow: 3px 0px 6px 0px rgba(0, 0, 0, 0.1);
-		// margin-top: px2vw(120);
-	}
-
-	.secondTitleBox2 {
-		margin-left: px2vw(395);
-		margin-top: px2vw(92);
-	}
-
-	.secondTitleBox-item {
-		margin-right: px2vw(92);
-	}
-
-	.secondTitleBox-itemIndex {
-		font-size: px2vw(28);
-		color: #B4B4B4;
-	}
-
-	.secondTitleBox-itemText {
-		font-size: px2vw(26);
-		color: #323232;
-		margin-top: px2vw(17);
-	}
-</style>

+ 3 - 3
main.js

@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import App from './App'
 // 引入路由
-import router from "./router.js"    // import router 的router 一定要小写, 不要写成Router, 否则报 can't match的报错
+// import router from "./router.js"    // import router 的router 一定要小写, 不要写成Router, 否则报 can't match的报错
 
 Vue.config.productionTip = false
 
@@ -10,7 +10,7 @@ App.mpType = 'app'
 const app = new Vue({
     ...App,
 	// el: '#app',
-	router,  // 注入到根实例中
+	// router,  // 注入到根实例中
 })
 app.$mount()
 
@@ -22,4 +22,4 @@ import './myData/myData_QXZB.js';
 import './myData/myData_XXYSY.js';
 import './myData/myData_XXYSY_YLRZ.js';
 import './myData/myData_SYJJ.js';
-import './request.js';
+// import './request.js';

+ 1 - 61
pages.json

@@ -1,29 +1,5 @@
 {
-	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
-		// {
-		// 	"path": "pages/test/test6",
-		// 	"style": {
-		// 		"app-plus": {
-		// 			"titleNView": false
-		// 		}
-		// 	}
-		// },
-		// {
-		// 	"path": "pages/home",
-		// 	"style": {
-		// 		"app-plus": {
-		// 			"titleNView": false
-		// 		}
-		// 	}
-		// },
-		{
-			"path": "pages/startLearning/startLearning",
-			"style": {
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
+	"pages": [
 		{
 			"path": "pages/login/login",
 			"style": {
@@ -31,42 +7,6 @@
 					"titleNView": false
 				}
 			}
-		},
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "uni-app"
-			}
-		},
-		{
-			"path": "pages/test/test",
-			"style": {
-				"navigationBarTitleText": "test"
-			}
-		},
-		{
-			"path": "pages/test/test2",
-			"style": {
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/test/test3",
-			"style": {
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/test/test4",
-			"style": {
-				"app-plus": {
-					"titleNView": false
-				}
-			}
 		}
 	],
 	"globalStyle": {

+ 0 - 148
pages/index/index.vue

@@ -1,148 +0,0 @@
-<template>
-	<view class="content">
-		<image class="logo" src="/static/logo.png"></image>
-		<view class="text-area">
-			<text class="title">{{title}}</text>
-		</view>
-		<view>
-			<input id="myInput" type="text" v-model="funName" placeholder="请输入方法名" />
-			<button id="btnCheck" @click="funCheck">验证</button>
-		</view>
-		<button @click="btnTestClick">toTest</button>
-		<view id="iframeView">
-			<iframe :src="iframeSRC" id="myIframe">该浏览器不支持 iframe 标签</iframe>
-		</view>
-		<view id="routerTest">
-			<view>
-				<router-link to="../test/test2">test2</router-link>
-			</view>
-			<view>
-				<router-view></router-view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		components: {
-		},
-		data() {
-			return {
-				title: 'Hello',
-				funName: '',
-				myHost: 'http://39.105.166.141:8085',
-				webviewStyles: {
-					progress: {
-						color: '#FF3333'
-					}
-				},
-				iframeSRC: '#pages/test/test2'
-			}
-		},
-		onLoad() {
-			// uni.redirectTo({
-			// 	url:"../test/StartLearning"
-			// })
-		},
-		mounted() {
-			window.addEventListener('message', event => {
-				let data = event.data;
-				console.log(data);
-				if (data.cmd === 'jump') {
-					console.log("-----------jump111");
-					// this.iframeSRC = '#pages/test/test3';
-					// this.iframeSRC = '#pages/index/index';
-					this.iframeSRC = 'https://www.baidu.com';
-				} else if (data.cmd === 'jump2') {
-					console.log("-----------jump222");
-					this.iframeSRC = '#pages/test/test2';
-					// this.iframeSRC = 'https://www.baidu.com';
-				} else {
-					console.log("***********notjump");
-				}
-			})
-		},
-		methods: {
-			funCheck() {
-				console.log(this.funName)
-				this.testPOST();
-			},
-			testPOST() {
-				let url = "http://39.105.166.141:8085/user/loginin";
-				uni.request({
-					header: {
-						// 'Content-Type': 'application/x-www-form-urlencoded'
-						'Content-Type': 'application/json'
-					},
-					url: url,
-					method: 'POST',
-					data: {
-						"IlabAccount": "teststudent01",
-						"Password": "qgsTest002"
-					},
-					dataType: 'json',
-					success: (res) => {
-						// var result = JSON.parse(res);
-						console.log("success***", res)
-					},
-					fail: (res) => {
-						console.log("fail***", res)
-					}
-				});
-			},
-			btnTestClick() {
-				uni.navigateTo({
-					url: '/pages/test/test',
-				});
-			},
-		}
-	}
-</script>
-
-<style>
-	.content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.logo {
-		height: 200rpx;
-		width: 200rpx;
-		margin-top: 200rpx;
-		margin-left: auto;
-		margin-right: auto;
-		margin-bottom: 50rpx;
-	}
-
-	.text-area {
-		display: flex;
-		justify-content: center;
-	}
-
-	.title {
-		font-size: 36rpx;
-		color: #8f8f94;
-	}
-
-	#myInput {
-		border: #007AFF 1rpx solid;
-	}
-
-	#iframeView {
-		margin-top: 20rpx;
-	}
-
-	#myIframe {
-		border: none;
-	}
-
-	#routerTest {
-		width: 500rpx;
-		height: 200rpx;
-		border: #aa00ff 1rpx solid;
-		flex-direction: row;
-	}
-</style>

+ 20 - 20
pages/login/login.vue

@@ -14,9 +14,9 @@
 				</view>
 				<!-- 中间竖线 -->
 				<view class="login-middleline"></view>
-				<ChooseRole v-show="visibleChooseRole" v-on:onChoose="onChoose"></ChooseRole>
+				<!-- <ChooseRole v-show="visibleChooseRole" v-on:onChoose="onChoose"></ChooseRole> -->
 				<LoginByPWD class="showborder" v-show="visibleLoginByPWD" v-on:onLogin="onLogin" v-on:onForget="onForget"></LoginByPWD>
-				<ResetPWD v-show="visibleResetPWD" v-on:onLogin="onLogin"></ResetPWD>
+				<!-- <ResetPWD v-show="visibleResetPWD" v-on:onLogin="onLogin"></ResetPWD> -->
 			</view>
 		</view>
 	</view>
@@ -24,22 +24,22 @@
 
 <script>
 	import TopMenu from '../../components/topMenu.vue'
-	import ChooseRole from '../../components/login/chooseRole.vue'
+	// import ChooseRole from '../../components/login/chooseRole.vue'
 	import LoginByPWD from '../../components/login/loginByPWD.vue'
-	import ResetPWD from '../../components/login/resetPWD.vue'
+	// import ResetPWD from '../../components/login/resetPWD.vue'
 	export default {
 		components: {
 			TopMenu,
-			ChooseRole,
+			// ChooseRole,
 			LoginByPWD,
-			ResetPWD
+			// ResetPWD
 		},
 		data() {
 			return {
 				visibleLogin:true,
-				visibleChooseRole: true,
+				// visibleChooseRole: true,
 				visibleLoginByPWD: false,
-				visibleResetPWD: false,
+				// visibleResetPWD: false,
 				//当前登录类型T教师S学生
 				roleType: '',
 			}
@@ -49,21 +49,21 @@
 				console.log("登录成功", this.roleType, this.$refs.TopMenu.str);
 				console.log("登陆成功2",topMenuS.ksxx);
 				this.$refs.TopMenu.switchState(topMenuS.syjj);
-				this.visibleChooseRole = false;
+				// this.visibleChooseRole = false;
 				this.visibleLoginByPWD = false;
-				this.visibleResetPWD = false;
+				// this.visibleResetPWD = false;
 				this.visibleLogin = false;
 			},
-			onChoose(type) {
-				console.log("onChoose", type)
-				this.roleType = type;
-				this.visibleChooseRole = false;
-				this.visibleLoginByPWD = true;
-			},
-			onForget() {
-				this.visibleLoginByPWD = false;
-				this.visibleResetPWD = true;
-			}
+			// onChoose(type) {
+			// 	console.log("onChoose", type)
+			// 	this.roleType = type;
+			// 	this.visibleChooseRole = false;
+			// 	this.visibleLoginByPWD = true;
+			// },
+			// onForget() {
+			// 	this.visibleLoginByPWD = false;
+			// 	this.visibleResetPWD = true;
+			// }
 		}
 	}
 </script>

+ 0 - 56
pages/startLearning/startLearning.vue

@@ -1,56 +0,0 @@
-<template>
-	<view class="mybody bgclF8 df fdc">
-		<TopMenu ref="TopMenu"></TopMenu>
-		<view class="df jcc aic content">
-			<view class="df content-box jcsb">
-				<view v-for="(item,i) in btn1List" :key="i" class="df jcc aic fdc btn1-box">
-					<view class="btn1-icon">
-						<img :src="item.src"></img>
-					</view>
-					<view class="btn1-text">{{item.text}}</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import TopMenu from '../../components/topMenu.vue'
-	export default {
-		components: {
-			TopMenu,
-		},
-		onLoad() {
-
-		},
-		data() {
-			return {
-				btn1List: [{
-						"src": require("../../assets/topMenu/preludePreparation.png"),
-						"text": "前序准备"
-					},
-					{
-						"src": require("../../assets/topMenu/learningAndExperiment.png"),
-						"text": "学习与实验"
-					},
-					{
-						"src": require("../../assets/topMenu/testAndResult.png"),
-						"text": "测试与结果"
-					},
-				],
-			}
-		},
-		methods: {
-
-		}
-	}
-</script>
-
-<style lang="scss">
-	$btnN:3;
-
-	.content-box {
-		width: px2vw(312*$btnN+67*(($btnN)-1));
-		height: px2vw(367);
-	}
-</style>

+ 0 - 172
pages/test/test.vue

@@ -1,172 +0,0 @@
-<template>
-	<view class="list_box">
-		<view class="left">
-			<scroll-view scroll-y="true" :style="{ 'height':scrollHeight }">
-				<view class="item" v-for="(item,index) in leftArray" :key="index" :class="{ 'active':index==leftIndex }"
-				 :data-index="index" @tap="leftTap">{{item}}</view>
-			</scroll-view>
-		</view>
-		<view class="main">
-			<swiper class="swiper" :style="{ 'height':scrollHeight }" :current="leftIndex" @change="swiperChange" vertical="true"
-			 duration="300">
-				<swiper-item v-for="(item,index) in mainArray" :key="index">
-					<scroll-view scroll-y="true" :style="{ 'height':scrollHeight }">
-						<view class="item">
-							<view class="title">
-								<view>
-									<a :href="item.url">{{item.title}}</a>
-								</view>
-								<image :src="item.thumbnail_pic_s" style="width: 250rpx; height: 250rpx;margin-left: 6rpx;" mode=""></image>
-								<image :src="item.thumbnail_pic_s02" style="width: 250rpx; height: 250rpx;margin-left: 6rpx;" mode=""></image>
-							</view>
-						</view>
-					</scroll-view>
-				</swiper-item>
-			</swiper>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				scrollHeight: '500px',
-				leftArray: ['生活', '娱乐', '社会'],
-				mainArray: [{
-					"uniquekey": "6c4caa0c3ba6e05e2a272892af43c00e",
-					"title": "杨幂的发际线再也回不去了么?网友吐槽像半秃",
-					"date": "2017-01-05 11:03",
-					"category": "yule",
-					"author_name": "腾讯娱乐",
-					"url": "http://mini.eastday.com/mobile/170105110355287.html?qid=juheshuju",
-					"thumbnail_pic_s": "http://03.imgmini.eastday.com/mobile/20170105/20170105110355_806f4ed3fe71d04fa452783d6736a02b_1_mwpm_03200403.jpeg",
-					"thumbnail_pic_s02": "http://03.imgmini.eastday.com/mobile/20170105/20170105110355_806f4ed3fe71d04fa452783d6736a02b_2_mwpm_03200403.jpeg",
-					"thumbnail_pic_s03": "http://03.imgmini.eastday.com/mobile/20170105/20170105110355_806f4ed3fe71d04fa452783d6736a02b_3_mwpm_03200403.jpeg"
-				}],
-				leftIndex: 0
-			}
-		},
-		onLoad() {
-			/* 设置当前滚动容器的高,若非窗口的高度,请自行修改 */
-			uni.getSystemInfo({
-				success: (res) => {
-					this.scrollHeight = `${res.windowHeight}px`;
-				}
-			});
-		},
-		methods: {
-			/* 左侧导航点击 */
-			leftTap(e) {
-				let index = e.currentTarget.dataset.index;
-				this.leftIndex = Number(index);
-			},
-			/* 轮播图切换 */
-			swiperChange(e) {
-				let index = e.detail.current;
-				this.leftIndex = Number(index);
-			}
-		}
-	}
-</script>
-
-<style >
-	.list_box {
-		display: flex;
-		flex-direction: row;
-		flex-wrap: nowrap;
-		justify-content: flex-start;
-		align-items: flex-start;
-		align-content: flex-start;
-		font-size: 28rpx;
-
-		.left {
-			width: 200rpx;
-			background-color: #f6f6f6;
-			line-height: 80rpx;
-			box-sizing: border-box;
-			font-size: 32rpx;
-
-			.item {
-				padding-left: 20rpx;
-				position: relative;
-
-				&:not(:first-child) {
-					margin-top: 1px;
-
-					&::after {
-						content: '';
-						display: block;
-						height: 0;
-						border-top: #d6d6d6 solid 1px;
-						width: 620upx;
-						position: absolute;
-						top: -1px;
-						right: 0;
-						transform: scaleY(0.5);
-						/* 1px像素 */
-					}
-				}
-
-				&.active,
-				&:active {
-					color: #42b983;
-					background-color: #fff;
-				}
-			}
-		}
-
-		.main {
-			background-color: #fff;
-			padding-left: 20rpx;
-			width: 0;
-			flex-grow: 1;
-			box-sizing: border-box;
-
-			.swiper {
-				height: 500px;
-			}
-
-			.title {
-				line-height: 64rpx;
-				font-size: 24rpx;
-				font-weight: bold;
-				color: #666;
-				background-color: #fff;
-				position: sticky;
-				top: 0;
-				z-index: 999;
-			}
-
-			.item {
-				padding-bottom: 10rpx;
-			}
-
-			.goods {
-				display: flex;
-				flex-direction: row;
-				flex-wrap: nowrap;
-				justify-content: flex-start;
-				align-items: center;
-				align-content: center;
-				margin-bottom: 10rpx;
-
-				&>image {
-					width: 120rpx;
-					height: 120rpx;
-					margin-right: 16rpx;
-				}
-
-				.describe {
-					font-size: 24rpx;
-					color: #999;
-				}
-
-				.money {
-					font-size: 24rpx;
-					color: #efba21;
-				}
-			}
-		}
-	}
-</style>

+ 0 - 39
pages/test/test2.vue

@@ -1,39 +0,0 @@
-<template>
-	<view id="test2">
-		<button @click="postMessage">发送</button>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				str: 'hahaha'
-			}
-		},
-		onLoad() {
-
-		},
-		methods: {
-			postMessage() {
-				window.parent.postMessage({
-					cmd: 'jump',
-					params: {
-						val: 1
-					}
-				},'*')
-			},
-		},
-	}
-</script>
-
-<style>
-	#test2 {
-		width: 300rpx;
-		height: 100rpx;
-		background-color: #4CD964;
-	}
-	#test2 button{
-		color: red;
-	}
-</style>

+ 0 - 39
pages/test/test3.vue

@@ -1,39 +0,0 @@
-<template>
-	<view id="test2">
-		<button @click="postMessage">发送2</button>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				str: 'hahaha'
-			}
-		},
-		onLoad() {
-
-		},
-		methods: {
-			postMessage() {
-				window.parent.postMessage({
-					cmd: 'jump2',
-					params: {
-						val: 1
-					}
-				},'*')
-			},
-		},
-	}
-</script>
-
-<style>
-	#test2 {
-		width: 300rpx;
-		height: 100rpx;
-		background-color: #55aaff;
-	}
-	#test2 button{
-		color: blue;
-	}
-</style>

+ 0 - 207
pages/test/test4.vue

@@ -1,207 +0,0 @@
-<template>
-	<view class="content">
-		<scroll-view scroll-y="true" class="nave-left" :scroll-into-view="scrollToLeft">
-			<view class="scroll">
-				<view class="goods-type" :class="{ isSelect: scrollToLeft === 'idx' + index }" v-for="(val, index) in items" :key="index"
-				 @click="scrollRight(index)" :id="'idx' + index">
-					{{ val.name }}
-				</view>
-			</view>
-		</scroll-view>
-		<scroll-view scroll-y="true" class="nav-right" :scroll-into-view="scrollToRight" scroll-with-animation="" @scroll="scrolling">
-			<view class="scroll">
-				<view class="goods-list" v-for="(val, index) in items" :key="index" :id="'id' + index">
-					<view class="goods-head">{{ val.name }}</view>
-					<view class="goods-body" v-for="(item, idx) in val.children" :key="idx">{{ item.name }}</view>
-				</view>
-			</view>
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'goodsSecond',
-		data() {
-			return {
-				scrollToRight: '',
-				nodeHeight: [],
-				scrollToLeft: 'idx0',
-
-				items: [{
-						name: 'A',
-						children: [{
-								name: 'A1'
-							},
-							{
-								name: 'A2'
-							},
-							{
-								name: 'A3'
-							},
-							{
-								name: 'A1'
-							},
-							{
-								name: 'A2'
-							},
-							{
-								name: 'A3'
-							}
-						]
-					},
-					{
-						name: 'B',
-						children: [{
-								name: 'B1'
-							},
-							{
-								name: 'B2'
-							},
-							{
-								name: 'B3'
-							},
-							{
-								name: 'B1'
-							},
-							{
-								name: 'B2'
-							},
-							{
-								name: 'B3'
-							}
-						]
-					},
-					{
-						name: 'C',
-						children: [{
-								name: 'C1'
-							},
-							{
-								name: 'C2'
-							},
-							{
-								name: 'C3'
-							},
-							{
-								name: 'C1'
-							},
-							{
-								name: 'C2'
-							},
-							{
-								name: 'C3'
-							}
-						]
-					}
-				]
-			};
-		},
-		mounted() {
-			this.getGoodsLsit();
-		},
-		methods: {
-			getGoodsLsit() {
-				let view = uni
-					.createSelectorQuery()
-					.in(this)
-					.selectAll('.goods-list');
-
-				view.boundingClientRect(data => {
-					console.log('得到布局位置信息');
-					this.nodeHeight = data;
-					console.log(data);
-				}).exec();
-			},
-			scrollRight(index) {
-				this.scrollToRight = 'id' + index;
-				this.scrollToLeft = 'idx' + index;
-			},
-			scrolling(e) {
-				this.scrollLeft(Math.ceil(e.detail.scrollTop));
-				console.log(e.detail);
-			},
-			scrollLeft(e) {
-				for (let i = 2; i < this.nodeHeight.length; i++) {
-					if (e > this.nodeHeight[i - 1].top && e < this.nodeHeight[i].top) {
-						this.scrollToLeft = 'idx' + (i - 1);
-					} else if (e > this.nodeHeight[this.nodeHeight.length - 1].top) {
-						this.scrollToLeft = 'idx' + (this.nodeHeight.length - 1);
-					} else if (e < this.nodeHeight[1].top) {
-						this.scrollToLeft = 'idx0';
-						this.scrollToRight = 'id0';
-					}
-					this.scrollToRight = '';
-				}
-			}
-		}
-	};
-</script>
-
-<style>
-	.content {
-		width: 100%;
-		height: 100%;
-		display: flex;
-	}
-
-	.nave-left {
-		width: 187rpx;
-		height: 100%;
-	}
-
-	.nav-right {
-		width: 562rpx;
-		height: 100%;
-	}
-
-	.scroll {
-		width: 100%;
-		height: 100%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-
-	.goods-type {
-		width: 150rpx;
-		height: 80rpx;
-		box-shadow: 0px 4px 7px 1px rgba(206, 148, 5, 0.24);
-		border-radius: 20px;
-
-		display: flex;
-		align-items: center;
-		justify-content: center;
-
-		font-size: 24rpx;
-		font-family: Microsoft YaHei UI;
-		font-weight: 400;
-		color: #a1a1a1;
-	}
-
-	.isSelect {
-		border: 2rpx solid rgb(206, 148, 5);
-	}
-
-	.goods-list {
-		width: 500rpx;
-	}
-
-	.goods-head {
-		width: 500rpx;
-		height: 80rpx;
-		display: flex;
-		align-items: center;
-	}
-
-	.goods-body {
-		width: 500rpx;
-		height: 150rpx;
-
-		display: flex;
-		align-items: center;
-
-		box-shadow: 0px 4px 7px 1px rgba(206, 148, 5, 0.24);
-		border-radius: 20px;
-	}
-</style>

+ 0 - 35
pages/test/test5.vue

@@ -1,35 +0,0 @@
-<template>
-	<view class="box">
-		<view class="column">
-			<span class="item">A</span>
-			<span class="item">A</span>
-		<!-- </view>
-		<view class="column"> -->
-			<span class="item">A</span>
-			<span class="item">A</span>
-		</view>
-	</view>
-</template>
-
-<script>
-</script>
-
-<style>
-/* 	.box {
-		display: flex;
-		flex-wrap: wrap;
-		align-content: space-between;
-	}
-
-	.column {
-		flex-basis: 100%;
-		display: flex;
-		justify-content: space-between;
-	} */
-	.box {
-	  display: flex;
-	  flex-wrap: wrap;
-	  justify-content: flex-end;
-	  align-content: space-between;
-	}
-</style>

+ 0 - 14
pages/test/test6.vue

@@ -1,14 +0,0 @@
-<template class="test6" style="height: 100%;width:100%;background-color: ; #4CD964;">
-	<div class="mybody">11</div>
-</template>
-
-<script>
-</script>
-
-<style>
-	.test6{
-		height: 300px;
-		width:300px;
-		background-color: #4CD964;
-	}
-</style>

+ 2 - 2
router.js

@@ -2,8 +2,8 @@ import Vue from "vue";
 import VueRouter from "vue-router";
 
 // 引入组件
-import login from "./pages/login/login.vue";
-import startLearning from "./pages/startLearning/startLearning.vue";
+// import login from "./pages/login/login.vue";
+// import startLearning from "./pages/startLearning/startLearning.vue";
 
 // 要告诉 vue 使用 vueRouter
 Vue.use(VueRouter);