yuanyiming 1 年之前
父節點
當前提交
720c944a11

+ 1 - 0
App.vue

@@ -6,6 +6,7 @@
 				
 
 				uni.setStorageSync('login', '0');
+				// uni.setStorageSync('msgLogin', '0');
 				
 				
 				uni.getSystemInfo({

+ 15 - 6
components/detailBlock/detailBlock.vue

@@ -16,12 +16,11 @@
 			<view class="content">
 				<view ref="p" :class="getClassNames">
 					<text style="color: #999999;">教研室概况:</text>
-					这是一段需要展开收起的文字,可以有很多很多的字,可能会占据很多的空间。因此,在默认情况下,我们只会显示部分文字,而把其余的部分折叠起
-					来。如果需要查看全部内容,可以点击“查看更多按钮,文
+					{{item.info}}
 				</view>
 
 				<view ref="btnnn" :class="getClassNames1" @click="qqq">
-					{{isAll ? '收起' : '展开'}}
+					<!-- {{isAll ? '收起' : '展开'}} -->
 				</view>
 			</view>
 			
@@ -38,7 +37,8 @@
 				type: Object,
 				default () {
 					return {
-						isshow: 0 //0教研室 1 活动
+						isshow: 0, //0教研室 1 活动
+						info:''
 					}
 				}
 			}
@@ -99,8 +99,17 @@
 			}
 
 			.content {
-				// display: flex;
-				// float: left;
+				white-space: normal;
+				/*隐藏溢出*/
+				/*当文本溢出包含元素时显示省略符号来代表被修剪的文本*/
+				/*规定段落中的文本不进行换行*/
+				letter-spacing: 2rpx;
+				display: -webkit-box;
+				word-break: break-all;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 4;
 			}
 
 			.content .p {

+ 133 - 95
pages/activityDetail/activityDetail.vue

@@ -2,68 +2,70 @@
 	<!-- 教研室详情 -->
 	<view class="activityDetail">
 		<statusBar :item="navbar"></statusBar>
-		
+
 		<!-- 顶部 -->
-			<view class="backPic">
-				<image src="http://43.139.158.220:5007/img/static/yym/Rectangle 40.png" mode="aspectFill"></image>
-				<view style="padding: 0 30rpx;margin-bottom: 20px;">
-					<view class="card">
-						<view class="cardTop three-font">
-							2023年全国国际银行分行“防范灾害风险护航高质量发展”防灾减灾志愿宣传活动
-						</view>
-						<view class="col fz-font">
-							活动日期:<text>5.12~5.13</text>
-						</view>
-						<view class="col fz-font">
-							招募人数:<text>23/50</text>
-						</view>
-						<view class="col fz-font">
-							活动地址:<text>龙岗将军帽路一号深圳技师学院</text>
-							<uni-icons type="location" color="#0056a8"  style="position: absolute;right: 10px;top: 0;width: 32rpx;height: 45rpx;"></uni-icons>
-						</view>
+		<view class="backPic">
+			<image src="http://43.139.158.220:5007/img/static/yym/Rectangle 40.png" mode="aspectFill"></image>
+			<view style="padding: 0 30rpx;margin-bottom: 20px;">
+				<view class="card">
+					<view class="cardTop three-font">
+						创业意识与商机识别
+					</view>
+					<view class="col fz-font">
+						活动日期:<text>5.12~5.13</text>
+					</view>
+					<view class="col fz-font">
+						招募人数:<text>23/50</text>
+					</view>
+					<view class="col fz-font">
+						活动地址:<text>龙岗将军帽路一号深圳技师学院</text>
+						<uni-icons type="location" color="#0056a8"
+							style="position: absolute;right: 10px;top: 0;width: 32rpx;height: 45rpx;"></uni-icons>
 					</view>
 				</view>
 			</view>
-		
+		</view>
+
 		<!-- 创建者用户名 -->
 		<view style="padding: 0 30rpx;">
 			<view class="creator">
-				<image src="http://43.139.158.220:5007/img/static/mine/Avatar.png" mode="aspectFill"></image>
+				<image src="https://file.icve.com.cn/file_doc_public/86/519/15A81C36346AC850A5F0FD456F759D1A.jpg" mode="aspectFill"></image>
 				<view class="creName btn-font">
-					发起者爱谁谁
+					曾秀臻
 				</view>
 			</view>
 		</view>
-		
+
 		<!-- 活动详情 -->
 		<view class="" style="padding: 0 30rpx;">
 			<detailBlock :item='judge'></detailBlock>
 		</view>
-		
 
-		
+
+
 		<!-- 当前成员 -->
 		<view style="padding: 0 30rpx;">
 			<view class="member">
 				<view class="memberTop">
 					<view class="btn-font">报名情况(已报名23人)</view>
-					<view class="fz-font" style="color: #666666;display: flex;align-items: center;" @click="perList">
-						查看更多
-						<uni-icons type="right"></uni-icons>
+					<view class="fz-font" style="color: rgba(0, 0, 0, 0.4);display: flex;align-items: center;" @click="perList">
+						<text>查看更多</text>
+						<image src="http://43.139.158.220:5007/img/static/mine/arrow-right.png" style="width: 32rpx;height: 32rpx;" mode="aspectFill"></image>
+						<!-- <uni-icons type="right"></uni-icons> -->
 					</view>
 				</view>
-				
+
 				<view class="pers">
-					<view class="per" v-for="i in 6">
-						<image src="http://43.139.158.220:5007/img/static/mine/Avatar.png" mode="aspectFill"></image>
+					<view class="per"  v-for="(item,index) in perNum">
+						<image :src="item.img"></image>
 						<view class="perName fz-font">
-							袁一鸣
+							{{item.Name}}
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
-		
+
 		<!-- 申请加入 -->
 		<view class="btnBlock">
 			<button class="btn" @click="gotoAdd">立即报名</button>
@@ -75,41 +77,64 @@
 	export default {
 		data() {
 			return {
-				navbar:{
-					title:'活动详情',
-					btn:1
+				navbar: {
+					title: '活动详情',
+					btn: 1
 				},
-				judge:{
-					isShow:1
-				}
-			};
-		},
-		methods:{
-			perList(){
-				uni.navigateTo({
-					url:'/pages/dy/dy'
-				})
+				judge: {
+					isShow: 1,
+					info:'你对创业感兴趣吗?想初步了解创业吗?你是否对确定创业方向和创业机会有选择的困惑呢?在创新创业的大氛围下,课堂上常常强调要以项目为中心,你却苦于迟迟无法最终确定具体的项目?那么,《创业意识与商机识别》这门课程可以帮助你。'
+				},
+				perNum: [{
+						Name: '陈芬',img:'http://43.139.158.220:5007/img/static/yym/Ellipse 4 (3).png'
+					},
+					{
+						Name: '贺豪杰',img:'http://43.139.158.220:5007/img/static/yym/Ellipse 4 (4).png'
+					},
+					{
+						Name: '张孝迪',img:'http://43.139.158.220:5007/img/static/yym/Ellipse 4.png'
+					},
+					{
+						Name: '马冬梅',img:'http://43.139.158.220:5007/img/static/yym/Ellipse 4 (2).png'
+					},
+					{
+						Name: '康雯妍',img:'http://43.139.158.220:5007/img/static/yym/Ellipse 4 (1).png'
+					},
+					{
+						Name: '张燕琴',img:'http://43.139.158.220:5007/img/static/mine/Avatar.png'
+					}]
+
+				};
 			},
-			gotoAdd(){
-				uni.navigateTo({
-					url:'/pages/hd/hd'
-				})
+			methods: {
+				perList() {
+					uni.navigateTo({
+						url: '/pages/dy/dy'
+					})
+				},
+				gotoAdd() {
+					uni.navigateTo({
+						url: '/pages/hd/hd'
+					})
+				}
 			}
 		}
-	}
 </script>
 
 <style lang="scss">
-	.activityDetail{
+	.activityDetail {
 		padding-bottom: 80px;
-		.backPic{
+
+		.backPic {
 			width: 750rpx;
 			position: relative;
-			image{
+
+			image {
 				width: 100%;
 				display: block;
 			}
-			.card{
+
+			.card {
 				position: absolute;
 				width: 690rpx;
 				// height: 150px;
@@ -119,8 +144,9 @@
 				padding: 30rpx;
 				border-radius: 10px;
 				background-color: #ffffff;
-				transform: translate(-50%,0);
-				.cardTop{
+				transform: translate(-50%, 0);
+
+				.cardTop {
 					// display: flex;
 					// justify-content: center;
 					// padding-bottom: 5px;
@@ -132,12 +158,15 @@
 					text-overflow: ellipsis;
 					overflow: hidden;
 					-webkit-box-orient: vertical;
-					-webkit-line-clamp:2;/*设置 需要显示的行数*/
-					.title{
+					-webkit-line-clamp: 2;
+
+					/*设置 需要显示的行数*/
+					.title {
 						font-weight: bold;
 					}
 				}
-				.col{
+
+				.col {
 					position: relative;
 					margin-bottom: 10rpx;
 					color: #999999;
@@ -149,20 +178,24 @@
 					text-overflow: ellipsis;
 					overflow: hidden;
 					-webkit-box-orient: vertical;
-					-webkit-line-clamp:2;/*设置 需要显示的行数*/
-					text{
+					-webkit-line-clamp: 2;
+
+					/*设置 需要显示的行数*/
+					text {
 						color: #333333;
 					}
 				}
-				.tag{
+
+				.tag {
 					display: flex;
 				}
 			}
+
 			// background-image: url(http://43.139.158.220:5007/img/static/resource/jqr.png);
 		}
-	
-		
-		.creator{
+
+
+		.creator {
 			display: flex;
 			// padding: 10px 30px;
 			padding: 30rpx 20rpx;
@@ -171,63 +204,68 @@
 			margin-top: 30px;
 			margin-bottom: 20rpx;
 			border-radius: 10px;
-			image{
+
+			image {
 				width: 96rpx;
 				height: 96rpx;
 				border-radius: 50%;
 				margin-right: 20rpx;
 			}
-			.creName{
+
+			.creName {
 				font-weight: bold;
 			}
 		}
-		
-		.member{
+
+		.member {
 			background-color: #ffffff;
 			margin-top: 20rpx;
-			// padding: 10px 10px;
 			padding: 30rpx;
-			// border: 10px;
 			border-radius: 10px;
-			.memberTop{
+			margin-bottom: 30rpx;
+			.memberTop {
 				display: flex;
 				justify-content: space-between;
 				margin-bottom: 10px;
 			}
-				
-				.pers{
+
+			.pers {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+
+				.per {
+					// display: inline-block;
 					display: flex;
-					justify-content: space-between;
+					flex-direction: column;
+					// justify-content: center;
 					align-items: center;
-					.per{
-						// display: inline-block;
-						display: flex;
-						flex-direction: column;
-						// justify-content: center;
-						align-items: center;
-						image{
-							width: 72rpx;
-							height: 72rpx;
-							border-radius: 50%;
-						}
-						.perName{
-							// font-size: 14px;
-							text-align: center;
-						}
+
+					image {
+						width: 72rpx;
+						height: 72rpx;
+						border-radius: 50%;
+					}
+
+					.perName {
+						// font-size: 14px;
+						text-align: center;
 					}
-					
 				}
-				
+
+			}
+
 		}
-		
-		.btnBlock{
+
+		.btnBlock {
 			position: fixed;
 			bottom: 0;
 			width: 750rpx;
 			background-color: #ffffff;
 			// padding: 20px 0;
 			padding: 2vh 0;
-			.btn{
+
+			.btn {
 				width: 432rpx;
 				height: 88rpx;
 				font-weight: 500;

+ 4 - 4
pages/hd/hd.vue

@@ -4,12 +4,12 @@
 		
 		<view class="top">
 				<view class="card">
-					<image class="image" src="../../static/jys/jys.png" mode=""></image>
+					<image class="image" src="http://43.139.158.220:5007/img/static/mine/img11.jpg" mode="aspectFill"></image>
 					<view class="text">
 						
 						<view class="text_title">
 							<view class="manage bqZ-font">类型</view>
-							<view class="t1 bmTit-font">这里是活动名活动名活动名活动名</view>
+							<view class="t1 bmTit-font">创业意识与商机识别</view>
 						</view>
 						<view class="col sZw-font">
 							活动日期:5.12~5.13
@@ -29,7 +29,7 @@
 						<view class="textcolor">
 							<view class="name  sZw-font">
 								姓名:
-								<text class="name1  sZw-font">李某某</text>
+								<text class="name1  sZw-font">曾秀臻</text>
 							</view>
 							<view class="name  sZw-font">
 								联系方式:
@@ -37,7 +37,7 @@
 							</view>
 							<view class="name  sZw-font">
 								单位:
-								<text class="dw1  sZw-font">xx实验中学学校</text>
+								<text class="dw1  sZw-font">深圳职业技术大学</text>
 							</view>
 						</view>
 					</view>

+ 1 - 1
pages/hdxx/hdxx.vue

@@ -12,7 +12,7 @@
 				<view class="main">
 					<view class="fwb-font">
 						恭喜!您已成功完成
-						<text class="btn-font" style="color: #0056a8;">“XXXX讲座”</text>
+						<text class="btn-font" style="color: #0056a8;">“创业意识与商机识别讲座”</text>
 						活动发布过程。您的活动现在已经在我们的平台上正式上线,可以被其他用户浏览和参加。请随时返回您的活动管理页面,以进行任何进一步的编辑、更新或促进活动的操作。
 					</view>
 				</view>

+ 7 - 7
pages/index/index.vue

@@ -56,17 +56,18 @@
 					btn: 0 //是否显示返回按钮 0不显示  1 显示
 				},
 				activeList: [{
-						img: 'http://43.139.158.220:5007/img/static/mine/img10.jpg',
-						count: '1790',
-						className: '创新思维开发与落地',
-						intro: '《暂无简介》'
-					},
-					{
 						img: 'http://43.139.158.220:5007/img/static/mine/img11.jpg',
 						count: '3842',
 						className: '创业意识与商机识别',
 						intro: '在创新创业的大氛围下,课堂上常常强调要以项目为中心,你却苦于迟迟无法最终确定具体的项目?那么,《创业意识与商机识别》这门课程可以帮助你。'
 					},
+					{
+						img: 'http://43.139.158.220:5007/img/static/mine/img10.jpg',
+						count: '1790',
+						className: '创新思维开发与落地',
+						intro: '《暂无简介》'
+					},
+
 					{
 						img: 'http://43.139.158.220:5007/img/static/mine/img12.png',
 						count: '701',
@@ -172,7 +173,6 @@
 			},
 			gotoHd() {
 				const value = uni.getStorageSync('login');
-				console.log(value == true);
 				if (value == 0) {
 					console.log(11);
 					uni.navigateTo({

+ 4 - 4
pages/jys/jys.vue

@@ -3,12 +3,12 @@
 		<statusBar :item="navBarData"></statusBar>
 		<view class="top">
 				<view class="card">
-					<image class="image" src="../../static/jys/jys.png" mode=""></image>
+					<image class="image" src="http://43.139.158.220:5007/img/static/mine/img1.jpg" mode="aspectFill"></image>
 					<view class="text">
 						
 						<view class="text_title">
 							<view class="manage bqZ-font">类型</view>
-							<view class="t1 bmTit-font">这里是活动名活动名活动名活动名</view>
+							<view class="t1 bmTit-font">创业者管理能力训练基础</view>
 						</view>
 						<view class="col sZw-font">
 							活动日期:5.12~5.13
@@ -28,7 +28,7 @@
 						<view class="textcolor">
 							<view class="name  sZw-font">
 								姓名:
-								<text class="name1  sZw-font">李某某</text>
+								<text class="name1  sZw-font">李</text>
 							</view>
 							<view class="name  sZw-font">
 								联系方式:
@@ -36,7 +36,7 @@
 							</view>
 							<view class="name  sZw-font">
 								单位:
-								<text class="dw1  sZw-font">xx实验中学学校</text>
+								<text class="dw1  sZw-font"> 浙江工贸职业技术学院</text>
 							</view>
 						</view>
 					</view>

+ 47 - 21
pages/login/login.vue

@@ -1,15 +1,19 @@
 <template>
 	<view class="login">
 		<statusBar :item='navBarData'></statusBar>
+		
 		<view class="img">
 			<image src="http://43.139.158.220:5007/img/static/yym/image7.png" mode="aspectFill"></image>
 		</view>
 
 		<view class="mid">
-			<view class="quan"></view>
+			
 			<!-- <radio value="r1" @click="radioCheck" size="10" :checked="isOK" /> -->
-			<view class="">
+			<view class="" style="position: relative;padding-left:30rpx;">
 				我已阅读并同意<text>《教育小程序服务条款》</text>和 <text>《 隐私协议》</text>新用户自动注册
+				<view class="quan" @click="isDui">
+					<image v-if="isShow" class="dui" src="http://43.139.158.220:5007/img/static/yym/dui.png" mode="aspectFill"></image>
+				</view>
 			</view>
 		</view>
 
@@ -29,16 +33,27 @@
 					title: '首页',
 					btn: 1 //判断是否显示返回按钮
 				},
+				isMsg:0,
+				isShow:false
 			};
 		},
 		methods: {
 			gotoIndex() {
-				const value = uni.setStorageSync('login', '1');
-
-				uni.switchTab({
-					url: '/pages/index/index'
-				})
-
+					const value = uni.setStorageSync('login', '1');
+					uni.switchTab({
+						url: '/pages/index/index'
+					})
+				// if(this.isMsg==1){
+				// 	uni.setStorageSync('msgLogin', '1');
+				// 	uni.switchTab({
+				// 		url: '/pages/message/message'
+				// 	})
+				// }else{
+				// 	const value = uni.setStorageSync('login', '1');
+				// 	uni.switchTab({
+				// 		url: '/pages/index/index'
+				// 	})
+				// }
 			},
 			goto() {
 				uni.navigateTo({
@@ -47,7 +62,14 @@
 			},
 			radioCheck() {
 				this.isOK = !this.isOK
+			},
+			isDui(){
+				this.isShow=!this.isShow
 			}
+		},
+		onLoad(opt) {
+			console.log(opt);
+			this.isMsg=opt.id
 		}
 	}
 </script>
@@ -58,13 +80,13 @@
 		height: 100vh;
 
 		.img {
-			// margin-top: 150rpx;
-			// background-color: #ccc;
-			padding: 10vh 0;
+			// padding: 10vh 0;
+			padding-top: 10vh;
+			margin-bottom: 10vh;
 			width: 750rpx;
 			display: flex;
 			justify-content: center;
-
+			
 			image {
 				width: 200rpx;
 				height: 200rpx;
@@ -77,23 +99,27 @@
 			display: flex;
 			justify-content: flex-start;
 			width: 750rpx;
-			padding: 0rpx 20rpx;
+			padding: 0rpx 50rpx;
 			font-size: 13px;
 
-			::v-deep uni-radio .uni-radio-input {
-				width: 10rpx;
-				height: 10rpx;
-			}
-
 			.quan {
+				position: absolute;
 				flex-shrink: 0;
-				width: 15px;
-				height: 15px;
+				top: 0;
+				left: -10rpx;
+				width: 32rpx;
+				height: 32rpx;
 				border-radius: 50%;
 				margin-top: 5rpx;
-				// background-color: #4a97f2;
 				margin-right: 10rpx;
 				border: 1px #bdbdbd solid;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				.dui {
+					width: 32rpx;
+					height: 32rpx;
+				}
 			}
 
 			text {

+ 14 - 9
pages/message/message.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="messBox">
 		<statusBar :item="navbarData"></statusBar>
-		<view class="" v-if="isLogin==1">
+		<view class="" v-if="msgLogin==1">
 			<view class="mesItem" @click="goToMesDetail">
 				<view class="leftBox">
 					<view class="mesImg">
@@ -10,7 +10,7 @@
 
 					<view class="mesBrief">
 						<view class="tit">活动通知</view>
-						<view class="breif fz-font" style="line-height: 40rpx;">活动报名成功</view>
+						<view class="breif fz-font" style="line-height: 40rpx;">活动报名发布</view>
 					</view>
 				</view>
 
@@ -31,7 +31,7 @@
 
 					<view class="mesBrief">
 						<view class="tit ">系统通知</view>
-						<view class="breif fz-font" style="line-height: 40rpx;">已加入xxxxxx教研室</view>
+						<view class="breif fz-font" style="line-height: 40rpx;">已加入“创业者管理能力基础训练”教研室</view>
 					</view>
 				</view>
 
@@ -50,7 +50,7 @@
 					</view>
 					<view class="mesBrief">
 						<view class="tit ">订阅消息</view>
-						<view class="breif fz-font" style="line-height: 40rpx;">xxx教研室更新了课程</view>
+						<view class="breif fz-font" style="line-height: 40rpx;">欢迎订阅“创业者管理能力基础训练”讲座</view>
 					</view>
 				</view>
 				<view class="right">
@@ -91,8 +91,8 @@
 				isAll: 1,
 				xt: 1,
 				dy: 1,
-				isLogin: 0
-
+				msgLogin: 0
+				
 			};
 		},
 		methods: {
@@ -116,12 +116,13 @@
 			},
 			gotoLogin() {
 				uni.navigateTo({
-					url: '/pages/login/login'
+					url: '/pages/login/login?id=1'
 				});
 			}
 		},
 		onShow() {
-			this.isLogin = uni.getStorageSync('login');
+			// this.msgLogin = uni.getStorageSync('msgLogin');
+			this.msgLogin = uni.getStorageSync('login');
 		}
 
 	}
@@ -158,9 +159,11 @@
 					line-height: 48rpx;
 					font-size: 34rpx;
 				}
-				.brief{
+
+				.brief {
 					margin-top: 10rpx;
 				}
+
 				image {
 					width: 175rpx;
 					height: 148rpx;
@@ -170,6 +173,8 @@
 					margin-top: 30rpx;
 					width: 160rpx;
 					height: 64rpx;
+					font-size: 28rpx;
+					// font-weight: 600;
 					display: flex;
 					justify-content: center;
 					align-items: center;

+ 6 - 6
pages/messageDy/messageDy.vue

@@ -6,19 +6,19 @@
 			<view class="text">
 				<view class="header">
 					<view class="disC three-font">
-						欢迎订阅“XXXX讲座”
+						欢迎订阅“创业者管理能力基础训练”讲座
 						<text class="sj fwb-font">13:28</text>
 					</view>
 				</view>
 				<view class="main">
-					<view style="text-indent: 0em">
+					<view class="fwb-font" style="text-indent: 0em">
 						尊敬的
-						<text>XXX</text>
+						<text>刘雨潼 </text>
 					</view>
 
-					<view>
+					<view class="fwb-font">
 						您已成功订阅
-						<text class="btn-font" style="color: #0056a8;">[XXXX讲座名称]</text>
+						<text class="btn-font" style="color: #0056a8;">[创业者管理能力基础训练]讲座</text>
 						!欢迎加入我们的团队,我们期待与您一同合作并共同追求卓越教育。
 					</view>
 				</view>
@@ -32,7 +32,7 @@ export default {
 	data() {
 		return {
 			navBarData: {
-				title: '系统消息',
+				title: '订阅消息',
 				btn: 1
 			}
 		};

+ 5 - 5
pages/messageSystem/messageSystem.vue

@@ -23,19 +23,19 @@
 			<view class="text">
 				<view class="header">
 					<view class="disC three-font">
-						成功加入教研室
+						成功加入[创业者管理能力基础训练]教研室
 						<text class="sj fwb-font">13:28</text>
 					</view>
 				</view>
 				<view class="main">
-					<view style="text-indent: 0em">
+					<view class="fwb-font" style="text-indent: 0em">
 						尊敬的
-						<text>XXX</text>
+						<text>刘雨潼</text>
 					</view>
 
-					<view>
+					<view class="fwb-font">
 						我们很高兴通知您,您已成功加入
-						<text class="btn-font" style="color: #0056a8;">[教研室名称]</text>
+						<text class="btn-font" style="color: #0056a8;">[创业者管理能力基础训练]</text>
 						!欢迎加入我们的团队,我们期待与您一同合作并共同追求卓越教育。
 					</view>
 				</view>

+ 9 - 5
pages/mine/mine.vue

@@ -4,12 +4,12 @@
 		<view class="mineBox">
 			<view class="userInformation" @click="gotoMineEdit">
 				<view class="userAvatar">
-					<image :src="userAvatar ? userAvatar : 'http://43.139.158.220:5007/img/static/mine/Avatar_default.png'" mode="aspectFill"></image>
+					<image :src="isManage==1 ? userAvatar : 'http://43.139.158.220:5007/img/static/mine/Avatar_default.png'" mode="aspectFill"></image>
 				</view>
 				<view class="userInfo">
 					<view class="infoTextone">
-						<text class="twoZ-font">{{ username ? username : '未登录' }}</text>
-						<span v-if="isManage" class="manage bq-font">管理员</span>
+						<text class="twoZ-font">{{ isManage==1 ? username : '未登录' }}</text>
+						<span v-if="isManage==1" class="manage bq-font">管理员</span>
 					</view>
 					<view class="infoTexttwo">
 						<text style="font-size: 26rpx;font-weight: 400;line-height: 42rpx;color: #999999;">个性签名</text>
@@ -100,9 +100,9 @@ export default {
 				title: '我的',
 				btn: 0
 			},
-			username: '情绪稳定的疯子',
+			username: '刘雨潼',
 			userAvatar: 'http://43.139.158.220:5007/img/static/mine/Avatar.png',
-			isManage: true
+			isManage: 1
 		};
 	},
 	methods: {
@@ -138,6 +138,10 @@ export default {
 			})
 		}
 	},
+	onShow() {
+		this.isManage=uni.getStorageSync('login')
+		
+	}
 };
 </script>
 

+ 3 - 0
pages/mineEdit/mineEdit.vue

@@ -308,6 +308,9 @@
 				border-radius: 100rpx;
 				border: 1px solid lightgray;
 				font-size: 36rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
 				color: #545454;
 				text-align: center;
 				&:first-child{

+ 11 - 9
pages/resource/resource.vue

@@ -195,15 +195,17 @@
 		methods: {
 			gotoLogin() {
 
-				uni.navigateTo({
-					url: "/pages/login/login"
-				})
-				// const value = uni.getStorageSync('login');
-				// if (value == 0) {
-
-				// } else {
-				// 	console.log(111);
-				// }
+				// uni.navigateTo({
+				// 	url: "/pages/login/login"
+				// })
+				const value = uni.getStorageSync('login');
+				if (value == 0) {
+					uni.navigateTo({
+						url: "/pages/login/login"
+					})
+				} else {
+					console.log(111);
+				}
 
 			},
 			toggleActive1() {

+ 25 - 11
pages/teachingDetail/teachingDetail.vue

@@ -8,7 +8,7 @@
 			<image src="http://43.139.158.220:5007/img/static/yym/Rectangle 40.png" mode="aspectFill"></image>
 			<view class="card">
 				<view class="cardTop">
-					<view class="title three-font">xxxx虚拟教研教室</view>
+					<view class="title three-font">创业者管理能力训练基础</view>
 					<view class="icons">
 						<view class="icon">
 							<image src="http://43.139.158.220:5007/img/static/yym/Star 1 (Stroke) (2).png" style="width: 42rpx;height: 40rpx;" mode="aspectFill"></image>
@@ -22,7 +22,7 @@
 					成立日期:2023.5.12
 				</view>
 				<view class="col fz-font">
-					人数:23
+					人数:7679
 				</view>
 				<view class="tag col">
 					<view class="fz-font">教研标签:</view>
@@ -49,15 +49,15 @@
 		
 		<!-- 教研室详情 -->
 		<view class="" style="padding: 0 30rpx;">
-			<detailBlock></detailBlock>
+			<detailBlock :item="judge"></detailBlock>
 		</view>
 		
 		<!-- 创建者用户名 -->
 		<view style="padding: 0 30rpx;">
 			<view class="creator">
-				<image src="http://43.139.158.220:5007/img/static/mine/Avatar.png" mode="aspectFill"></image>
+				<image src="https://file.icve.com.cn/file_doc_public/950/667/EDAA6EB078AC9BB59B9635A1823CE552.jpg" mode="aspectFill"></image>
 				<view class="creName btn-font">
-					创建者用户名
+					李芳
 				</view>
 			</view>
 		</view>
@@ -67,17 +67,18 @@
 			<view class="member">
 				<view class="memberTop">
 					<view class="btn-font" >当前成员</view>
-					<view class="fz-font" style="color: #666666;display: flex;align-items: center;" @click="gotoMorePer">
-						查看更多
-						<uni-icons type="right"></uni-icons>
+					<view class="fz-font" style="color: rgba(0, 0, 0, 0.4);display: flex;align-items: center;" @click="gotoMorePer">
+						<text>查看更多</text>
+						<image src="http://43.139.158.220:5007/img/static/mine/arrow-right.png" style="width: 32rpx;height: 32rpx;" mode="aspectFill"></image>
+						<!-- <uni-icons type="right"></uni-icons> -->
 					</view>
 				</view>
 				
 				<view class="pers">
-					<view class="per" v-for="i in 6">
-						<image src="http://43.139.158.220:5007/img/static/mine/Avatar.png" mode="aspectFill"></image>
+					<view class="per" v-for="i in perNum">
+						<image :src="i.img"></image>
 						<view class="perName fz-font">
-							袁一鸣
+							{{i.Name}}
 						</view>
 					</view>
 				</view>
@@ -98,6 +99,18 @@
 				navbar:{
 					title:'教研室详情',
 					btn:1
+				},
+				perNum:[
+					{Name:'金晶',img:'http://43.139.158.220:5007/img/static/yym/Ellipse 4 (1).png'},
+					{Name:'朱心艺',img:'http://43.139.158.220:5007/img/static/yym/Ellipse 4 (2).png'},
+					{Name:'李红',img:'http://43.139.158.220:5007/img/static/yym/Ellipse 4 (3).png'},
+					{Name:'杨婉',img:'http://43.139.158.220:5007/img/static/yym/Ellipse 4 (4).png'},
+					{Name:'郑元雄',img:'http://43.139.158.220:5007/img/static/yym/Ellipse 4.png'},
+					{Name:'罗佳诚',img:'http://43.139.158.220:5007/img/static/yym/Ellipse 4 (3).png'}
+				],
+				judge: {
+					isShow: 0,
+					info:"《创业者管理能力训练基础》通过管理学、营销学、财税理论、创业基础知识及创业操作实务的提炼,以专题化的形式面向高职类所有专业的学生。本课程一共有三大部分、七个专题。分别为:第一部分,一般管理者能力训练基础,四个专题,即自我管理能力训练、团队管理能力训练、社会关系管理能力训练与团队建设能力训练。第二部分,创业者重要能力的领悟与训练,二个专题,即成功创业者的智力要素、成功创业者商务能力的领悟与训练"
 				}
 			};
 		},
@@ -250,6 +263,7 @@
 			margin-top: 20rpx;
 			padding: 30rpx;
 			border-radius: 10px;
+			margin-bottom: 30rpx;
 			.memberTop{
 				display: flex;
 				justify-content: space-between;