delete router.js

components/startLearning/learningAndExperiment/learningAndExperiment.vue

@@ -2,6 +2,12 @@
 	<!-- 学习与实验 -->
 	<view class="myComRoot df jcc bgclF8">
 		<view class="df fdc contentBox" v-show='checkedIndex_topTitle!=4'>
+			<!-- 首页大图 -->
+			<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 content-paragraph" v-for="(paragraph,i) in data_XXYSY[checkedIndex_topTitle].content.paragraphList"
 			 :key="i">
@@ -11,13 +17,7 @@
 						{{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>	
 			<!-- 按钮 -->
 			<view class="df jcc">
 				<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==0' @click="onClick_KSRZ">开始认知</view>
@@ -29,16 +29,20 @@
 				<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==3' @click="onClick_download_btn">下载客户端</view>
 				<view class="df aic jcc btn-xxysy" v-show='checkedIndex_topTitle==4'>进入虚拟资源库</view>
 			</view>
+			<downloadInstruction ref="downloadInstruction" v-show='data_XXYSY[checkedIndex_topTitle].content.bShowDownloadInstr'></downloadInstruction>
 		</view>
 		<simulationLibrary ref="simulationLibrary" v-show='checkedIndex_topTitle==4'></simulationLibrary>
+		
 	</view>
 </template>
 
 <script>
 	import simulationLibrary from "../../../components/home/simulationLibrary.vue"
+	import downloadInstruction from "../../../components/startLearning/learningAndExperiment/downloadInstruction.vue"
 	export default {
 		components: {
-			simulationLibrary
+			simulationLibrary,
+			downloadInstruction
 		},
 		data() {
 			return {
@@ -120,17 +124,19 @@
 	}
 
 	.contentMedia {
-		margin-top: px2vw(66);
+		// margin-top: px2vw(66);
+		// border: 1px solid #B4B4B4;
+		// margin-top: 1%;
+		margin-bottom: 5%;
 	}
 
 	.contentMedia img {
-		width: px2vw(780);
-		margin-bottom: px2vw(63);
+		// width: px2vw(780);
+		// margin-bottom: px2vw(63);
+		width: 100%;
+		height: 100%;
 	}
-
-	// .contentMedia video {
-	// 	width: px2vw(1306);
-	// }
+	
 	.btn-xxysy {
 		width: px2vw(200);
 		height: px2vw(58);

components/startLearning/startLearning.vue

@@ -43,30 +43,11 @@
 			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": []
-				// 	},
-				// ],
-
 				btn1List: [{
 						"src": require("../../assets/learning/icon_ksxx_01.png"),
 						"text": "原理认知"

main.js

@@ -1,23 +1,14 @@
 import Vue from 'vue'
 import App from './App'
 // 引入路由
-import router from "./router.js"    // import router 的router 一定要小写， 不要写成Router, 否则报 can't match的报错
-
-// import echarts from 'echarts'
-// Vue.prototype.$echarts = echarts
 
 Vue.config.productionTip = false
 
 App.mpType = 'app'
 
-// Vue.prototype.$Api="http://8.140.128.1:8085"
-// Vue.prototype.$Api="http://39.105.166.141:8085"
-// Vue.prototype.$UserId="1e9c969f-8990-40f2-8a8c-ecbafc5720b2"
 
 const app = new Vue({
     ...App,
-	// el: '#app',
-	router,  // 注入到根实例中
 })
 app.$mount()
 

myData/myData_XXLC.js

@@ -8,7 +8,7 @@ myData_XXLC_YLRZ={
 				"textList":[
 					{
 						"textType":'nor',
-						"text":'1、首先，完成知识点学习。'
+						"text":'1、【进入模块】在开始学习页面，点击“原理认知”，阅读介绍后，点击“开始认知”。'
 					}
 				]
 			},
@@ -19,7 +19,7 @@ myData_XXLC_YLRZ={
 				"textList":[
 					{
 						"textType":'nor',
-						"text":'2、完成测验共计10道选择题。每道题1分。'
+						"text":'2、【学习知识点】根据提示完成知识点学习。'
 					}
 				]
 			},
@@ -30,14 +30,25 @@ myData_XXLC_YLRZ={
 				"textList":[
 					{
 						"textType":'nor',
-						"text":'3、查看测验结果，满分后可点击进入下一个模块学习。有错误请查看错误，并重新测验。'
+						"text":'3、【测验】并进入测验环节。'
 					}
 				]
 			},
+			// {
+			// 	"type":'pic',
+			// 	"src":require("../assets/learning/pic_syjj_01.png")
+			// }
+		],
+		[
 			{
-				"type":'pic',
-				"src":require("../assets/learning/pic_syjj_01.png")
-			}
+				"type":'text',
+				"textList":[
+					{
+						"textType":'nor',
+						"text":'4、【查看结果与重新测验】完成答题后查看测试结果，若有错误可以重新测试。测试结束后，返回到“开始学习”界面。'
+					}
+				]
+			},
 		]
 	]
 }
@@ -51,10 +62,32 @@ myData_XXLC_SJKC={
 				"textList":[
 					{
 						"textType":'nor',
-						"text":'1、实景勘察。'
+						"text":'1、【进入模块】在开始学习页面，点击“实景勘察”，阅读介绍后，点击“开始勘察”。'
 					}
 				]
-			},
+			}
+		],
+		[
+			{
+				"type":'text',
+				"textList":[
+					{
+						"textType":'nor',
+						"text":'2、【实景勘察】在360度真实的摄影棚内，按上下左右或点击相应位置，可以移动。'
+					}
+				]
+			}
+		],
+		[
+			{
+				"type":'text',
+				"textList":[
+					{
+						"textType":'nor',
+						"text":'3、【设备认知】点击相应设备器材，可以认知场景。'
+					}
+				]
+			}
 		]
 	]
 }
@@ -68,11 +101,44 @@ myData_XXLC_XNJSDJ={
 				"textList":[
 					{
 						"textType":'nor',
-						"text":'1、虚拟技术搭建。'
+						"text":'1、首页点击“虚拟技术搭建”，进入实验界面。查看实验介绍，点击“开始实验”'
 					}
 				]
 			},
-		]
+		],
+		[
+			{
+				"type":'text',
+				"textList":[
+					{
+						"textType":'nor',
+						"text":'2、设备认知。这里有后续摄影棚创作所需要的全部设备，认知所有设备名称、查看设备模型，熟悉仪器在实验中的作用。'
+					}
+				]
+			},
+		],
+		[
+			{
+				"type":'text',
+				"textList":[
+					{
+						"textType":'nor',
+						"text":'3、设备搭建。使用键盘上下左右或wsad，可以在空间内自由移动，寻找适合搭建的视点。右边栏为引导搭建步骤，按照步骤由上而下，依次点击完成搭建。'
+					}
+				]
+			},
+		],
+		[
+			{
+				"type":'text',
+				"textList":[
+					{
+						"textType":'nor',
+						"text":'4、设备连接。根据原理认知中的学习，对系统设备进行连接。点击“提交”后可查看实验结果，可选择“重新实验”或完成实验。'
+					}
+				]
+			},
+		],
 	]
 }
 //学习流程-虚拟艺术创作
@@ -85,11 +151,177 @@ myData_XXLC_XNYSCZ={
 				"textList":[
 					{
 						"textType":'nor',
-						"text":'1、虚拟艺术创作。'
+						"text":'1、【选择项目】首页点击“虚拟艺术创作”，进入实验界面。选择想要实验的影片类型，下方会显示该类型中当前可参加的实验项目，点击选择想要参加的项目。如果你有创新创业的项目孵化想法，也可以与老师积极沟通，通过项目管理中心申请创建孵化的创新影视项目。也可以选择加入已有的影视项目。在这里，以《火星计划》为例。'
 					}
 				]
 			},
-		]
+		],
+		[
+			{
+				"type":'text',
+				"textList":[
+					{
+						"textType":'nor',
+						"text":'2、【阅读项目介绍】阅读项目简介，点击“更多简介”可以查看更详细的内容。点击“返回”回到项目界面或点击“开始实验”。'
+					}
+				]
+			},
+		],
+		[
+			{
+				"type":'text',
+				"textList":[
+					{
+						"textType":'nor',
+						"text":'3、【选择职务】根据甲方爸爸的询问，回答想要担任的职务。选择后，系统会将你加入该影视项目组。在这里，我们以美术系同学担任的美术师为例。选择“美术师”。'
+					}
+				]
+			},
+		],
+		[
+			{
+				"type":'text',
+				"textList":[
+					{
+						"textType":'nor',
+						"text":'4、选择后，制片人会和你对话。在下方，可看到参与该项目的其他项目组成员。成员信息中可以看到所在系部和联系方式，你们可以建立，随时在项目过程中沟通。'
+					}
+				]
+			},
+		],
+		[
+			{
+				"type":'text',
+				"textList":[
+					{
+						"textType":'nor',
+						"text":'5、【与项目组同学见面】加入项目组后，项目组的制片人会欢迎你的加入。你可以看到正在与你一起参与该项目的各系各专业同学，看到他们的职务、头像及联系电话。好了，“开始创作”吧！'
+					}
+				]
+			},
+		],
+		[
+			{
+				"type":'text',
+				"textList":[
+					{
+						"textType":'nor',
+						"text":'6、【研读剧本】戏文系的编剧同学已经将写好的剧本上传到项目管理中心，在这里我们可以看到剧本的创建人、时间，点击“下载”，线下研读剧本。'
+					}
+				]
+			},
+		],
+		[
+			{
+				"type":'text',
+				"textList":[
+					{
+						"textType":'nor',
+						"text":'7、【主创研讨会】线下研读剧本后，与该项目组的导演系同学、摄影系同学、戏文系同学等主创团队开会确定需要拍摄的场次，讨论创作方案。开会时记得拍照哦，并记录下讨论要点，整理成会议纪要的电子文档。点击“上传会议纪要”。点击“下一步”。'
+					}
+				]
+			},
+		],
+		[
+			{
+				"type":'text',
+				"textList":[
+					{
+						"textType":'nor',
+						"text":'8、绘制分镜头脚本与气氛图】根据你和其他系部同学的主创讨论会，选定剧本中的其中一场戏，开始在线下设计分镜头脚本和气氛图。创作好后，将分镜头脚本与气氛图的电子文件上传平台。点击“添加”，添加文件后，点击“上传”，上传完成后待老师审核通过，你可以点击“下一步”继续实验。老师审核后，你可在该步骤下查看审核是否通过。若没有通过，请重新提交，重复上述步骤。'
+					}
+				]
+			},
+		],
+		[
+			{
+				"type":'text',
+				"textList":[
+					{
+						"textType":'nor',
+						"text":'9、【虚拟资产创作】创作“虚景”即LED屏幕内的场景。右侧栏为虚拟艺术资产库，有预置的数字资产（角色、道具、场景），也可以点击资产后方的“加号”导入模型，在弹出窗口中输入“模型名称”，选择“资产类型”，点击上传后，可在右侧栏中查看到该资产。鼠标左键拖动资产，将模型放入中间视图区。点击“收起”隐藏右边栏以扩大对场景视图区的可视范围。视图区下方为“资产编辑”区，当在视图区选中资产后，可以在“资产编辑”区对表面效果进行调整，以适合场景效果。'
+					}
+				]
+			},
+		],
+		[
+			{
+				"type":'text',
+				"textList":[
+					{
+						"textType":'nor',
+						"text":'10、【视图区操控方法】1、场景内视角操控：在视图区创作时，可以用“↑↓←右”或“wsad”键进行前后左右的视角移动，鼠标向“前后左右”方向移动可以配合调整视角；2、资产操控：视图区有操控面板，“T”为移动模式，“R”为旋转模式，“S”为缩放模式，分别单击“T”“R”“S”后可对资产进行位置、旋转、大小的调整。“Local”为（局部模式），点击切换为“World”（全局）模式，“Snap Enabled”为单位移动模式，点击切换为“Disabled”以切换为平滑移动模式，点击“Delete”删除该资产。在后续的视图区创作时，美术师都可以用此操作控制方法，进行真实景、虚拟景及混合场景的布景与构图。'
+					}
+				]
+			},
+		],
+		[
+			{
+				"type":'text',
+				"textList":[
+					{
+						"textType":'nor',
+						"text":'11、【虚景创作】使用上述操控方法，对LED内的虚拟场景进行布景。'
+					}
+				]
+			},
+		],
+		[
+			{
+				"type":'text',
+				"textList":[
+					{
+						"textType":'nor',
+						"text":'12、【实景创作】使用上述操控方法，对摄影棚内的现场进行布景。'
+					}
+				]
+			},
+		],
+		[
+			{
+				"type":'text',
+				"textList":[
+					{
+						"textType":'nor',
+						"text":'13、【虚景实景结合】下面，我们就可以对实景与虚景的部分进行合成了。根据场景的整体效果，与导演、摄影师、灯光师、合成师沟通，并调整整体效果，包括道具、景的位置等。'
+					}
+				]
+			},
+		],
+		[
+			{
+				"type":'text',
+				"textList":[
+					{
+						"textType":'nor',
+						"text":'14、【光线调节】使用ipad对现场的光色进行调试，在Lighting窗栏中，你可以拖动xy调整太阳的位置，以改变一天中的时间，如清晨、正午、夕阳、夜晚。拖动调节对比度、色温。在Stage窗栏中，你可以调整LED内场景的位置。在Screen窗栏中，你可以根据需求开启绿屏拍摄模式。'
+					}
+				]
+			},
+		],
+		[
+			{
+				"type":'text',
+				"textList":[
+					{
+						"textType":'nor',
+						"text":'15、【选择摄影画面】全部完成后，就可以输出场景镜头效果了！你可以选择2个不同的视角，然后在电脑中查看输出图片。'
+					}
+				]
+			},
+		],
+		[
+			{
+				"type":'text',
+				"textList":[
+					{
+						"textType":'nor',
+						"text":'15、【完成任务】记得写一份报告哦，点击下载报告模板，并撰写报告，与场景截图一并上传。OK，实验完成啦！'
+					}
+				]
+			},
+		],
+		
 	]
 }
 //学习流程-虚拟资源库建设

myData/myData_XXYSY.js

@@ -100,13 +100,6 @@ myData_XXYSY_XNJSDJ = {
 	"text": "虚拟技术搭建",
 	"content": {
 		"paragraphList":[
-			// [
-			// 	{
-			// 		"text": '点击虚拟技术搭建进入模块学习页面，页面内容如下：',
-			// 		"color": '#FF0019',
-			// 		"fontWeight":'bold'
-			// 	}
-			// ],
 			[
 				{
 					"text": '【模块介绍】',
@@ -153,9 +146,10 @@ myData_XXYSY_XNJSDJ = {
 		"src": {
 			"type":"image",
 			"list":[
-				require("../assets/learning/pic_ksxx_xxysy_xnjsdj_01.jpg")
+				require("../assets/startLearning/learningAndExperiment/TopImage.png")
 			]
-		}
+		},
+		"bShowDownloadInstr":true
 	}
 }
 //学习与实验-虚拟艺术创作
@@ -216,9 +210,10 @@ myData_XXYSY_XNYSZZ = {
 		"src": {
 			"type":"image",
 			"list":[
-				require("../assets/learning/pic_ksxx_xxysy_xnyszz_01.jpg")
+				require("../assets/startLearning/learningAndExperiment/TopImage.png")
 			]
-		}
+		},
+		"bShowDownloadInstr":true
 	}
 }
 //学习与实验-虚拟资源库建设

pages.json

@@ -1,13 +1,5 @@
 {
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		// {
-		// 	"path": "pages/test/test6",
-		// 	"style": {
-		// 		"app-plus": {
-		// 			"titleNView": false
-		// 		}
-		// 	}
-		// },
+	"pages": [ 
 		{
 			"path": "pages/home",
 			"style": {
@@ -15,58 +7,6 @@
 					"titleNView": false
 				}
 			}
-		},
-		{
-			"path": "pages/startLearning/startLearning",
-			"style": {
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/login/login",
-			"style": {
-				"app-plus": {
-					"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": {

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 selectable="true"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:  mydata_api,
-				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>

pages/login/login.vue

@@ -1,125 +0,0 @@
-<template>
-	<!-- <view class="mybody df fdc aic"> -->
-	<view class="mybody bgclF8 df fdc">
-		<TopMenu ref="TopMenu"></TopMenu>
-		<!-- 中间那块登录输入密码之类的 -->
-		<view v-show="visibleLogin" class="df jcc aic content">
-			<view class="df aic login-center">
-				<view>
-					<view class="login-lefttitle1">虚拟仿真实验网站首页</view>
-					<view class="login-lefttitle2">记录产品分享设计</view>
-					<view class="login-leftpic">
-						<img src="../../assets/login/loginPic1.png" />
-					</view>
-				</view>
-				<!-- 中间竖线 -->
-				<view class="login-middleline"></view>
-				<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>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import TopMenu from '../../components/topMenu.vue'
-	import ChooseRole from '../../components/login/chooseRole.vue'
-	import LoginByPWD from '../../components/login/loginByPWD.vue'
-	import ResetPWD from '../../components/login/resetPWD.vue'
-	export default {
-		components: {
-			TopMenu,
-			ChooseRole,
-			LoginByPWD,
-			ResetPWD
-		},
-		data() {
-			return {
-				visibleLogin:true,
-				visibleChooseRole: true,
-				visibleLoginByPWD: false,
-				visibleResetPWD: false,
-				//当前登录类型T教师S学生
-				roleType: '',
-			}
-		},
-		methods: {
-			onLogin: function() {
-				console.log("登录成功", this.roleType, this.$refs.TopMenu.str);
-				console.log("登陆成功2",topMenuS.ksxx);
-				this.$refs.TopMenu.switchState(topMenuS.syjj);
-				this.visibleChooseRole = false;
-				this.visibleLoginByPWD = 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;
-			}
-		}
-	}
-</script>
-
-<style>
-	.login-center {
-		/* width: 1431px;
-		height: 752px; */
-		width: 74.5vw;
-		height: 39.1vw;
-		background: #FFFFFF;
-		box-shadow: 0px 3px 7px 0px rgba(0, 0, 0, 0.1);
-		border-radius: 10px;
-		/* margin-top: 86px; */
-		justify-content: space-evenly;
-	}
-
-	.login-lefttitle1 {
-		/* font-size: 26px; */
-		font-size: 1.4vw;
-		font-family: MicrosoftYaHei;
-		color: #020202;
-		/* line-height: 35px; */
-		line-height: 1.8vw;
-		/* letter-spacing: 2px; */
-		letter-spacing: 0.02vw;
-	}
-
-	.login-lefttitle2 {
-		/* font-size: 20px; */
-		font-size: 1.041vw;
-		font-family: MicrosoftYaHei;
-		color: #6C6F6E;
-		/* line-height: 26px;
-		letter-spacing: 1px;
-		margin-top: 16px; */
-		line-height: 1.4vw;
-		letter-spacing: 1px;
-		margin-top: 0.8vw;
-	}
-
-	.login-leftpic {
-		/* margin-top: 79px;
-		margin-left: 15px; */
-		margin-top: 4.114vw;
-		margin-left: 0.07vw;
-	}
-
-	.login-leftpic img {
-		width: 17.552vw;
-	}
-
-	.login-middleline {
-		width: 0.1vw;
-		height: 29vw;
-		background-color: #979797;
-		opacity: 0.2;
-	}
-</style>

pages/startLearning/startLearning.vue

@@ -1,57 +0,0 @@
-<template>
-	<view class="mybody bgclF8 df fdc">
-<!-- 			<canvas></canvas> -->
-		<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>

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>

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>

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>

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>

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>

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>

router.js

@@ -1,25 +0,0 @@
-import Vue from "vue";
-import VueRouter from "vue-router";
-
-// 引入组件
-import login from "./pages/login/login.vue";
-import startLearning from "./pages/startLearning/startLearning.vue";
-
-// 要告诉 vue 使用 vueRouter
-Vue.use(VueRouter);
-
-const routes = [
-    {
-        path:"/pages/login/login.vue",
-        component: login
-    },
-    {
-        path: "/pages/startLearning/startLearning.vue",
-        component: startLearning
-    }
-]
-
-var router =  new VueRouter({
-    routes
-})
-export default router;