public project

components/home/simulationLibrary.vue

@@ -1,146 +1,93 @@
 <template>
 	<view class="s_container">
-		<!-- <image src="../../assets/home/simulationLibrary/topImg.png" class="s_logo" mode=""></image> -->
-		<view class="s_content_container">
-			<view class="s_search" style="">
-				<view class="" style="position: relative;width: 100%;">
-					<img src="../../assets/home/search.png" class="s_search_img_input" alt="">
-					<input type="text" value="" class="s_search_input" style="width: 96%;" placeholder="请输入搜索内容" />
-				</view>
+		<view class="s_content_container" v-if="bShow[0]">
+			<view class="s_search">
+				<img src="../../assets/home/search.png" class="s_search_img_logo" alt="">
+				<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">
-				<view class="uni-list">
-					<view class="uni-list-cell">
-						<view class="uni-list-cell-db">
-							<picker @change="bindPickerChange" :value="index" :range="array">
-								<view class="uni-input">{{array[index]}}</view>
-							</picker>
-						</view>
+			
+			<view class="content">
+				<view class="top-dispaly-block">
+					<view class="top_content" v-for="(item,index) in allContentArr" :key="index">
+						<img :src="item.Texture_Url" class="top_image" mode="" @click="viewDetail(index)"></img>
 					</view>
 				</view>
-				<view class="uni-list">
-					<view class="uni-list-cell">
-						<view class="uni-list-cell-db">
-							<picker @change="bindPickerChange" :value="index" :range="array">
-								<view class="uni-input">{{array[index]}}</view>
-							</picker>
+				
+				<view class="s_content_block">
+					<view class="s_img_title" v-text="'角色'"></view>
+					<view class="s_img_image_block">
+						<view class="s_img_content">
+							<view class="s_image_block" v-for="(item,index) in charactorArr" :key="index">
+								<img :src="item.Texture_Url" class="s_image" mode="" @click="viewDetail0(index)"></img>
+							</view>
 						</view>
+						<img src="../../assets/home/left.png" class="v-left" alt="" @click="more0()">
 					</view>
 				</view>
-				<view class="uni-list">
-					<view class="uni-list-cell">
-						<view class="uni-list-cell-db">
-							<picker @change="bindPickerChange" :value="index" :range="array">
-								<view class="uni-input">{{array[index]}}</view>
-							</picker>
+				
+				<view class="s_content_block">
+					<view class="s_img_title" v-text="'场景'"></view>
+					<view class="s_img_image_block">
+						<view class="s_img_content">
+							<view  class="s_image_block" v-for="(item,index) in sceneArr" :key="index">
+								<img :src="item.Texture_Url" class="s_image" mode="" @click="viewDetail1(index)"></img>
+							</view>
 						</view>
+						<img src="../../assets/home/left.png" class="v-left" alt="" @click="more1()">
 					</view>
 				</view>
-				<view class="uni-list">
-					<view class="uni-list-cell">
-						<view class="uni-list-cell-db">
-							<picker @change="bindPickerChange" :value="index" :range="array">
-								<view class="uni-input">{{array[index]}}</view>
-							</picker>
+				
+				<view class="s_content_block">
+					<view class="s_img_title" v-text="'道具'"></view>
+					<view class="s_img_image_block">
+						<view class="s_img_content">
+							<view class="s_image_block" v-for="(item,index) in itemArr" :key="index">
+								<img :src="item.Texture_Url" class="s_image" mode="" @click="viewDetail2(index)"></img>
+							</view>
 						</view>
+						<img src="../../assets/home/left.png" class="v-left" alt=""  @click="more2()">
 					</view>
 				</view>
-				<view class="uni-list">
-					<view class="uni-list-cell">
-						<view class="uni-list-cell-db">
-							<picker @change="bindPickerChange" :value="index" :range="array">
-								<view class="uni-input">{{array[index]}}</view>
-							</picker>
-						</view>
-					</view>
+			</view>		
+		</view>
+		
+		<view class="detail" v-if="bShow[1]">
+			<view class="creator-info-block">
+				<view class="firstLine">
+					<img src="../../assets/login/loginPic3.png" class="avatar" alt="">
+					<text class="creatorName">{{creatorName}}</text>
 				</view>
-				<view class="uni-list">
-					<view class="uni-list-cell">
-						<view class="uni-list-cell-db">
-							<picker @change="bindPickerChange" :value="index" :range="array">
-								<view class="uni-input">{{array[index]}}</view>
-							</picker>
-						</view>
+				<view class="secondLine">
+					<view class="secondLine-block1">
+						<view class="Star"></view>
+						<view class="CollectionAuth">收藏作者</view>
 					</view>
+					<view class="secondLine-block2"><text>联系作者</text></view>
 				</view>
-			</view> -->
-
-			<view class="s_search_img">
-
-				<view class="s_img_left">
-					<view class="s_top_img">
-						<view class="s_top_content" v-for="(item,index) in allContentArr" :key="index">
-							<img :src="item.src" class="ab_image" mode="" @click="change(index)"></img>
-							<view class="s_operation" v-show="index==act">
-								<text>{{item.name}}</text>
-								<view>
-									<img src="../../assets/home/find.png" @click="preview(index)">
-									<img src="../../assets/home/dowload.png" alt="" @click="dowload(index)">
-								</view>
-							
-							</view>
-						</view>
-					</view>
-					
-					<view class="s_img">
-						<view class="s_img_title" v-text="'角色'"></view>
-						<view class="s_img_image">
-							<view class="s_img_content" v-for="(item,index) in charactorArr" :key="index">
-								<img :src="item.src" class="s_image" mode="" @click="change2(index)"></img>
-								<view class="s_operation" v-show="index==act2">
-									<text>{{item.name}}</text>
-									<view>
-										<img src="../../assets/home/find.png" alt="" @click="preview2(index)">
-										<img src="../../assets/home/dowload.png" alt="" @click="dowload2(index)">
-									</view>
-
-								</view>
-							</view>
-							<img src="../../assets/home/left.png" class="v-left" alt="">
-						</view>
-					</view>
-					<view class="s_img">
-						<view class="s_img_title" v-text="'场景'"></view>
-						<view class="s_img_image">
-							<view class="s_img_content" v-for="(item,index) in sceneArr" :key="index">
-								<img :src="item.src" class="s_image" mode="" @click="change3(index)"></img>
-								<view class="s_operation" v-show="index==act3">
-									<text>{{item.name}}</text>
-									<view>
-										<img src="../../assets/home/find.png" alt="" @click="preview3(index)">
-										<img src="../../assets/home/dowload.png" alt="" @click="dowload3(index)">
-									</view>
-					
-								</view>
-							</view>
-							<img src="../../assets/home/left.png" class="v-left" alt="">
-						</view>
-					</view>
-					
-					<view class="s_img s_img_1">
-						<view class="s_img_title" v-text="'道具'"></view>
-						<view class="s_img_image">
-							<view class="s_img_content" v-for="(item,index) in itemArr" :key="index">
-								<img :src="item.src" class="s_image" mode="" @click="change1(index)"></img>
-								<view class="s_operation" v-show="index==act1">
-									<text>{{item.name}}</text>
-									<view>
-										<img src="../../assets/home/find.png" alt="" @click="preview1(index)">
-										<img src="../../assets/home/dowload.png" alt="" @click="dowload1(index)">
-									</view>
-					
-								</view>
-							</view>
-							<img src="../../assets/home/left.png" class="v-left" alt="">
-						</view>
-					</view>
+				<view class="detailBack" @click="detailBack()"><text>返回</text></view>
+			</view>
+			<view class="detail-block">
+				<view class="DefaultDisplayImg-block">
+					<!-- <image :src="imageUrl" mode="widthFix"></image> -->
+					<img :src="imageUrl" mode="widthFix"></img>
+				</view>
+				<view class="Label-block">
+					<text>作品名称:{{ItemName}}</text>
+					<text>上传时间:{{uploadTime}}</text>
+					<text @click="dowload()">下载</text>
+					<!-- <text>学生互评</text> -->
 				</view>
-
 			</view>
 		</view>
-
-		<view class="s_footer" style="text-align: center;padding: 80rpx;">
+		
+		<view class="more" v-if="bShow[2]">
+			<view class="ListBack" @click="detailBack()"><text>返回</text></view>
+			<view class="detail_image_block" v-for="(item,index) in detailArr" :key="index">
+				<img :src="item.Texture_Url" class="detail_image" @click="viewDetail0(index)"  :style="{left:`${index%3*400}rpx`,top:`${parseInt(index/3)*400+100}rpx`}" v-if="bShowImg[0]"></img>
+				<img :src="item.Texture_Url" class="detail_image" @click="viewDetail1(index)"  :style="{left:`${index%3*400}rpx`,top:`${parseInt(index/3)*400+100}rpx`}" v-if="bShowImg[1]"></img>
+				<img :src="item.Texture_Url" class="detail_image" @click="viewDetail2(index)"  :style="{left:`${index%3*400}rpx`,top:`${parseInt(index/3)*400+100}rpx`}" v-if="bShowImg[2]"></img>
+			</view>
 		</view>
 	</view>
 </template>
@@ -148,67 +95,44 @@
 <script>
 	export default {
 		name: "simulationLibrary",
+		
 		data() {
 			return {
-				act: -1,
-				act1: -1,
-				act2: -1,
-				act3: -1,
 				array: ['项目类型'],
 				index: 0,
-				url: '/assets/home/homeBG.jpg',
+				// url: '/assets/home/homeBG.jpg',
+				// imageUrl:require('../../assets/home/simulationLibrary/DefaultDisplayImg.png'),
+				imageUrl:'',
+				fbx_url:'',
 				allContentArr:[],
 				itemArr:[],
 				charactorArr:[],
 				sceneArr:[],
+				bShow: [
+					true, //normal
+					false, //detail
+					false, //more
+				],
+				bShowImg:[
+					false, //normal
+					false, //detail
+					false, //more
+				],
+				detailArr:[],
+				creatorName:"姓名",
+				ItemName:'物品名',
+				uploadTime:'上传时间',
+				
 			}
 		},
 		methods: {
+			
 			init() {
 				//临时
 				this.allContentArr.length = 0;
 				this.itemArr.length = 0;
 				this.charactorArr.length = 0;
 				this.sceneArr.length = 0;
-				
-				for(let i=1;i<3+1;i++){
-					let data = {};
-					data.src = require("../../assets/library/big/"+i+".png");
-					data.name = 'name';
-					data.fbx = 'www.baidu.com';
-					this.allContentArr.push(data);
-				}
-				
-				for(let i=1;i<6+1;i++){
-					let data = {};
-					// data.src = '../../assets/library/item/'+i+'.png';
-					data.src = require("../../assets/library/item/"+i+".png");
-					data.name = 'name';
-					data.fbx = 'www.baidu.com';
-					this.itemArr.push(data);
-				}
-				
-				for(let i=1;i<6+1;i++){
-					let data = {};
-					// data.src = '../../assets/library/charactor/'+i+'.png';
-					data.src = require("../../assets/library/charactor/"+i+".png");
-					data.name = 'name';
-					data.fbx = 'www.baidu.com';
-					this.charactorArr.push(data);
-				}
-				
-				for(let i=1;i<6+1;i++){
-					let data = {};
-					// data.src = '../../assets/library/scene/'+i+'.png';
-					data.src = require("../../assets/library/scene/"+i+".png");
-					data.name = 'name';
-					data.fbx = 'www.baidu.com';
-					this.sceneArr.push(data);
-				}
-				
-				return;
-				
-				console.log('simulationLibrary=',mydata_userInfo.UserID)
 				uni.request({
 					url: mydata_api + "/item/getitemlist",
 					data: {
@@ -220,18 +144,10 @@
 					method: "POST",
 					dataType: "json",
 					success: res => {
-						// console.log('res=',res)
-						let items =  res.data.Items;
-						console.log('全部=',items)
-						
-						items.forEach(item=>{
-						    let data = {};
-						    data.src = item.Texture_Url;
-						    data.name = item.Name;
-						    data.fbx = item.Fbx_Url;
-						    this.allContentArr.push(data);
-							
-						});
+						// console.log('res111111111=',res)
+						this.allContentArr = res.data.Items;
+						// let items =  res.data.Items;
+						console.log('全部=',res.data.Items)
 					}
 				})
 				//道具
@@ -246,16 +162,10 @@
 					method: "POST",
 					dataType: "json",
 					success: res => {
-						let items =  res.data.Items;
-						console.log('道具=',items)
 						
-						items.forEach(item=>{
-						    let data = {};
-						    data.src = item.Texture_Url;
-						    data.name = item.Name;
-						    data.fbx = item.Fbx_Url;
-						    this.itemArr.push(data);
-						});
+						this.itemArr = res.data.Items;
+						// let items =  res.data.Items;
+						// console.log('道具=',items)
 					}
 				})
 				
@@ -271,16 +181,10 @@
 					method: "POST",
 					dataType: "json",
 					success: res => {
-						let items =  res.data.Items;
-						console.log('角色=',items)
+						this.charactorArr =  res.data.Items;
 						
-						items.forEach(item=>{
-						    let data = {};
-						    data.src = item.Texture_Url;
-						    data.name = item.Name;
-						    data.fbx = item.Fbx_Url;
-						    this.charactorArr.push(data);
-						});
+						// let items =  res.data.Items;
+						// console.log('角色=',items)
 					}
 				})
 				
@@ -296,115 +200,185 @@
 					method: "POST",
 					dataType: "json",
 					success: res => {
-						let items =  res.data.Items;
-						console.log('场景=',items)
 						
-						items.forEach(item=>{
-						    let data = {};
-						    data.src = item.Texture_Url;
-						    data.name = item.Name;
-						    data.fbx = item.Fbx_Url;
-						    this.sceneArr.push(data);
-						});
+						this.sceneArr = res.data.Items;
 					}
 				})	
 			},
-			previewImage(url){
-				uni.downloadFile({
-					url:url,
-					success: (res) => {
-						if (res.statusCode === 200) {
-							uni.openDocument({
-								filePath: res.tempFilePath, 
-								// 如果文件名包含中文，建议使用escape(res.tempFilePath)转码，防止ios和安卓客户端导致的差异
-								success: function(res) {
-									console.log('打开文档成功');
-								}
-							});
-						}
-					},
-				});
-			},
-			bindPickerChange(e) {
-				this.index = e.target.value
-			},
-			change(e) {
-				if (this.act == e) {
-					this.act = -1;
-				} else {
-					this.act = e;
-				}
-			
-			},
-			change1(e) {
-				if (this.act1 == e) {
-					this.act1 = -1;
-				} else {
-					this.act1 = e;
-				}
-
-			},
-			change2(e) {
-				if (this.act2 == e) {
-					this.act2 = -1;
-				} else {
-					this.act2 = e;
+			// previewImage(url){
+			// 	uni.downloadFile({
+			// 		url:url,
+			// 		success: (res) => {
+			// 			if (res.statusCode === 200) {
+			// 				uni.openDocument({
+			// 					filePath: res.tempFilePath, 
+			// 					// 如果文件名包含中文，建议使用escape(res.tempFilePath)转码，防止ios和安卓客户端导致的差异
+			// 					success: function(res) {
+			// 						console.log('打开文档成功');
+			// 					}
+			// 				});
+			// 			}
+			// 		},
+			// 	});
+			// },
+			viewDetail(e) {
+				let index = parseInt(e);
+				let aItem = this.allContentArr[index];
+				console.log('aItem=',aItem)
+				if(aItem)
+				{
+					this.imageUrl = aItem.Texture_Url;
+					
+					this.bShow = [
+						false, //normal
+						true, //detail
+						false, //more
+					]
+					
+					this.creatorName = aItem.CreateUserName;
+					this.ItemName = aItem.Name;
+					this.uploadTime = aItem.UploadTime;
+					this.fbx_url = aItem.Fbx_Url;
 				}
 			},
-			change3(e) {
-				if (this.act3 == e) {
-					this.act3 = -1;
-				} else {
-					this.act3 = e;
+			viewDetail0(e) {
+				let index = parseInt(e);
+				
+				let aItem = this.charactorArr[index];
+				if(aItem)
+				{
+					this.imageUrl = aItem.Texture_Url;
+					
+					this.bShow = [
+						false, //normal
+						true, //detail
+						false, //more
+					]
+					this.creatorName=aItem.CreateUserName;
+					this.ItemName = aItem.Name;
+					this.uploadTime = aItem.UploadTime;
+					this.fbx_url = aItem.Fbx_Url;
 				}
 			},
-			preview(e) {
-				// allContentArr:[],
-				// itemArr:[],
-				// charactorArr:[],
-				// sceneArr:[],
-				
-				// console.log('this.allContentArr=',this.allContentArr);
-				// console.log('typeof(e)=',typeof(e),'=',e);
+			viewDetail1(e) {
 				let index = parseInt(e);
-				console.log('index=',typeof(index),'=',index);
-				
-				if(this.allContentArr[index])
+				let aItem = this.sceneArr[index];
+				if(aItem)
 				{
-					// console.log('this.allContentArr[index]=',this.allContentArr[index]);
-					console.log('src=',this.allContentArr[index].src);
-					this.previewImage(this.allContentArr[index].src);
+					this.imageUrl = aItem.Texture_Url;
+				
+					this.bShow = [
+						false, //normal
+						true, //detail
+						false, //more
+					]
+					this.creatorName=aItem.CreateUserName;
+					this.ItemName = aItem.Name;
+					this.uploadTime = aItem.UploadTime;
+					this.fbx_url = aItem.Fbx_Url;
 				}
 			},
-			dowload(e) {
+			viewDetail2(e) {
 				let index = parseInt(e);
-				console.log('index=',typeof(index),'=',index);
+				let aItem = this.itemArr[index];
 				
-				if(this.allContentArr[index])
+				if(aItem)
 				{
-					console.log('fbx=',this.allContentArr[index].fbx);
-					window.location.href = this.allContentArr[index].fbx;
-				}
+					this.imageUrl = aItem.Texture_Url;
 				
-			},
-			preview1(e) {
+					this.bShow = [
+						false, //normal
+						true, //detail
+						false, //more
+					]
 				
+					this.creatorName=aItem.CreateUserName;
+					this.ItemName = aItem.Name;
+					this.uploadTime = aItem.UploadTime;
+					this.fbx_url = aItem.Fbx_Url;
+				}
 			},
-			dowload1(e) {
+			more0(){
 				
-			},
-			preview2(e) {
+				this.bShow = [
+					false, //normal
+					false, //detail
+					true, //more
+				]
 				
+				this.bShowImg = [
+					true, //normal
+					false, //detail
+					false, //more
+				]
+				this.detailArr=this.charactorArr;//.itemArr;
 			},
-			dowload2(e) {
+			more1(){
 				
-			},
-			preview3(e) {
+				this.bShow = [
+					false, //normal
+					false, //detail
+					true, //more
+				]
+				
+				this.bShowImg = [
+					false, //normal
+					true, //detail
+					false, //more
+				]
+				
+				this.detailArr=this.sceneArr;//charactorArr;
 				
 			},
-			dowload3(e) {
+			more2(){
+				this.bShow = [
+					false, //normal
+					false, //detail
+					true, //more
+				]
+				
+				this.bShowImg = [
+					false, //normal
+					false, //detail
+					true, //more
+				]
+				
+				this.detailArr=this.itemArr;
 				
+				console.log('this.detailArr=',this.detailArr);
+			},
+			detailBack(){
+				this.bShow = [
+					true, //normal
+					false, //detail
+					false, //more
+				]
+			},
+			dowload() {		
+				window.location.href = this.fbx_url;			
 			}
+			// preview(e) {
+			// 	let index = parseInt(e);
+			// 	console.log('index=',typeof(index),'=',index);
+				
+			// 	if(this.allContentArr[index])
+			// 	{
+			// 		// console.log('this.allContentArr[index]=',this.allContentArr[index]);
+			// 		console.log('src=',this.allContentArr[index].src);
+			// 		this.previewImage(this.allContentArr[index].src);
+			// 	}
+			// },
+			// dowload(e) {
+			// 	let index = parseInt(e);
+			// 	console.log('index=',typeof(index),'=',index);
+				
+			// 	if(this.allContentArr[index])
+			// 	{
+			// 		console.log('fbx=',this.allContentArr[index].fbx);
+			// 		window.location.href = this.allContentArr[index].fbx;
+			// 	}
+				
+			// },
 		}
 	}
 </script>
@@ -413,211 +387,401 @@
 	.s_container {
 		width: 100%;
 		height: 100%;
+		
+		display: flex;
+		justify-content: center;
+		align-items:center;	
+		flex-direction: column;
+			
 		background-color: #fff;
 	}
-
-	.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 {
+		width: 96%;
+		height: 96%;
+		
+		display: flex;
+		justify-content: center;
+		align-items:center;	
+		flex-direction: column;
+		
+		border-bottom: 3rpx solid #D7D7D7;
 	}
-
+	
 	.s_search {
+		width: 100%;
+		height: 3%;
+		
+		margin-top: 3%;
+		
 		display: flex;
 		justify-content: space-between;
+		align-items:center;
+		flex-direction: row;
 	}
-
+	
+	.s_search_img_logo{
+		height: 100%;
+		margin-right: 1%;
+	}
+	
 	.s_search_input {
-		border: 2rpx solid #DDDDDD;
 		width: 100%;
-		height: 80rpx;
-		line-height: 80rpx;
-		padding: 0 60rpx;
+		height: 100%;
 		border-radius: 10rpx;
-		font-size: 20rpx;
-	}
-
-	.s_content_container {
-		padding: 40rpx 100rpx;
+		font-size: 20rpx;	
+		border: 2rpx solid #DDDDDD;
 	}
-
+	
 	.s_btn_search {
 		width: 130rpx;
-		height: 80rpx;
+		height: 100%;
 		line-height: 80rpx;
-		margin-left: 20rpx;
+		margin-left: 1%;
 	}
-
-	.s_search_condition {
-		background-color: #F9F9F9;
-		margin-top: 40rpx;
-		height: 100rpx;
+	
+	.content{
 		width: 100%;
-	}
-
-	.m_select {
-		width: 300rpx;
-		line-height: 80rpx;
-	}
-
-	.uni-list-cell-db {
-		width: 300rpx;
-		// height: 100rpx;
-		line-height: 100rpx;
-	}
-
-
-	.uni-selector-select .uni-picker-item.selected {
-		color: red;
-	}
-
-	.uni-input {
-		text-align: center;
-	}
-
-	.s_search_condition {
+		height: 100%;
+		
 		display: flex;
-		justify-items: start;
+		justify-content: center;
+		align-items:center;	
+		flex-direction: column;
+		
+		margin-top: 1%;
+		margin-bottom: 1%;
 	}
-
-	.uni-list {
-		position: relative;
-	}
-
-	.uni-list::after {
-		content: url(../../assets/learning/icon_ylrz_arrow.png);
-		position: absolute;
-		right: 0;
-		top: 50%;
-		transform: translateY(-50%);
-	}
-
-	.s_image_text {
-		margin-left: 20rpx;
-	}
-
-	.s_top_img {
+	
+	.top-dispaly-block {
+		width: 100%;
+		height: 30%;
+		
 		display: flex;
 		justify-content: space-between;
-		padding-bottom: 80rpx;
+		align-items:center;	
+		flex-direction: row;
 		border-bottom: 3rpx solid #D7D7D7;
 	}
-
-	.s_top_content {
-		margin-top: 40rpx;
+	
+	.top_content {
 		width: 30%;
-		position: relative;
+		height: 90%;
+		
+		display: flex;
+		justify-content: center;
+		align-items:center;	
+		
+		margin-right: 1%;
 	}
-
-	.s_top_image {
+	
+	.top_image{
 		width: 100%;
+		height: 100%;
 	}
-
-	.s_top_title {
-		color: #fff;
-		position: absolute;
-		bottom: 40rpx;
-		font-size: 2.0rem;
-		line-height: 100rpx;
-		font-weight: 500;
+	
+	.s_content_block {
 		width: 100%;
-		text-align: left;
-		margin-left: 50rpx;
+		height: 20%;
+		margin-bottom: 3%;
+		
+		display: flex;
+		justify-content: center;
+		align-items:center;	
+		flex-direction: column;
+		
+		/* border: 1rpx solid #ff0000; */
 	}
-
+	
 	.s_img_title {
+		width: 100%;
+		
 		font-size: 36rpx;
 		line-height: 200rpx;
 		font-weight: bold;
-	}
-
-	/* .s_top_image {
-		width: 400rpx;
-	} */
-
-	.s_img_image {
+		
 		display: flex;
-		position: relative;
-	}
-
-	/* .s_image {
-		margin-right: 40rpx; */
-
-		/* height: 550rpx; */
-	/* } */
-
-	.s_img_1 {
-		padding-bottom: 80rpx;
-		border-bottom: 3rpx solid #D7D7D7;
+		justify-content: left;
+		align-items:center;
+	    flex-direction: row;
 	}
-
-	.s_img_left {
-		padding-right: 130rpx;
+	
+	.s_img_image_block {
+		
+		width: 100%;
+		height: 100%;
+		
+		display: flex;
+		justify-content: space-around;
+		align-items:center;	
+		flex-direction: row;
 	}
-
+	
 	.s_img_content {
-		position: relative;
-		padding: 10rpx;
-		/* display: flex; */
-		/* justify-content: left; */
-		/* 	justify-items: center; */
-	}
-
-	.ab_image{
 		width: 100%;
-		height: 100%;
+		
+		display: flex;
+		justify-content: left;
+		align-items:center;
+		flex-direction: row;
+	}
+	
+	.s_image_block{
+		margin-right: 1%;
+		/* border: 1rpx solid #ff0000; */
 	}
+	
 	.s_image {
-		/* width: 100%;
-		height: 100%; */
 		width: 350rpx;
 		height: 350rpx;
+		/* border: 1rpx solid #ff0000; */
 	}
-
-	.s_operation {
-		/* 	position: absolute;
-		bottom: -10rpx;
-		left: 0;
-		width: 100%; */
-		margin-top: 30rpx;
-		display: flex;
-		justify-content: space-between;
-	/* 	margin-right: 40rpx; */
-		background-color: #dbd9d9;
-		padding: 10rpx 20rpx;
-		border-radius: 10rpx;
-	}
-
-	.s_operation img {
-		margin-left: 20rpx;
-	}
-
+	
 	.v-left {
-		position: absolute;
 		width: 25rpx;
 		height: 50rpx;
-		right: -100rpx;
-		top: 50%;
-		transform: translateY(-50%);
 	}
-
-	.s_search_img_input {
+	
+	.detail{
 		position: absolute;
-		left: 20rpx;
-		top: 50%;
-		width: 30rpx;
-		transform: translateY(-50%);
+		width: 100%;
+		height: 100%;
+		background-color: #FFFFFF;
+		
+		display: flex;
+		justify-content: space-between;
+		align-items:center;
+		flex-direction: row;
+		
+		/* border: 1rpx solid #ff0000; */
+	}
+	.detailBack{
+		width: 100%;
+		height: 3%;
+		
+		display: flex;
+		justify-content: center;
+		align-items:center;
+		
+		margin-top:60%;
+		
+		/* border: 1rpx solid #000000; */
+	}
+	
+	.detailBack text{
+		width: 30%;
+		height: 100%;
+		
+		display: flex;
+		justify-content: center;
+		align-items:center;
+		border: 1rpx solid #000000;
+	}
+	
+	.creator-info-block{
+		width: 30%;
+		height: 100%;
+		/* border: 1rpx solid #ff0000; */
+	}
+	
+	.firstLine{
+		height: 8%;
+		margin-left: 10%;
+		margin-top: 30%;
+		
+		display: flex;
+		justify-content: flex-start;
+		align-items:center;
+		flex-direction: row;
+		
+		/* border: 1rpx solid #ff0000; */
+	}
+	.avatar{
+		
+	}
+	.creatorName{
+		font-size: 50rpx;
+		color: #A27452;
+		margin-left: 5%;
+		
+		/* border: 1rpx solid #ff0000; */
+	}
+	
+	.secondLine{
+		height: 4%;
+		margin-left: 10%;
+		margin-top: 10%;
+		
+		display: flex;
+		justify-content: space-between;
+		align-items:center;
+		flex-direction: row;
+		
+		/* border: 1rpx solid #ff0000; */
+	}
+	
+	.secondLine-block1{
+		background-image:url( "../../assets/home/simulationLibrary/Bg.png");
+		background-size: 90% 90%;
+		background-repeat: no-repeat;
+		 
+		width:48%;
+		height: 100%;
+		
+		display: flex;
+		justify-content: space-between;
+		align-items:center;
+		flex-direction: row;
+		
+		/* border: 1rpx solid #000000; */
+	}
+	
+	.Star{
+		background-image:url( "../../assets/home/simulationLibrary/Start.png");
+		background-size: 99% 99%;
+		background-repeat: no-repeat;
+		
+		display: flex;
+		justify-content: center;
+		align-items:center;
+		
+		width:10%;
+		height: 50%;
+		
+		margin-left: 10%;
+		margin-bottom: 2%;
+		/* border: 1rpx solid #000000; */
+	}
+	
+	.CollectionAuth{
+		color: #000000;
+		font-size: 30rpx;
+		
+		width:80%;
+		height: 80%;
+		
+		
+		display: flex;
+		justify-content: center;
+		align-items:center;
+		
+		margin-right: 1%;
+		margin-bottom: 2%;
+		/* border: 1rpx solid #000000; */
+	}
+	
+	.secondLine-block2{
+		background-image:url( "../../assets/home/simulationLibrary/Block2.png");
+		background-size: 90% 90%;
+		background-repeat: no-repeat;
+		
+		width:48%;
+		height: 100%;
+		
+		display: flex;
+		justify-content: center;
+		align-items:center;
+		
+		color: #000000;
+		font-size: 30rpx;
+		/* border: 1rpx solid #000000; */
+	}
+	
+	.secondLine-block2 text{
+		margin-right: 10%;
+		margin-bottom: 1%;
+		color: #000000;
+		font-size: 30rpx;
+		/* border: 1rpx solid #000000; */
+	}
+	
+	
+	.detail-block{
+		width: 70%;
+		height: 100%;
+		
+		display: flex;
+		justify-content: center;
+		align-items:center;
+		flex-direction: column;
+		
+		border: 1rpx solid #000000;
 	}
 	
-	/* img{
+	.DefaultDisplayImg-block{
+		width: 90%;
+		height: 100%;
+		
+		display: flex;
+		justify-content: center;
+		align-items:center;
+		
+		margin-top: 20%;
+		margin-bottom: 5%;
+		/* border: 1rpx solid #ff0000; */
+	}
+	
+	.DefaultDisplayImg-block image{
 		width: 100%;
-	} */
+		/* height: 80%; */
+	}
+	
+	.Label-block{
+		width:70%;
+		height:10%;
+		
+		display: flex;
+		justify-content: space-between;
+		align-items:center;
+		flex-direction: row;
+		
+		margin-bottom: 10%;
+		
+		/* border: 1rpx solid #ff0000; */
+	}
+	
+	.more{
+		position: absolute;
+		width: 80%;
+		height: 80%;
+		/* background-color: #000000; */
+		/* background-color: #FFFFFF; */
+		
+		/* display: flex;
+		justify-content: space-between;
+		align-items:center;
+		flex-direction: column; */
+		
+		/* border: 1rpx solid #ff0000; */
+	}
+	
+	.detail_image_block{
+		
+		width:30%;
+		/* height:90%; */
+		
+	/* 	display: flex;
+		justify-content: space-between;
+		align-items:center;
+		flex-direction: row; */
+		
+		/* border: 1rpx solid #ff0000; */
+	}
+	
+	.detail_image{
+		position: absolute;
+		width: 350rpx;
+		height: 350rpx;
+	}
+	.ListBack{
+		width: 5%;
+		height: 3%;
+		
+		display: flex;
+		justify-content: center;
+		align-items:center;
+		
+		margin-bottom: 5%;
+		border: 1rpx solid #000000;
+	}
 </style>

components/home/sy.vue

@@ -1,82 +1,17 @@
 <template>
 	<view class="myComRoot">
 		<view class="df homeBG">
-			<!-- <image class="homeBG" mode="aspectFill" src="../../assets/home/homeBG.jpg"></image> -->
-			<!-- <view class="sy-menu">
-				<view class="sy-menu-box menu-box1 df jcc" @click="onClick_menu(0)">
-					<view class="sy-menu-text menu-text1">{{menu[0].title}}</view>
-				</view>
-				<view class="sy-menu-box menu-box2 df jcc" @click="onClick_menu(1)">
-					<view class="sy-menu-text menu-text2">{{menu[1].title}}</view>
-				</view>
-				<view class="sy-menu-box menu-box3 df jcc" @click="onClick_menu(2)">
-					<view class="sy-menu-text menu-text3">{{menu[2].title}}</view>
-				</view>
-				<view class="sy-menu-box menu-box4 df jcc" @click="onClick_menu(3)">
-					<view class="sy-menu-text menu-text4">{{menu[3].title}}</view>
-				</view>
-				<view class="sy-show-box menu-show-box1 df jcc" v-show="showIndex==0">
-					<view class="sy-show-content df fdc aic">
-						<view class="menu-show-title">{{menu[0].title}}</view>
-						<view class="menu-show-text">{{menu[0].text}}</view>
-						<view class="menu-show-btn df jcc aic" @click="onClick_menu_btn(0)">进入资产库</view>
-					</view>
-					<img src="../../assets/home/home_bubble.png" />
-				</view>
-				<view class="sy-show-box menu-show-box2 df jcc" v-show="showIndex==1">
-					<view class="sy-show-content df fdc aic">
-						<view class="menu-show-title">{{menu[1].title}}</view>
-						<view class="menu-show-text">{{menu[1].text}}</view>
-						<view class="menu-show-btn df jcc aic" @click="onClick_menu_btn(1)">进入摄影棚</view>
-					</view>
-					<img src="../../assets/home/home_bubble_02.png" />
-				</view>
-				<view class="sy-show-box menu-show-box3 df jcc" v-show="showIndex==2">
-					<view class="sy-show-content df fdc aic">
-						<view class="menu-show-title">{{menu[2].title}}</view>
-						<view class="menu-show-text">{{menu[2].text}}</view>
-						<view class="menu-show-btn df jcc aic" @click="onClick_menu_btn(2)">进入管理中心</view>
-					</view>
-					<img src="../../assets/home/home_bubble.png" />
-				</view>
-				<view class="sy-show-box menu-show-box4 df jcc" v-show="showIndex==3">
-					<view class="sy-show-content df fdc aic">
-						<view class="menu-show-title">{{menu[3].title}}</view>
-						<view class="menu-show-text">{{menu[3].text}}</view>
-						<view class="menu-show-btn-gray df jcc aic" @click="onClick_menu_btn(3)">规划建设中</view>
-					</view>
-					<img src="../../assets/home/home_bubble_02.png" />
-				</view>
-			</view> -->
-			<!-- <image class="BG" src="../../assets/home/homeBG.jpg" mode="widthFix" ></image> -->
-			
-			
 			<img src="../../assets/home/homeBG.jpg" />
-
-			<!-- <video class="myVideo" 
-				:src="src"
-				:controls="controls"
-			     preload="auto"
-			     autoplay
-			     loop muted>
-			</video> -->
 			<view class='introVideo'>
 				<video class="myVideo"
 					:src="src">
 				</video>
 				<view class='videoControl'>
-					<!-- <view class='experimentIntro' :class="[bExperimentIntroSelected==1?'experimentIntro-selected':'experimentIntro-noselect']" @click="onClickExperimentIntro">实验简介视频</view>
-					<view class='slice'> / </view>
-					<view class='teachingGuide' :class="[bTeachingGuideSelected==1?'teachingGuide-selected':'teachingGuide-noselect']" @click="onClickTeachingGuide">教学引导视频</view> -->
 					<view :class="[bExperimentIntroSelected==1?'experimentIntro-selected':'experimentIntro-noselect']" @click="onClickExperimentIntro">实验简介视频</view>
 					<view class='slice'> / </view>
 					<view :class="[bteachingGuideSelected==1?'teachingGuide-selected':'teachingGuide-noselect']" @click="onClickTeachingGuide">教学引导视频</view>			
 				</view>	
 			</view>	
-			
-			
-		<!-- 	<view class = 'theoryLearn' @click="onTheoryLearn()">理论学习</view>
-			<view class = 'startExperiment' @click="onStartExperiment()">开始实验</view> -->
 		</view>
 	</view>
 </template>
@@ -86,7 +21,7 @@
 		data() {
 			return {
 				showIndex: -1,
-				src:'https://zhongchuan1.oss-cn-beijing.aliyuncs.com/Video/home.MP4?versionId=CAEQDxiBgIDmyO_o0BciIGExNjQ1ZmJkNTVkOTRlMWRhNGRkZjAxNTEzZTMxOTll',
+				src:'https://zhongchuan1.oss-cn-beijing.aliyuncs.com/Video/WebHome.mp4?Expires=1625227885&OSSAccessKeyId=TMP.3KiMMJBRriGg5tHahuqtbtCSdMLJXVFefqedqGyGqUGDZ7DWv42e53HVSuvhQV3hdzJka6B79tmibriJHfQMmHV59hFCn3&Signature=OdA2bzn%2B83zIt5Xedmmf0S8f%2FNg%3D&versionId=CAEQDxiBgMD7r9Sb0xciIDQwNDg2ODgzMzFlMjQ3ZTRhYWU1ZjNmNDUxZjI5ZDRk&response-content-type=application%2Foctet-stream',
 				// controls:false,
 				bExperimentIntroSelected:1,
 				bteachingGuideSelected:0,

components/home/teacher/create.vue

@@ -5,8 +5,12 @@
 			<view class="s_content">
 				<view class="uni-form-item  df fdr aic">
 					<view class="title">项目名称</view>
-					<input class="form-input" v-model="model.projectName" name="input" placeholder="请输入项目名称" />
+					<input class="form-input"  style="width: 70%;margin-left: -6%;" v-model="model.projectName" name="input" placeholder="请输入项目名称" />
+					<checkbox class="check-is-public " @click="onClickCheck" :checked="bPublic"/>
+					<text> 是否为公共项目</text>
 				</view>
+				
+
 				<view class="uni-form-item df fdr aic">
 					<view class="title">项目类型</view>
 					<picker class="form-input" @change="bindPickerChange_proType" :value="index_proType" :range="proType">
@@ -47,6 +51,7 @@
 
 				// proType: ['科幻', '现实', '剧情', '历史', '爱情', '惊悚', '公路', '动画'],
 				proType: ['科幻', '现实', 'XR', '主旋律', 'VR'],
+				bPublic:false,
 			}
 		},
 		components: {},
@@ -89,7 +94,8 @@
 								"CreateUserID": mydata_userInfo.UserID,
 								"ProjectName": this.model.projectName,
 								"Describe": this.model.describe,
-								"Type": this.model.type
+								"Type": this.model.type,
+								"IsPublic":this.bPublic
 							},
 							success: (uploadFileRes) => {
 								console.log('upload ok=', uploadFileRes.data);
@@ -117,6 +123,13 @@
 				this.model.type = this.proType[this.index_proType];
 				console.log(this.model)
 			},
+			onClickCheck(e){
+				if(this.bPublic==true){
+					this.bPublic = false;
+				} else {
+					this.bPublic = true;
+				}	
+			}
 		}
 	}
 </script>
@@ -133,7 +146,7 @@
 		padding: 10rpx 40rpx;
 
 	}
-
+	
 	.s_content {
 		margin-top: 100rpx;
 	}

components/home/teacher/project.vue

@@ -664,39 +664,39 @@
 			viewProject(obj,index) {
 				// console.log('进来的什么信息',obj)
 				this.projectData = [obj];
-				if(index==0){
-					this.fileData = [
-						{
-							"AliyunOssName": "_59458299-3b84-4895-98f6-b990cdaedc72_chrome_elf.dll",
-							"Id": "0b0d8876-71de-43e6-a3dd-59a3c8f6d069",
-							"Name": "《火星计划》气氛图",
-							"Pass": false,
-							"ProjectID": 30,
-							"ProjectName": "《火星计划》",
-							"Type": "气氛图",
-							"UPloadTime": "2021-05-13 18:19:12",
-							"URL": "https://www.yuyekeji.cn/H5/ZhongChuang/《火星计划》气氛图.jpeg",
-							"UpLoadUserID": "59458299-3b84-4895-98f6-b990cdaedc72",
-							"UploadUserDuty": "创建人",
-							"UploadUserName": "朱峰",
-						},
-						{
-							"AliyunOssName": "_59458299-3b84-4895-98f6-b990cdaedc72_chrome_elf.dll",
-							"Id": "0b0d8876-71de-43e6-a3dd-59a3c8f6d069",
-							"Name": "《火星计划》气氛图2",
-							"Pass": false,
-							"ProjectID": 30,
-							"ProjectName": "《火星计划》",
-							"Type": "气氛图",
-							"UPloadTime": "2021-05-13 18:19:12",
-							"URL": "https://www.yuyekeji.cn/H5/ZhongChuang/《火星计划》气氛图2.jpg",
-							"UpLoadUserID": "59458299-3b84-4895-98f6-b990cdaedc72",
-							"UploadUserDuty": "创建人",
-							"UploadUserName": "朱峰",
-						}
-					]
-					return;
-				}
+				// if(index==0){
+				// 	this.fileData = [
+				// 		{
+				// 			"AliyunOssName": "_59458299-3b84-4895-98f6-b990cdaedc72_chrome_elf.dll",
+				// 			"Id": "0b0d8876-71de-43e6-a3dd-59a3c8f6d069",
+				// 			"Name": "《火星计划》气氛图",
+				// 			"Pass": false,
+				// 			"ProjectID": 30,
+				// 			"ProjectName": "《火星计划》",
+				// 			"Type": "气氛图",
+				// 			"UPloadTime": "2021-05-13 18:19:12",
+				// 			"URL": "https://www.yuyekeji.cn/H5/ZhongChuang/《火星计划》气氛图.jpeg",
+				// 			"UpLoadUserID": "59458299-3b84-4895-98f6-b990cdaedc72",
+				// 			"UploadUserDuty": "创建人",
+				// 			"UploadUserName": "朱峰",
+				// 		},
+				// 		{
+				// 			"AliyunOssName": "_59458299-3b84-4895-98f6-b990cdaedc72_chrome_elf.dll",
+				// 			"Id": "0b0d8876-71de-43e6-a3dd-59a3c8f6d069",
+				// 			"Name": "《火星计划》气氛图2",
+				// 			"Pass": false,
+				// 			"ProjectID": 30,
+				// 			"ProjectName": "《火星计划》",
+				// 			"Type": "气氛图",
+				// 			"UPloadTime": "2021-05-13 18:19:12",
+				// 			"URL": "https://www.yuyekeji.cn/H5/ZhongChuang/《火星计划》气氛图2.jpg",
+				// 			"UpLoadUserID": "59458299-3b84-4895-98f6-b990cdaedc72",
+				// 			"UploadUserDuty": "创建人",
+				// 			"UploadUserName": "朱峰",
+				// 		}
+				// 	]
+				// 	return;
+				// }
 				
 				this.getFileList();
 				this.getMemberList();

components/home/teacher/table.vue

@@ -22,19 +22,11 @@
 					</tr>
 				</tbody>
 			</table>
-			<!-- <view class="m_paging" style="margin-top: 80rpx;">
-				<text selectable="true"class="m_paging_item m_paging_upper">上一页</text>
-				<text selectable="true"class="m_paging_item" v-for="i in 8" @click="paging(i)" :key="i" :class="i==index?'p_act':''">
-					{{i}}
-				</text>
-				<text selectable="true"class="m_paging_item m_paging_lower">下一页</text>
-			</view> -->
 		</view>
 	</view>
 </template>
 
 <script>
-	// import locationtemp from "./location_temp.vue"
 	export default {
 		name: "home_table",
 		data() {
@@ -63,19 +55,19 @@
 					dataType: "json",
 					success: res => {
 						this.tabledata = res.data.Projects
-						let aData = {
-							"CreateTime": "2020-01-01 00:00:00",
-							"CreateUserID": "59458299-3b84-4895-98f6-b990cdaedc72",
-							"CreateUserName": "朱峰",
-							"Describe": '“实验以振兴国产科技电影”和“实现中国航天强国梦”的宏大蓝图为背景，以我国首次登陆火星计划为现实脚本，运用现场实时特效技术手段，对火星地面、外太空等场景进行“经典学习”和“实践创兴”并通过持续开发和学生在实验过程中的资源上传不断扩大现场创作的实景和虚拟资产库，使学生再学习过程中，即是资源学习者和方案讨论者，也是资源建设者',
-							"Id": 30,
-							"ProjectName": "《火星计划》",
-							"ProjectReviewImage": "../../../assets/studentAndTeacher/table/marsPlanReviewImage.png",
-							"ReviewImageOss": "../../../assets/studentAndTeacher/table/marsPlanMainCover.png",
-							"Type": "科幻",
-						}
-						this.tabledata.unshift(aData);
-						console.log("table页面请求所有项目",res);
+						// let aData = {
+						// 	"CreateTime": "2020-01-01 00:00:00",
+						// 	"CreateUserID": "59458299-3b84-4895-98f6-b990cdaedc72",
+						// 	"CreateUserName": "朱峰",
+						// 	"Describe": '“实验以振兴国产科技电影”和“实现中国航天强国梦”的宏大蓝图为背景，以我国首次登陆火星计划为现实脚本，运用现场实时特效技术手段，对火星地面、外太空等场景进行“经典学习”和“实践创兴”并通过持续开发和学生在实验过程中的资源上传不断扩大现场创作的实景和虚拟资产库，使学生再学习过程中，即是资源学习者和方案讨论者，也是资源建设者',
+						// 	"Id": 30,
+						// 	"ProjectName": "《火星计划》",
+						// 	"ProjectReviewImage": "../../../assets/studentAndTeacher/table/marsPlanReviewImage.png",
+						// 	"ReviewImageOss": "../../../assets/studentAndTeacher/table/marsPlanMainCover.png",
+						// 	"Type": "科幻",
+						// }
+						// this.tabledata.unshift(aData);
+						// console.log("table页面请求所有项目",res);
 						this.$forceUpdate();//强制刷新页面
 					}
 				})

components/login/loginByPWD.vue

@@ -68,7 +68,12 @@
 				this.isShowTip = 0;
 			},
 			onLogin() {
+				console.log("IlabAccount=",this.account+";Password=", this.password)
+				
 				let url = mydata_api + "/user/loginin";
+				
+				console.log("url=",url)
+				
 				uni.request({
 					header: {
 						'Content-Type': 'application/json;charset=UTF-8'
@@ -76,8 +81,8 @@
 					url: url,
 					method: 'POST',
 					data: {
-						"IlabAccount": this.account,
-						"Password": this.password
+						"IlabAccount": this.account.toString(),
+						"Password": this.password.toString()
 					},
 					dataType: 'json',
 					success: (res) => {

components/startLearning/learningAndExperiment/ksxx_xxysy_sjkc/ksxx_xxysy_sjkc.vue

@@ -26,23 +26,6 @@
 		<!-- 右边详情页 -->
 		<scroll-view class="rightBox" scroll-y="true" :scroll-top="scrollTop" @scroll="scroll">
 			<view class="">
-				<!-- 学习知识点 -->
-				<!-- <view class="right-content df fdc" v-show="checkedIndex1==0">
-					<view v-for="(content,n) in myData_SJKC_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 jcc" 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 class="ylrz-cy df" v-show="checkedIndex1==0">
 					<!-- 开始测验 -->
@@ -109,21 +92,9 @@
 							<view class="ylrz-test-q">
 								{{(wrong+1)+'、'+test_YLRZ.list[wrong].q}}
 							</view>
-							<!-- 答案 -->
-							<!-- <view class="ylrz-test-a-box">
-								<view class="ylrz-test-a-box2">
-									<view class="df aic fdr ylrz-test-a" v-for="(answer2,answerI2) in test_YLRZ.list[wrong].a_list" :key="answerI2">
-										<img class="ylrz-test-a-img" :src="test_YLRZ.list[wrong].a[answerI2]==1?test_answer_icon_checked:allCheckedAnswer[wrong][answerI2]==1?test_answer_icon_wrong:test_answer_icon_unchecked"></img>
-										<view class="ylrz-test-a-text" :style="{color:test_YLRZ.list[wrong].a[answerI2]==1?test_answer_color_checked:allCheckedAnswer[wrong][answerI2]==1?test_answer_color_wrong:test_answer_color_unchecked}">
-											{{test_answer_pre[answerI2]+':'+answer2}}
-										</view>
-									</view>
-								</view>
-							</view> -->
 							<view class="ylrz-test-a-box">
 								<view class="ylrz-test-a-box2">
 									<view class="df aic fdr ylrz-test-a" v-for="(answer2,answerI2) in test_YLRZ.list[wrong].a_list" :key="answerI2">
-										<!-- <img class="ylrz-test-a-img" :src="test_YLRZ.list[wrong].a[answerI2]==1?test_answer_icon_checked:allCheckedAnswer[wrong][answerI2]==1?test_answer_icon_wrong:test_answer_icon_unchecked"></img> -->
 										<view class="ylrz-test-a-text">
 											{{test_answer_pre[answerI2]+':'+answer2}}
 										</view>
@@ -167,12 +138,6 @@
 				// ------以下为静态
 				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'),
@@ -209,8 +174,6 @@
 		},
 		methods: {
 			initData() {
-				// this.checkedIndex1 = 0;
-				// this.checkedIndex2 = 0;
 			},
 			onLeftBtn1Click(index) {
 				if (index != this.checkedIndex1) {

components/student/Index.vue

@@ -3,14 +3,9 @@
 		<view class="m_left">
 			<view class="m_hander">
 				<view class="m_teacher">
-					<!-- <image src="../../assets/login/loginPic2.png" class="m_head_portrait"></image>
-					<view class="m_teacher_name" v-text="name"></view>
-					<view class="m_teacher_position" v-text="position"></view> -->
-
 					<view class="user-left-avatar df">
 						<img :src="userInfo.avatarSrc"></img>
 					</view>
-					<!-- <image src="../../assets/login/loginPic2.png" class="m_head_portrait"></image> -->
 					<view class="m_teacher_name" v-text="userInfo.Name+userInfo.role"></view>
 					<view class="m_teacher_position" v-text="userInfo.Position"></view>
 				</view>
@@ -23,9 +18,6 @@
 							<span class="font_family " :class="item.select&&childrenIndex==-1? item.icon+' m_act1 ':item.icon"></span>
 						</view>
 						<view class="m_menu_item_name" :class="item.select&&childrenIndex==-1?'m_act_font':''">{{item.title}}</view>
-						<!-- <view class="m_menu_right">
-							<icon :type="''" class="font_family icon-lujing2 " :class="item.select? 'm_act11':''"></icon>
-						</view> -->
 					</view>
 				</view>
 
@@ -33,11 +25,6 @@
 		</view>
 		<vtable ref="vtable" v-show="index==1" v-on:viewProject='viewProject'></vtable>
 		<project ref="project" v-show="index==4" v-on:onBackToProjectList='onBackToProjectList'></project>
-		<!-- <teacher ref="teacher" v-show="index==1" @paging="paging"></teacher>
-		<create ref="create" v-show="index==3"></create>
-		<vtable ref="table" v-show="index==2"></vtable>
-		<project ref="project" v-show="index==4"></project>
-		<location ref="location" v-show="index==2||index==4"></location> -->
 	</view>
 </template>
 

components/student/project.vue

@@ -210,39 +210,39 @@
 			viewProject(obj, index) {
 				// console.log('进来的什么信息',obj)
 				this.projectData = [obj];
-				if(index==0){
-					this.fileData = [
-						{
-							"AliyunOssName": "_59458299-3b84-4895-98f6-b990cdaedc72_chrome_elf.dll",
-							"Id": "0b0d8876-71de-43e6-a3dd-59a3c8f6d069",
-							"Name": "《火星计划》气氛图",
-							"Pass": false,
-							"ProjectID": 30,
-							"ProjectName": "《火星计划》",
-							"Type": "气氛图",
-							"UPloadTime": "2021-05-13 18:19:12",
-							"URL": "https://www.yuyekeji.cn/H5/ZhongChuang/《火星计划》气氛图.jpeg",
-							"UpLoadUserID": "59458299-3b84-4895-98f6-b990cdaedc72",
-							"UploadUserDuty": "创建人",
-							"UploadUserName": "朱峰",
-						},
-						{
-							"AliyunOssName": "_59458299-3b84-4895-98f6-b990cdaedc72_chrome_elf.dll",
-							"Id": "0b0d8876-71de-43e6-a3dd-59a3c8f6d069",
-							"Name": "《火星计划》气氛图2",
-							"Pass": false,
-							"ProjectID": 30,
-							"ProjectName": "《火星计划》",
-							"Type": "气氛图",
-							"UPloadTime": "2021-05-13 18:19:12",
-							"URL": "https://www.yuyekeji.cn/H5/ZhongChuang/《火星计划》气氛图2.jpg",
-							"UpLoadUserID": "59458299-3b84-4895-98f6-b990cdaedc72",
-							"UploadUserDuty": "创建人",
-							"UploadUserName": "朱峰",
-						}
-					]
-					return;
-				}
+				// if(index==0){
+				// 	this.fileData = [
+				// 		{
+				// 			"AliyunOssName": "_59458299-3b84-4895-98f6-b990cdaedc72_chrome_elf.dll",
+				// 			"Id": "0b0d8876-71de-43e6-a3dd-59a3c8f6d069",
+				// 			"Name": "《火星计划》气氛图",
+				// 			"Pass": false,
+				// 			"ProjectID": 30,
+				// 			"ProjectName": "《火星计划》",
+				// 			"Type": "气氛图",
+				// 			"UPloadTime": "2021-05-13 18:19:12",
+				// 			"URL": "https://www.yuyekeji.cn/H5/ZhongChuang/《火星计划》气氛图.jpeg",
+				// 			"UpLoadUserID": "59458299-3b84-4895-98f6-b990cdaedc72",
+				// 			"UploadUserDuty": "创建人",
+				// 			"UploadUserName": "朱峰",
+				// 		},
+				// 		{
+				// 			"AliyunOssName": "_59458299-3b84-4895-98f6-b990cdaedc72_chrome_elf.dll",
+				// 			"Id": "0b0d8876-71de-43e6-a3dd-59a3c8f6d069",
+				// 			"Name": "《火星计划》气氛图2",
+				// 			"Pass": false,
+				// 			"ProjectID": 30,
+				// 			"ProjectName": "《火星计划》",
+				// 			"Type": "气氛图",
+				// 			"UPloadTime": "2021-05-13 18:19:12",
+				// 			"URL": "https://www.yuyekeji.cn/H5/ZhongChuang/《火星计划》气氛图2.jpg",
+				// 			"UpLoadUserID": "59458299-3b84-4895-98f6-b990cdaedc72",
+				// 			"UploadUserDuty": "创建人",
+				// 			"UploadUserName": "朱峰",
+				// 		}
+				// 	]
+				// 	return;
+				// }
 				this.getFileList();
 				this.getMemberList();
 			},

components/student/table.vue

@@ -22,21 +22,11 @@
 					</tr>
 				</tbody>
 			</table>
-			<!-- <view class="m_paging" style="margin-top: 80rpx;">
-				<text selectable="true"class="m_paging_item m_paging_upper">上一页</text>
-				<text selectable="true"class="m_paging_item" v-for="i in 8" @click="paging(i)" :key="i" :class="i==index?'p_act':''">
-					{{i}}
-				</text>
-				<text selectable="true"class="m_paging_item m_paging_lower">下一页</text>
-			</view> -->
 		</view>
-
-		<!-- <locationtemp ref="locationtemp"></locationtemp> -->
 	</view>
 </template>
 
 <script>
-	// import locationtemp from "./location_temp.vue"
 	export default {
 		name: "student_table",
 		data() {
@@ -45,12 +35,6 @@
 				tabledata: []
 			}
 		},
-		components: {
-			// locationtemp
-		},
-		created() {
-			// this.getList();
-		},
 		methods: {
 			paging(obj) {
 				this.index = obj;
@@ -67,18 +51,18 @@
 			
 						this.tabledata = res.data.Projects
 						// console.log('tabledata=',this.tabledata)
-						let aData = {
-							"CreateTime": "2020-01-01 00:00:00",
-							"CreateUserID": "59458299-3b84-4895-98f6-b990cdaedc72",
-							"CreateUserName": "朱峰",
-							"Describe": '“实验以振兴国产科技电影”和“实现中国航天强国梦”的宏大蓝图为背景，以我国首次登陆火星计划为现实脚本，运用现场实时特效技术手段，对火星地面、外太空等场景进行“经典学习”和“实践创兴”并通过持续开发和学生在实验过程中的资源上传不断扩大现场创作的实景和虚拟资产库，使学生再学习过程中，即是资源学习者和方案讨论者，也是资源建设者',
-							"Id": 30,
-							"ProjectName": "《火星计划》",
-							"ProjectReviewImage": "../../../assets/studentAndTeacher/table/marsPlanReviewImage.png",
-							"ReviewImageOss": "../../../assets/studentAndTeacher/table/marsPlanMainCover.png",
-							"Type": "科幻",
-						}
-						this.tabledata.unshift(aData);
+						// let aData = {
+						// 	"CreateTime": "2020-01-01 00:00:00",
+						// 	"CreateUserID": "59458299-3b84-4895-98f6-b990cdaedc72",
+						// 	"CreateUserName": "朱峰",
+						// 	"Describe": '“实验以振兴国产科技电影”和“实现中国航天强国梦”的宏大蓝图为背景，以我国首次登陆火星计划为现实脚本，运用现场实时特效技术手段，对火星地面、外太空等场景进行“经典学习”和“实践创兴”并通过持续开发和学生在实验过程中的资源上传不断扩大现场创作的实景和虚拟资产库，使学生再学习过程中，即是资源学习者和方案讨论者，也是资源建设者',
+						// 	"Id": 30,
+						// 	"ProjectName": "《火星计划》",
+						// 	"ProjectReviewImage": "../../../assets/studentAndTeacher/table/marsPlanReviewImage.png",
+						// 	"ReviewImageOss": "../../../assets/studentAndTeacher/table/marsPlanMainCover.png",
+						// 	"Type": "科幻",
+						// }
+						// this.tabledata.unshift(aData);
 						// console.log('res=',this.tabledata)
 						this.$forceUpdate();//强制刷新页面
 					}

components/user/selfInfo.vue

@@ -11,12 +11,6 @@
 			</view>
 		</view>
 		<view class="user-full" v-show="showIndex_userInfo==1">
-			<!--<view class="box1 df fdr aic">-->
-				<!--<view class="self-avatar df">-->
-					<!--<img :src="userInfo.avatarSrc"></img>-->
-				<!--</view>-->
-				<!--<view class="self-btn02 df jcc aic" @click="onUploadAvatar">上传头像</view>-->
-			<!--</view>-->
 			<view class="box2 df ">
 				<view class="box2-content">
 					<view class="title df fdr aic">
@@ -31,17 +25,6 @@
 								<view class="table-title">姓名</view>
 								<input class="form-input" name="input" placeholder="输入姓名" v-model="model.Name" />
 							</view>
-							<!-- <view class="box2-table-box-left-item df fdr aic jcsb">
-								<view class="table-title">性别</view>
-								<picker @change="bindPickerChange_sex" :value="sexIndex" :range="array_sex">
-									<view class="form-input df fdr aic jcsb">
-										<view>{{array_sex[sexIndex]}}</view>
-										<view>
-											<img src="../../assets/user/pic_user_03.png" />
-										</view>
-									</view>
-								</picker>
-							</view> -->
 							<view class="box2-table-box-left-item df fdr aic jcsb">
 								<view class="table-title">政治面貌</view>
 								<input class="form-input" name="input" placeholder="请输入" v-model="model.PoliticsStatus" />
@@ -63,21 +46,6 @@
 							</view>
 						</view>
 						<view class="box2-table-box-right">
-							<!-- <view class="box2-table-box-left-item df fdr aic jcsb">
-								<view class="table-title">生日</view>
-								<input class="form-input" name="input" placeholder="例：2020-01-23" />
-							</view> -->
-							<!-- <view class="box2-table-box-left-item df fdr aic jcsb">
-								<view class="table-title">民族</view>
-								<picker @change="bindPickerChange_mz()" :value="mzIndex" :range="array_mz">
-									<view class="form-input df fdr aic jcsb">
-										<view>{{array_mz[mzIndex]}}</view>
-										<view>
-											<img src="../../assets/user/pic_user_03.png" />
-										</view>
-									</view>
-								</picker>
-							</view> -->
 							<view class="box2-table-box-left-item df fdr aic jcsb">
 								<view class="table-title">民族</view>
 								<picker @change="bindPickerChange_mz" :value="mzIndex" :range="array_mz">
@@ -127,10 +95,6 @@
 								<view class="table-title">班级</view>
 								<input class="form-input" name="input" placeholder="请输入" v-model="model.Class" />
 							</view>
-							<!-- <view class="box2-table-box-left-item df fdr aic jcsb">
-								<view class="table-title">职务</view>
-								<input class="form-input" name="input" placeholder="请输入" v-model="model.Post" />
-							</view> -->
 						</view>
 						<view class="box2-table-box-right">
 							<view class="box2-table-box-left-item df fdr aic jcsb">

components/user/user.vue

@@ -420,6 +420,8 @@
 
 	.user-left-avatar img {
 		width: px2vw(120);
+		height: px2vw(120);
+		// overflow: hidden;
 		margin-top: px2vw(74);
 	}
 

myData.js

@@ -30,4 +30,5 @@ mydata_userInfo = {
 }
 // mydata_api='http://39.105.166.141:8085'
 // mydata_api='http://8.140.128.1:8085'
-mydata_api='http://ilabtft.cuc.edu.cn/web'
+mydata_api='http://ilabtft.cuc.edu.cn/web'
+// mydata_api='http://www.tanhuagame.com:8085/web'