#

components/listBlock1/listBlock1.vue

@@ -1,12 +1,13 @@
 <template>
 	<view class="">
 
-		<view class="listBlock1" v-for="(i,index) in classList" :key="index" @click="gotoLink" :data-link="i.link">
+		<view class="listBlock1" v-for="(i,index) in classList" :key="index" @click="gotoDetail"  :data-aid="i.acId">
 			<view class="img cell-img">
 				<image :src="i.pic" mode="aspectFill"></image>
 
 				<view class="starView" @click.stop="coll" :data-e="i">
-					<image class="star" :src="collArr.includes(i.acId) ? pic_coll2 : pic_coll " mode="aspectFill"></image>
+					<image class="star" :src="collArr.includes(i.acId) ? pic_coll2 : pic_coll " mode="aspectFill">
+					</image>
 
 				</view>
 
@@ -15,9 +16,11 @@
 
 			<view class="right">
 				<view class="title">
-					<view class="bqZ-font" :class="i.acshape=='线下活动'?'tag':'tag1'"> {{i.acshape}}</view>
+					<view class="bqZ-font" style="font-size: 20rpx;" :class="i.acshape=='线下活动'?'tag':'tag1'">
+						{{i.acshape}}
+					</view>
 
-					<view class="titTxt btn-font" style="">
+					<view class="titTxt btn-font" style="font-size:34rpx ;">
 						{{i.acName}}
 					</view>
 				</view>
@@ -35,10 +38,11 @@
 
 				<view class="operate">
 					<view class="left">
-						<view class="add fz-font">已报名{{i.bnum}}/{{i.pers}}人</view>
+						<view class="add fz-font">已报名{{i.bnum}}人</view>
 					</view>
-					<view class="Oright" v-if="!indexId"  @click.stop="gotoDetail" :data-aid="i.acId">
-						<view class="text">报名</view>
+					<!-- <view class="Oright" v-if="!indexId" @click.stop="gotoDetail" :data-aid="i.acId"> -->
+					<view class="Oright" v-if="!indexId">
+						<view class="text">{{ i.signNum?'已报名':'报名' }}</view>
 						<view class="arrow">
 							<image src="https://teacherapi.cocorobo.cn/teaching-file/static/mine/arrow-right-blue.png"
 								mode="aspectFill"></image>
@@ -123,9 +127,8 @@
 					this.stopTimer = 0
 				}, 500)
 
-				// return	console.log(event);
 				let aId = event.currentTarget.dataset.e.acId
-
+				
 				// let type= event.currentTarget.dataset.e.type
 
 				//判断是否收藏
@@ -140,7 +143,6 @@
 				this.$request('/selectOneOperator', 'POST', data).then(res => {
 					// console.log('查询是否收藏过',res);
 					res[0].length ? iscoll = true : iscoll = false;
-
 					// iscoll为true表示已经收藏过，执行删除  为true则收藏
 					if (iscoll) {
 						// this.animationDataArr.push({
@@ -150,7 +152,7 @@
 							collAoff: 0
 						})
 						// this.praiseMe()
-						console.log('执行删除');
+						// console.log('执行删除');
 						this.$request('/deleteOperator', 'POST', data).then(res => {
 							this.getdata()
 							setTimeout(() => {
@@ -167,7 +169,7 @@
 							collAoff: 1
 						})
 						// let aaa={collAoff: 1}
-						console.log('执行添加');
+						// console.log('执行添加');
 						this.$request('/insertOperator', 'POST', data).then(res => {
 							this.getdata()
 							// console.log(this.h);
@@ -243,7 +245,7 @@
 					res[0].forEach(i => {
 						this.collArr.push(i.acId)
 					})
-					// console.log(this.collArr);
+					// console.log('this.collArr',this.collArr);
 				})
 			},
 			goLog() {
@@ -273,7 +275,7 @@
 			.starView {
 				width: 40rpx;
 				height: 40rpx;
-			
+
 				box-sizing: content-box;
 				padding-bottom: 10rpx;
 				padding-left: 10rpx;
@@ -311,6 +313,7 @@
 				align-items: center;
 
 				.titTxt {
+					color: rgba(0, 0, 0, 0.8);
 					flex: 1;
 					font-weight: bold;
 					overflow: hidden;
@@ -395,8 +398,9 @@
 			border: 1px rgba(0, 178, 182, 1) solid;
 			flex-shrink: 0;
 			letter-spacing: 2rpx;
-			width: 104rpx;
-			height: 32rpx;
+			// width: 104rpx;
+			// height: 36rpx;
+			padding: 2rpx 4rpx;
 			display: flex;
 			white-space: nowrap;
 			justify-content: center;
@@ -408,19 +412,20 @@
 		}
 
 		.tag1 {
-			border: 1px rgba(0, 86, 168, 1) solid;
 			flex-shrink: 0;
 			letter-spacing: 2rpx;
-			width: 104rpx;
-			height: 32rpx;
+			// width: 104rpx;
+			// height: 36rpx;
+			padding: 2rpx 4rpx;
 			display: flex;
 			white-space: nowrap;
 			justify-content: center;
 			align-items: center;
 			border-radius: 4rpx;
 			margin-right: 10rpx;
-			color: rgba(0, 86, 168, 1);
 			line-height: 32rpx;
+			border: 1px rgba(0, 86, 168, 1) solid;
+			color: rgba(0, 86, 168, 1);
 		}
 	}
 </style>

pages/activityDetailNew/activityDetailNew.vue

@@ -68,7 +68,7 @@
 				<!-- <br /> -->
 				<view class="bricon">
 					<!-- <rich-text :nodes="">{{actItemList.brief}}</rich-text> -->
-					<rich-text  :nodes="actItemList.brief"></rich-text>
+					<rich-text :nodes="actItemList.brief"></rich-text>
 					<!-- <view style="color: blue;display: inline-block;" :data-link="actItemList.link"  @click="gotoLink">
 						<u-icon name="arrow-right" labelSize='14' size='14' labelColor='blue' space='2' color='blue' labelPos='left' label='查看更多'></u-icon>
 					</view> -->
@@ -104,7 +104,7 @@
 			<view class="rightBtn">
 				<view class="btnt1" v-if="actItemList.openid==oid">本人创建，暂不支持加入</view>
 				<view class="btnt" v-else-if="!isSign" @click="applyAdd">立即报名</view>
-				<view class="btnt1" v-else-if="isSign">已报名</view>
+				<view class="btnt" v-else-if="isSign" @click="cancelAdd">取消报名</view>
 				<view class="btnt1" v-else-if="actItemList.bnum>=actItemList.pers">人数已满</view>
 
 				<!-- <view class="btnt1" v-else-if="isSign && actItemList.openid!=oid">已报名</view> -->
@@ -118,11 +118,13 @@
 			<view class="popup-container" v-show="showPopup">
 				<view class="popup">
 					<view class="header">
-						<text>确认报名</text>
+						<text v-if="!isAdd">确认报名</text>
+						<text v-else>是否取消报名</text>
 					</view>
 					<view class="footer">
 						<view class="cancel-btn" @click="showPopup=false">取消</view>
-						<view class="confirm-btn" @click="conf">确认</view>
+						<view class="confirm-btn" v-if="!isAdd" @click="conf">确认</view>
+						<view class="confirm-btn" v-else @click="canc">确认</view>
 					</view>
 				</view>
 			</view>
@@ -163,6 +165,8 @@
 				showPopup: false,
 				// 是否已加入
 				isSign: 0,
+				// 判断显示报名弹窗还是取消报名弹窗
+				isAdd: 0,
 
 				// 报名列表
 				applyUserlist: [],
@@ -229,57 +233,108 @@
 					acId: this.acId,
 				}
 				this.$request('/selectActivityID', "POST", data).then(res => {
-					console.log('页面数据', res[0][0]);
+					// console.log('页面数据', res[0][0]);
 					this.actItemList = res[0][0]
 				})
 
 			},
 
-			// 申请加入
+			// 申请加入弹窗
 			applyAdd() {
 				// console.log('报名');
+				this.isAdd = 0
 				this.showPopup = true
 			},
-			// 确认操作
+			//显示取消报名弹窗
+			cancelAdd() {
+				this.isAdd = 1
+				this.showPopup = true
+			},
+
+			// 确认取消报名操作
+			canc() {
+				let data = {
+					oid: this.$store.state.user.openid, //用户id
+					acid: this.acId,
+				}
+				this.$request('/deleteApply', "POST", data).then(res => {
+
+					console.log('取消报名返回', res);
+
+					this.btnEnroll()
+					this.getUsers()
+					// 弹窗关闭
+					this.showPopup = false
+					uni.showToast({
+						title: '已取消报名',
+						icon: 'none',
+					})
+				})
+
+
+
+			},
+
+			// 确认报名操作
 			conf() {
-				// this.showPopup = false;
-				// this.showPopupConfirm = true
-				// 做最后判断防止同一时间进入报名页面都报名成功
-				this.$request('/selectIntercept', "POST", {
-					oid: this.$store.state.user.openid,
-					acid: this.acId
-				}).then(res => {
-					let c = res[0][0]
-					console.log('报名人数', res[0][0]);
-					console.log(c.bnum >= c.pers * 1);
-					if (c.bnum >= c.pers * 1) {
-						return uni.showToast({
-							title: '已有人先您一步报名，名额已满',
-							icon: "none"
-						})
-					} else {
-						let data = {
-							oid: this.$store.state.user.openid, //用户id
-							acid: this.acId,
-							ty: 2,
-						}
-						this.$request('/insertSignup', "POST", data).then(res => {
+				let data = {
+					oid: this.$store.state.user.openid, //用户id
+					acid: this.acId,
+					ty: 2,
+				}
+				this.$request('/insertSignup', "POST", data).then(res => {
 
-							console.log('报名返回', res);
+					console.log('报名返回', res);
 
-							// 添加消息页面系统通知提示报名成功
-							this.addMessage()
+					// 添加消息页面系统通知提示报名成功
+					this.addMessage()
 
 
-							// 弹窗关闭
-							this.showPopup = false
-							uni.reLaunch({
-								url: '/pages/Sign/Sign',
-							})
-						})
-					}
+					// 弹窗关闭
+					this.showPopup = false
+					uni.reLaunch({
+						url: '/pages/Sign/Sign',
+					})
 				})
 
+				// this.showPopup = false;
+				// this.showPopupConfirm = true
+				// 做最后判断防止同一时间进入报名页面都报名成功
+				// this.$request('/selectIntercept', "POST", {
+				// 	oid: this.$store.state.user.openid,
+				// 	acid: this.acId
+				// }).then(res => {
+				// 	let c = res[0][0]
+				// 	console.log('报名人数', res[0][0]);
+				// 	console.log(c.bnum >= c.pers * 1);
+				// 	if (c.bnum >= c.pers * 1) {
+				// 		return uni.showToast({
+				// 			title: '已有人先您一步报名，名额已满',
+				// 			icon: "none"
+				// 		})
+				// 	} else {
+				// 		let data = {
+				// 			oid: this.$store.state.user.openid, //用户id
+				// 			acid: this.acId,
+				// 			ty: 2,
+				// 		}
+				// 		this.$request('/insertSignup', "POST", data).then(res => {
+
+				// 			console.log('报名返回', res);
+
+				// 			// 添加消息页面系统通知提示报名成功
+				// 			this.addMessage()
+
+
+				// 			// 弹窗关闭
+				// 			this.showPopup = false
+				// 			uni.reLaunch({
+				// 				url: '/pages/Sign/Sign',
+				// 			})
+				// 		})
+				// 	}
+				// })
+
 			},
 			// 添加消息页面系统通知提示报名成功
 			addMessage() {
@@ -393,6 +448,7 @@
 				}
 				this.$request('/selectApplyUser', 'POST', data).then(res => {
 					console.log('获取报名用户列表', res[0]);
+					this.applyUserlist=[]
 					res[0].forEach(e => {
 						this.applyUserlist.push(e.avatar)
 					})

pages/activityPageNew/activityPageNew.vue

@@ -26,13 +26,13 @@
 				</view>
 			</view>
 
-			<view class="right" @click="costClass" :class="current == 2 ? info1 : info2">
+			<!-- <view class="right" @click="costClass" :class="current == 2 ? info1 : info2">
 				<text class="">付费教研</text>
 				<view v-if="current == 2" class="yun">
 					<image src="https://teacherapi.cocorobo.cn/teaching-file/static/yym/Ellipse 10.png"
 						mode="aspectFill"></image>
 				</view>
-			</view>
+			</view> -->
 		</view>
 
 		<swiper class="scroll-view-height" @change="swipeIndex" :current="current" :duration="300">
@@ -73,18 +73,15 @@
 
 
 			<!-- 付费教研 -->
-			<swiper-item>
+			<!-- <swiper-item>
 				<scroll-view scroll-y="true" style="height: 100%;">
-					<!-- <view style="padding-bottom: 30rpx;"> -->
-					<!-- <listBlock1 :classList="monlist" :indexId='indexId'></listBlock1> -->
-					<!-- </view> -->
 					<view class=""
 						style="height: 100%; width: 750rpx;display: flex;justify-content: center;align-items: center;">
 						<image src="../../static/Frame.png" style="width: 400rpx;height: 400rpx;" mode=""></image>
 					</view>
 
 				</scroll-view>
-			</swiper-item>
+			</swiper-item> -->
 		</swiper>
 
 	</view>
@@ -405,7 +402,7 @@
 		.top {
 			width: 100%;
 			display: flex;
-			justify-content: space-between;
+			justify-content: space-around;
 			margin: auto;
 			background-color: #ffffff;
 			padding: 10px 60rpx;

pages/index/index.vue

@@ -12,7 +12,7 @@
 		</view>
 		<view class="sortBlock">
 
-			<view class="sortCostcon" @click="gotoCost">
+			<!-- <view class="sortCostcon" @click="gotoCost">
 				<view class="sortCostcontent">
 					<view class="costTit">
 						收费专区
@@ -25,7 +25,7 @@
 				<view class="costimgblc">
 					<image src="../../static/Framezzz.png" class="costImg" mode="aspectFill"></image>
 				</view>
-			</view>
+			</view> -->
 
 			<view class="sortleft">
 				<view :class="item.cla" v-for="(item,index) in sortList" @click="gotoTab" :data-index="item">
@@ -239,9 +239,9 @@
 			.sortleft {
 				flex: 1;
 				display: flex;
-				flex-direction: column;
+				// flex-direction: column;
 				justify-content: space-between;
-				margin-left: 20rpx;
+				// margin-left: 20rpx;
 
 				.sortcon2 {
 					background-image: url('https://teacherapi.cocorobo.cn/teaching-file/static/Rectangle938.png') !important;

pages/login_Wechat/login_Wechat.vue

@@ -7,10 +7,10 @@
 			</button>
 		</view>
 
-		<view class="inp">
+		<!-- <view class="inp">
 			<view class="nc">昵称：</view>
 			<input type="nickname" class="weui-input" :value="nickname" @blur="inpvalue" placeholder="请输入昵称" />
-		</view>
+		</view> -->
 
 		<view class="mid">
 			<!-- <radio value="r1" @click="radioCheck" size="10" :checked="isOK" /> -->
@@ -27,17 +27,27 @@
 
 
 		<button class="btn" @click="gotoIndex">一键登录</button>
-		<view class="footer" @click="goto">
+		<!-- <view class="footer" @click="goto">
 			<text>手机号登录/账号密码登录</text>
-		</view>
+		</view> -->
 
 
 		<view class="popupBlock" v-if="popupShow">
+			<view class="shade" v-if="allShow" @click="hiddenShade">
+			</view>
 			<view class="pop">
 				<view class="poptit">
 					完善信息
 				</view>
 				<view class="infoTxt">
+					<view class="txtcell">
+						<view class="">
+							<text class="celTit">学号/工号</text>
+						</view>
+						<input @blur="judgeNum" type="number" class="inpSty" maxlength="11" placeholder="输入后自动获取信息"
+							placeholder-style="font-size: 28rpx; color: rgb(153, 153, 153);" v-model="judgeNumber" />
+					</view>
+
 					<view class="txtcell">
 						<view class="">
 							<text class="dian">*</text><text class="celTit">姓名</text>
@@ -52,28 +62,62 @@
 						</view>
 						<input @blur="handleInput" type="number" class="inpSty" maxlength="11" placeholder="请输入联系方式"
 							placeholder-style="font-size: 28rpx; color: rgb(153, 153, 153);" v-model="userData.tel" />
-
 					</view>
 					<view class="txtcell">
-						<view class="">
+						<view class="" style="width: 100rpx;">
 							<text class="dian">*</text><text class="celTit">学校</text>
 						</view>
-						<view class="pickerBlock">
-							<picker mode="selector" @change="schChange" :range="scharray">
-								<view class="uni-input">{{!userData.sch?'请选择':userData.sch}}</view>
-							</picker>
+						<view class="pickerBlock" @click="show">
+							<view class="" style="position: relative;">
+								<view class="">
+									{{ !stuName?'请选择学校':stuName }}
+								</view>
+
+								<view class="stuListSty" v-if="isshow">
+									<view class="Usearch">
+										<u-search placeholder="搜索学校" :showAction="false" shape="square"
+											v-model="searchStudent"></u-search>
+										<view class="UsearchBtn" @click.stop="typeIn(0)">
+											手动录入
+										</view>
+									</view>
+									<scroll-view scroll-y="true" show-scrollbar="true" class="list">
+										<view id="demo1" class="listcon" @click.stop="addStu" :data-item="i"
+											v-for="(i,index) in colleges" :key="i">{{i.name}}</view>
+									</scroll-view>
+								</view>
+							</view>
 							<uni-icons type="right" class="icooo" size="20" color='rgba(0, 0, 0, 0.4)'></uni-icons>
 						</view>
 
 					</view>
 					<view class="txtcell">
-						<view class="">
-							<text class="dian">*</text><text class="celTit">专业</text>
+						<view class="" style="width: 100rpx;">
+							<text class="celTit">专业</text>
 						</view>
-						<view class="pickerBlock">
-							<picker mode="selector" @change="speChange" :range="speList">
-								<view class="uni-input">{{!userData.spe?'请选择':userData.spe}}</view>
-							</picker>
+						<view class="pickerBlock" @click="majorshow">
+							<view class="" style="position: relative;">
+								<view class="">
+									{{ !majorName?'请选择专业':majorName }}
+								</view>
+
+								<view class="stuListSty" v-if="jorshow">
+									<view class="Usearch">
+										<u-search placeholder="搜索专业" :showAction="false" shape="square"
+											v-model="searchMajor"></u-search>
+										<view class="UsearchBtn" @click.stop="typeIn(1)">
+											手动录入
+										</view>
+									</view>
+									<scroll-view scroll-y="true" show-scrollbar="true" class="list">
+										<view class="listcon" v-if="!majorList.length">
+											此学校暂时没有专业分类哦
+										</view>
+										<view id="demo1" class="listcon" @click.stop="addmajor" :data-jor="i"
+											v-for="(i,index) in majorList" :key="index">{{i.name}}</view>
+									</scroll-view>
+								</view>
+							</view>
 							<uni-icons type="right" class="icooo" size="20" color='rgba(0, 0, 0, 0.4)'></uni-icons>
 						</view>
 					</view>
@@ -90,7 +134,10 @@
 						</view>
 					</view>
 				</view>
-				<view :class="btnColor" @click="register">
+				<!-- 	<view :class="btnColor" @click="register">
+					完善信息并登录
+				</view> -->
+				<view class="logbtn2" @click="register">
 					完善信息并登录
 				</view>
 				<view class="logbri">
@@ -98,7 +145,22 @@
 				</view>
 			</view>
 		</view>
-
+		<u-popup :show="popupshow" mode="center" round="10" :closeable='true' @close="popupclose">
+			<view style="width: 600rpx;box-sizing: border-box;padding: 40px 20rpx; padding-bottom: 30px;">
+				<view class="" style="display: flex;align-items: center;">
+					<!-- <text>{{ typyInall?'专业':'学校' }} ：</text> -->
+					<u--input :placeholder="typyInall?'请输入专业':'请输入学校'" border="surround" v-model="typyInCon"></u--input>
+				</view>
+				<view style="display: flex;width: 100%;justify-content: space-around;margin-top: 20rpx;">
+					<view class="typyInbtn" @click="popupclose">
+						取消
+					</view>
+					<view class="typyInbtn" @click="popupaffirm">
+						确定
+					</view>
+				</view>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -106,17 +168,35 @@
 	export default {
 		data() {
 			return {
+				// 遮罩框
+				allShow: false,
+
+				isLogin: false,
+
+				searchStudent: '', //学校搜索栏
+				searchMajor: '', //专业搜索栏
+
+
+
 				logbtn: 'logbtn',
 				logbtn2: 'logbtn2',
 
 				avatarUrl: '',
 				nickname: '',
 				// 学校
-				scharray: ['深圳城市××大学', '深圳××大学', '深圳××大学', '深圳××大学'],
+				isshow: false,
+				stuName: '', //学校名称
+				colleges: [], //学校列表
+				// inpTxt: '', //学校id
+				// scharray: ['深圳城市××大学', '深圳××大学', '深圳××大学', '深圳××大学'],
 				// 专业
-				speList: ['互联网', '网络通信', '航空', '汽修', '珠宝', '文秘', '设计'],
+				jorshow: false,
+				majorList: [],
+				majorName: '',
+				// majorInpTxt: '',  //专业id
+				// speList: ['互联网', '网络通信', '航空', '汽修', '珠宝', '文秘', '设计'],
 				// 职称
-				rankList: ['教授', '副教授', '讲师','助教','其他'],
+				rankList: ['教授', '副教授', '讲师', '助教', '其他'],
 				// 默认头像的
 				isShow: false,
 
@@ -130,59 +210,264 @@
 
 				btnCol: [],
 
+				// 这两个因为要监视,所以不能放对象里面
+				inpTxt: '', //学校id
+				majorInpTxt: '', //专业id
+
+				// 手动录入弹窗
+				popupshow: false,
+				typyInCon: '',
+				typyInall: 0,
 				// 第一次登录
+				// name2:'', //被监视name
+				// 学号工号
+				judgeNumber: '',
 				userData: {
 					openid: '',
 					username: '',
 					avatar: '',
 					tel: '',
-					sch: '',
-					spe: '',
+					inpTxt: '', //学校id
+					majorInpTxt: '', //专业id
 					rankl: '', //职称
+					schName: '', //学校名字
+					jorName: '' //专业名字
 				}
 			};
 		},
-		computed: {
-			btnColor() {
-
-				let newArr = []
-				Object.keys(this.userData).forEach(key => {
-					if (this.userData[key] == '' && key != 'rankl') {
-						newArr.push(key)
+		watch: {
+			// judgeNumber:{
+			// 	handler(val){
+
+			// 	}
+			// },
+			searchMajor: {
+				handler(val) {
+					// 模糊搜索专业
+					let data = {
+						mid: this.inpTxt,
+						txt: val
 					}
-				});
-				console.log('newArr.length', newArr.length);
-				return newArr.length > 0 || this.userData.tel == 11 ? 'logbtn' : 'logbtn2'
+					this.$request('/selectLikeMajors', "get", data).then(res => {
+						console.log('模糊搜索专业', res);
+						this.majorList = res[0]
+					})
+					// this.selectMajor(val)
+				}
+			},
+			searchStudent: {
+				handler(val) {
+
+					this.$request('/selectLikeColleges', "get", {
+						txt: val
+					}).then(res => {
+						console.log(res);
+						this.colleges = res[0]
+					})
+					// this.selectMajor(val)
+				}
+			},
+			inpTxt: {
+				handler(val) {
+					console.log('val', val);
+					this.selectMajor(val)
+				}
 			}
 		},
 		methods: {
+			popupclose() {
+				this.popupshow = false
+				this.typyInCon = ''
+				this.searchStudent = ''
+			},
+			popupaffirm() {
+				if (!this.typyInall) {
+					if (!this.typyInCon) return uni.showToast({
+						title:'请输入学校',
+						icon:'none',
+					})
+
+					this.stuName = this.typyInCon
+					this.searchStudent = ''
+					this.inpTxt = ''
+					this.majorInpTxt = ''
+					this.searchMajor = ''
+					this.majorName = ''
+					this.popupshow = false
+					// 赋值完清空
+					this.typyInCon = ''
+				} else {
+					if (!this.typyInCon) return uni.showToast({
+						title:'请输入专业',
+						icon:'none',
+					})
+
+					this.majorName = this.typyInCon
+					this.majorInpTxt = ''
+					this.searchMajor = ''
+					this.popupshow = false
+					// 赋值完清空
+					this.typyInCon = ''
+				}
+			},
+			typeIn(e) {
+				this.hiddenShade()
+				this.typyInall = e
+				this.popupshow = true
+			},
+			// 遮罩层
+			hiddenShade() {
+				this.isshow = false
+				this.jorshow = false
+				this.allShow = false
+			},
+			// typeInSch(){
+			// 	if(!this.searchStudent) return
+
+			// 	this.stuName = this.searchStudent
+			// 	this.searchStudent=''
+			// 	this.inpTxt=''
+			// 	this.majorInpTxt=''
+			// 	this.searchMajor=''
+			// 	this.majorName=''
+			// 	this.hiddenShade()
+			// },
+			// typeInMajor(){
+			// 	if(!this.searchMajor) return
+
+			// 	this.majorName = this.searchMajor
+			// 	this.majorInpTxt=''
+			// 	this.searchMajor=''
+			// 	this.hiddenShade()
+			// },
+			// 学校list显示与隐藏
+			show() {
+				this.isshow = true
+				// this.jorshow = false
+				this.allShow = true
+			},
+
+			// 选择学校
+			addStu(e) {
+				// 选择学校时,将专业的数据清除，让其重新选择
+				this.majorInpTxt = ''
+				this.majorName = ''
+				this.majorList = []
+				// 为学校选项赋值
+				let data = e.currentTarget.dataset.item
+				this.inpTxt = data.id
+				this.stuName = data.name
+
+				// 学校list隐藏/显示
+				this.isshow = false
+
+				// 遮罩层隐藏
+				this.allShow = false
+			},
+
+			// 专业list显示与隐藏
+			majorshow() {
+				// 学校未选择则提示
+				if (!this.stuName) {
+					uni.showToast({
+						title: '请先选择学校',
+						icon: 'none',
+						duration: 1000
+					});
+					return
+				}
+				// 遮罩层显示
+				this.allShow = true
+				this.jorshow = true
+			},
+			// 选择专业
+			addmajor(e) {
+				let data = e.currentTarget.dataset.jor
+				// console.log('选择专业', e);
+				this.majorInpTxt = data.id
+				this.majorName = data.name
+				// console.log('选择专业', this.majorInpTxt);
+				this.jorshow = false
+				this.allShow = false
+			},
+			// 根据选择的学校来进行显示专业
+			selectMajor(e) {
+				console.log('根据选择的学校来进行显示专业', e);
+				let data = {
+					mid: e
+				}
+				this.$request('/selectMajors', "get", data).then(res => {
+					console.log('显示专业列表', res);
+					// if (res[0].length === 0) {
+					// 	this.majorList[0] = {
+					// 		name: '此学校没有专业分类哦'
+					// 	}
+					// } else {
+					this.majorList = res[0]
+					// }
+					// this.majorList = res[0]
+				})
+			},
 			// 判断手机号
 			handleInput(e) {
 				// console.log(e.target);
-				const {value} = e.target
-
-				const newValue = value.replace(/[^\d]/g, '') // 只允许输入数字
+				const {
+					value
+				} = e.target
+				// console.log(value);
+				const newValue = value.replace(/\s*/g, '') // 只允许输入数字
 				console.log(newValue);
-				
+
 				// if (newValue.length <= 11) {
-					this.userData.tel = newValue
+				this.userData.tel = newValue
 				// }
-				console.log(this.userData.tel);
+				// console.log(this.userData.tel);
+			},
+			// 失去焦点查询学号工号
+			judgeNum() {
+				if(!this.judgeNumber) return
+				let opid = uni.getStorageSync('oId')
+				let data = {
+					txt: this.judgeNumber
+				}
+				this.$request('/selectStudentNumber', "Get", data).then(res => {
+					console.log('失去焦点查询学号工号', res);
+					if (res[0].length) {
+						let aaa = res[0][0]
+						if (aaa.cid !== null) {
+							console.log('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
+							this.inpTxt = aaa.cid
+						}
+						if (aaa.sid !== null) {
+							this.majorInpTxt = aaa.sid
+						}
+						if (aaa.department === '') {
+							this.stuName = ''
+						} else {
+							this.stuName = aaa.department
+						}
+						if (aaa.class_name === '') {
+							this.majorName = ''
+						} else {
+							this.majorName = aaa.class_name
+						}
+						this.userData.username = aaa.name
+					} else {
+						uni.showToast({
+							title: '学号/工号暂无查询结果',
+							icon: 'none',
+							duration: 1000
+						})
+					}
+
+				})
 			},
 			// 选择用户名称
 			inpvalue(e) {
 				this.nickname = e.detail.value
 			},
-			schChange(e) {
-				console.log('picker发送选择改变，携带值为', e.detail.value)
-				this.userData.sch = this.scharray[e.detail.value]
-			},
-			speChange(e) {
-				console.log('picker发送选择改变，携带值为', e.detail)
-				this.userData.spe = this.speList[e.detail.value]
-			},
 			rankChange(e) {
-				console.log('picker发送选择改变，携带值为', e.detail)
+				// console.log('picker发送选择改变，携带值为', e.detail)
 				this.userData.rankl = this.rankList[e.detail.value]
 			},
 			// 上传图片
@@ -204,7 +489,7 @@
 						// 'Content-Type': 'multipart/form-data',
 					},
 					success: function(res) {
-						console.log(res);
+						console.log('上传图片', res);
 						that.avatarUrl = res.data
 					},
 					fail: function(uploadFileFail) {
@@ -231,58 +516,39 @@
 					});
 					return
 				}
-				if (this.nickname == '') {
-					uni.showToast({
-						title: '请输入昵称',
-						icon: 'error',
-						duration: 1000
-					});
-					return
-				}
 				if (!this.isShow) return uni.showToast({
 					title: '请勾选条约',
 					icon: 'error',
 					duration: 1000
 				});
-
 				let oId = uni.getStorageSync('oId')
-				console.log('gotoIndex:', oId);
-				// let all = []
-				// 检查是否注册过
-				this.$request('/selectUser', 'POST', {
-					oId: oId,
-				}).then(res => {
-					console.log('selectUser', res[0]);
-
-					console.log(res[0] == false);
-					// 账号第一次登录，还没注册过
-					if (res[0] == false) {
-						console.log('还未注册过，开始注册');
-						this.userData.openid = oId
-						this.userData.username = this.nickname
-						this.userData.avatar = this.avatarUrl
-						return this.popupShow = true
-					} else {
-						console.log('已注册过直接登录', res[0][0]);
-						// 修改昵称头像
-						this.$request('/updateUser', "POST", {
-							openid: oId,
-							Nme: this.nickname,
-							avatar: this.avatarUrl
+				// 判断是否登录过
+				if (this.isLogin) {
+					// console.log('已注册过直接登录', res[0][0]);
+					// 修改昵称头像
+					this.$request('/updateUser', "POST", {
+						openid: oId,
+						Nme: this.nickname,
+						avatar: this.avatarUrl
+					}).then(res => {
+						// console.log('updateUser', res);
+						this.$request('/selectUser', 'POST', {
+							oId: oId,
 						}).then(res => {
-							console.log('updateUser', res);
-							this.$request('/selectUser', 'POST', {
-								oId: oId,
-							}).then(res => {
-								this.$store.dispatch('asyncUpdateUser', res[0][0])
-								uni.switchTab({
-									url: '/pages/index/index'
-								})
+							console.log('已注册过直接登录', res[0]);
+							this.$store.dispatch('asyncUpdateUser', res[0][0])
+							uni.switchTab({
+								url: '/pages/index/index'
 							})
 						})
-					}
-				})
-
+					})
+				} else {
+					console.log('还未注册过，开始注册');
+					this.userData.openid = oId
+					this.userData.username = this.nickname
+					this.userData.avatar = this.avatarUrl
+					return this.popupShow = true
+				}
 
 			},
 			register() {
@@ -290,26 +556,31 @@
 				// tel: '',
 				// sch: '请选择',
 				// spe: '请选择',
-				if (this.userData.username == '') return uni.showToast({
+				if (!this.userData.username) return uni.showToast({
 					title: '请输入姓名',
 					icon: 'none'
 				});
-				if (this.userData.tel == '') return uni.showToast({
+				if (!this.userData.tel) return uni.showToast({
 					title: '请输入联系方式',
 					icon: 'none'
 				});
-				if (this.userData.sch == '') return uni.showToast({
-					title: '请输入学校',
-					icon: 'none'
-				});
-				if (this.userData.spe == '') return uni.showToast({
-					title: '请输入专业',
+				if (!this.stuName) return uni.showToast({
+					title: '请选择学校',
 					icon: 'none'
 				});
+				// if (this.majorInpTxt == '') return uni.showToast({
+				// 	title: '请选择专业',
+				// 	icon: 'none'
+				// });
 				if (this.userData.tel.length != 11) return uni.showToast({
 					title: '号码不足11位，请检查',
 					icon: 'none'
 				});
+				this.userData.inpTxt = this.inpTxt
+				this.userData.majorInpTxt = this.majorInpTxt
+				this.userData.schName = this.stuName
+				this.userData.jorName = this.majorName
+
 				// return console.log(this.userData);
 				let oId = uni.getStorageSync('oId')
 				this.$request('/login', 'POST', this.userData).then(res => {
@@ -328,7 +599,7 @@
 					})
 				})
 			},
-			// 添加消息页面系统通知提示报名成功
+			// 添加消息页面系统通知提示加入会员
 			addMessage() {
 				let opid = uni.getStorageSync('oId')
 				let data = {
@@ -360,10 +631,17 @@
 					if (!data) {
 						return
 					} else {
+						this.isLogin = true
 						this.avatarUrl = data.avatar
 						this.nickname = data.username
 					}
 				})
+
+				// 获取学院
+				this.$request('/selectColleges', "get", {}).then(res => {
+					console.log(res);
+					this.colleges = res[0]
+				})
 			}
 		},
 		onLoad() {
@@ -374,12 +652,106 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	.login_Wechat {
 		width: 750rpx;
 		height: 100vh;
 		background-color: #ffffff;
 	}
+	::v-deep .u-safe-bottom{
+		display: none;
+	}
+
+	.typyInbtn {
+		box-sizing: border-box;
+		padding: 10rpx 60rpx;
+		border-radius: 10rpx;
+		color: #fff;
+		background-color: #0081FE;
+	}
+
+	.typyInbtn2 {
+		box-sizing: border-box;
+		padding: 10rpx 20rpx;
+		border-radius: 10rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		background-color: #0081FE;
+		color: #E7E7E7;
+		margin-right: 20px;
+	}
+	
+
+	.shade {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		// background-color: #0056a8;
+		z-index: 12;
+	}
+
+	.uni-input {
+		text-align: right;
+	}
+
+	.stuListSty {
+		position: absolute;
+		top: calc(100% + 15rpx);
+		right: -20rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		z-index: 12;
+		background-color: #fff;
+		border-radius: 20rpx;
+		box-shadow: 0 0 20rpx 0 #ccc;
+		padding: 30rpx;
+		padding-top: 10rpx;
+
+		.Usearch {
+			margin: 20rpx 0;
+			// background-color: #0056a8;
+			width: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: flex-start;
+
+			.UsearchBtn {
+				width: 130rpx;
+				flex-shrink: 0;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				// background-color: #0056a8;
+				// color: #fff;
+			}
+		}
+	}
+
+	.list {
+		position: relative;
+		// top: calc(100% + 15rpx);
+		// right: -20rpx;
+		width: 550rpx;
+		height: 600rpx;
+		display: flex;
+		flex-direction: column;
+		background-color: #fff;
+		// padding: 10rpx 15rpx;
+		border-radius: 20rpx;
+		// box-shadow: 0 0 20rpx 0 #ccc;
+		z-index: 11;
+
+		.listcon {
+			width: 100%;
+			padding: 20rpx 0;
+			font-size: 28rpx;
+			border-bottom: 1rpx #e7e7e7 solid;
+		}
+	}
 
 	.dian {
 		color: rgba(245, 69, 69, 1);
@@ -404,7 +776,7 @@
 	.footer {
 		display: flex;
 		justify-content: center;
-		font-size: 14px;
+		font-size: 28rpx;
 		margin: auto;
 		color: #666666;
 	}
@@ -521,7 +893,9 @@
 					justify-content: space-between;
 					align-items: center;
 					border-bottom: 1rpx rgba(231, 231, 231, 1) solid;
-					padding-bottom: 20rpx;
+					padding-bottom: 10rpx;
+					margin-bottom: 20px;
+
 
 					.inpSty {
 						right: 0;
@@ -530,15 +904,15 @@
 					}
 
 					.pickerBlock {
+						flex: 1;
 						display: flex;
-						align-items: center;
-						justify-content: flex-start;
+						justify-content: flex-end;
 						color: rgba(0, 0, 0, 0.4);
 
-						.uni-input {
-							width: 100%;
-							height: 100%;
-						}
+						// .uni-input {
+						// 	width: 100%;
+						// 	height: 100%;
+						// }
 					}
 
 				}

pages/mine/mine.vue

@@ -243,7 +243,7 @@
 			this.username = this.$store.state.user.username;
 			
 			// 学校
-			this.signature=this.$store.state.user.school==null?'':this.$store.state.user.school;
+			this.signature=this.$store.state.user.stuName==null?'':this.$store.state.user.stuName;
 			// this.isManage = this.$store.state.user.openid;
 			// console.log(this.isManage == "");
 		}

pages/mineCollNew/mineCollNew.vue

@@ -27,8 +27,7 @@
 						<view class="classListFlex" v-if="aclist.length==0">
 
 						</view>
-						<view class="listBlock1" v-for="(i,index) in aclist" :key="index+'a'" @click.stop="gotoLink"
-							:data-link="i.link">
+						<view class="listBlock1" v-for="(i,index) in aclist" :key="index+'a'" @click="gotoDetail" :data-aid="i.acId">
 							<view class="img cell-img">
 								<image :src="i.pic" mode="aspectFill"></image>
 								<image class="star" @click.stop="coll" :data-e="i" :src="pic_coll2" mode=""></image>
@@ -37,8 +36,8 @@
 							<view class="right">
 								<view class="title">
 									<!-- <view class="tag bqZ-font">{{i.acshape}}</view> -->
-									<view class="bqZ-font" :class="i.acshape=='线下活动'?'tag':'tag1'"> {{i.acshape}}</view>
-									<view class="titTxt btn-font" style="">
+									<view class="bqZ-font" style="font-size: 20rpx;" :class="i.acshape=='线下活动'?'tag':'tag1'"> {{i.acshape}}</view>
+									<view class="titTxt btn-font " style="font-size:34rpx ;">
 										{{i.acName}}
 									</view>
 								</view>
@@ -57,8 +56,8 @@
 									<view class="left">
 										<view class="add fz-font">已报名{{i.bnum}}人</view>
 									</view>
-									<view class="Oright" @click="gotoDetail" :data-aid="i.acId">
-										<view class="text">报名</view>
+									<view class="Oright" >
+										<view class="text">{{ i.signNum?'已报名':'报名' }}</view>
 										<view class="arrow">
 											<image
 												src="https://teacherapi.cocorobo.cn/teaching-file/static/mine/arrow-right-blue.png"
@@ -477,6 +476,7 @@
 
 					.titTxt {
 						flex: 1;
+						color: rgba(0, 0, 0, 0.8);
 						font-weight: bold;
 						overflow: hidden;
 						text-overflow: ellipsis;
@@ -558,35 +558,66 @@
 			}
 
 			.tag {
-				border: 1px #00b2b6 solid;
+				border: 1px rgba(0, 178, 182, 1) solid;
 				flex-shrink: 0;
 				letter-spacing: 2rpx;
-				width: 104rpx;
-				height: 32rpx;
+				// min-width: 104rpx;
+				// height: 36rpx;
+				padding: 2rpx 4rpx;
 				display: flex;
 				white-space: nowrap;
 				justify-content: center;
 				align-items: center;
 				border-radius: 4rpx;
 				margin-right: 10rpx;
-				color: #00b2b6;
+				color: rgba(0, 178, 182, 1);
 				line-height: 32rpx;
+				
+				
+				// border: 1px #00b2b6 solid;
+				// flex-shrink: 0;
+				// letter-spacing: 2rpx;
+				// width: 104rpx;
+				// height: 32rpx;
+				// display: flex;
+				// white-space: nowrap;
+				// justify-content: center;
+				// align-items: center;
+				// border-radius: 4rpx;
+				// margin-right: 10rpx;
+				// color: #00b2b6;
+				// line-height: 32rpx;
 			}
 
 			.tag1 {
-				border: 1px rgba(0, 86, 168, 1) solid;
 				flex-shrink: 0;
 				letter-spacing: 2rpx;
-				width: 104rpx;
-				height: 32rpx;
+				// min-width: 104rpx;
+				// height: 36rpx;
+				padding: 2rpx 4rpx;
 				display: flex;
 				white-space: nowrap;
 				justify-content: center;
 				align-items: center;
 				border-radius: 4rpx;
 				margin-right: 10rpx;
-				color: rgba(0, 86, 168, 1);
 				line-height: 32rpx;
+				border: 1px rgba(0, 86, 168, 1) solid;
+				color: rgba(0, 86, 168, 1);
+				
+				// border: 1px rgba(0, 86, 168, 1) solid;
+				// flex-shrink: 0;
+				// letter-spacing: 2rpx;
+				// width: 104rpx;
+				// height: 32rpx;
+				// display: flex;
+				// white-space: nowrap;
+				// justify-content: center;
+				// align-items: center;
+				// border-radius: 4rpx;
+				// margin-right: 10rpx;
+				// color: rgba(0, 86, 168, 1);
+				// line-height: 32rpx;
 			}
 		}
 	}

pages/mineEdit/mineEdit.vue

@@ -24,77 +24,112 @@
 				</view>
 			</view>
 			<view class="setPicker">
+				<view class="edit_title">
+					<text>性别</text>
+				</view>
 				<picker mode="selector" :range="genderList" :value="userData.sex" @change="handelGender">
-					<view class="content">
-						<view class="edit_title">
-							<text>性别</text>
-						</view>
-						<view class="input_details">
-							<view class="details">
-								<view class="uni-input text">{{genderList[userData.sex]}}</view>
-							</view>
-							<view class="arrow">
-								<image
-									src="https://teacherapi.cocorobo.cn/teaching-file/static//mine/arrow-right_gray.png"
-									mode="aspectFill"></image>
+					<!-- <view class="content"> -->
+					<view class="input_details">
+						<view class="details">
+							<view class="uni-input text">{{!genderList[userData.sex]?'请选择':genderList[userData.sex]}}
 							</view>
 						</view>
+						<view class="arrow">
+							<image src="https://teacherapi.cocorobo.cn/teaching-file/static//mine/arrow-right_gray.png"
+								mode="aspectFill"></image>
+						</view>
 					</view>
+					<!-- </view> -->
 				</picker>
 			</view>
+			<view class="shade" v-if="allShow" @click="hiddenShade">
+			</view>
 			<view class="setPicker">
-				<picker mode="selector" :range="schoolList" :value="userData.school" @change="handelSchool">
-					<view class="content">
-						<view class="edit_title">
-							<text>学校</text>
+				<!-- <view class="content"> -->
+				<view class="edit_title">
+					<text>学校</text>
+				</view>
+				<view class="InpLeft" @click="show">
+					<view class="" style="position: relative;">
+						<view class="">
+							{{ !userData.stuName?'请选择学校':userData.stuName }}
 						</view>
-						<view class="input_details">
-							<view class="details">
-								<view class="uni-input text">{{userData.school}}</view>
-							</view>
-							<view class="arrow">
-								<image
-									src="https://teacherapi.cocorobo.cn/teaching-file/static//mine/arrow-right_gray.png"
-									mode="aspectFill"></image>
+						<view class="stuListSty" v-if="isshow">
+							<view class="Usearch">
+								<u-search placeholder="搜索学校" :showAction="false" shape="square"
+									v-model="searchStudent"></u-search>
+								<view class="UsearchBtn" @click.stop="typeIn(0)">
+									手动录入
+								</view>
 							</view>
+							<scroll-view scroll-y="true" show-scrollbar="true" class="list">
+								<view id="demo1" class="listcon" @click.stop="addStu" :data-item="i"
+									v-for="(i,index) in colleges" :key="i">{{i.name}}</view>
+							</scroll-view>
 						</view>
 					</view>
-				</picker>
+					<view class="arrow">
+						<image src="https://teacherapi.cocorobo.cn/teaching-file/static/mine/arrow-right_gray.png"
+							mode="aspectFill"></image>
+					</view>
+				</view>
 			</view>
 			<view class="setPicker">
-				<picker mode="selector" :range="speList" :value="userData.spe" @change="handelspe">
-					<view class="content">
-						<view class="edit_title">
-							<text>专业</text>
+				<view class="edit_title">
+					<text>专业</text>
+				</view>
+				<view class="InpLeft" @click.stop="majorshow">
+					<view class="" style="position: relative;">
+						<view class="">
+							{{ !userData.majorName?'请选择专业':userData.majorName }}
 						</view>
-						<view class="input_details">
-							<view class="details">
-								<view class="uni-input text">{{userData.spe}}</view>
-							</view>
-							<view class="arrow">
-								<image
-									src="https://teacherapi.cocorobo.cn/teaching-file/static//mine/arrow-right_gray.png"
-									mode="aspectFill"></image>
+						<view class="stuListSty" v-if="jorshow">
+							<view class="Usearch">
+								<u-search placeholder="搜索专业" :showAction="false" shape="square"
+									v-model="searchMajor"></u-search>
+								<view class="UsearchBtn" @click.stop="typeIn(1)">
+									手动录入
+								</view>
 							</view>
+							<scroll-view scroll-y="true" show-scrollbar="true" class="list">
+								<view class="listcon" v-if="!majorList.length">
+									此学校暂时没有专业分类哦
+								</view>
+								<view id="demo1" class="listcon" @click.stop="addmajor" :data-jor="i"
+									v-for="(i,index) in majorList" :key="i">{{i.name}}</view>
+							</scroll-view>
 						</view>
 					</view>
-				</picker>
+					<view class="arrow">
+						<image src="https://teacherapi.cocorobo.cn/teaching-file/static/mine/arrow-right_gray.png"
+							mode="aspectFill"></image>
+					</view>
+					<!-- 
+					<input class="uni-input" v-model="searchMajor" style="width: 100%;" @click.stop="majorshow"
+						placeholder-style="font-size: 28rpx; color: rgb(153, 153, 153);" placeholder="请选择专业" /> -->
+					<!-- <scroll-view scroll-y="true" show-scrollbar="true" class="list" v-if="jorshow">
+						<view id="demo1" class="listcon" @click="addmajor" :data-jor="i" v-for="(i,index) in majorList"
+							:key="index">{{i.name}}</view>
+					</scroll-view>
+					<view class="arrow">
+						<image src="https://teacherapi.cocorobo.cn/teaching-file/static/mine/arrow-right_gray.png"
+							mode="aspectFill"></image>
+					</view> -->
+				</view>
+
 			</view>
 			<view class="setPicker">
+				<view class="edit_title">
+					<text>职称</text>
+				</view>
 				<picker mode="selector" :range="rankList" :value="userData.rankl" @change="handelrank">
-					<view class="content">
-						<view class="edit_title">
-							<text>职称</text>
+					<view class="input_details">
+						<view class="details">
+							<view class="uni-input text">{{!userData.rankl?'请选择':userData.rankl}}</view>
 						</view>
-						<view class="input_details">
-							<view class="details">
-								<view class="uni-input text">{{userData.rankl}}</view>
-							</view>
-							<view class="arrow">
-								<image
-									src="https://teacherapi.cocorobo.cn/teaching-file/static//mine/arrow-right_gray.png"
-									mode="aspectFill"></image>
-							</view>
+						<view class="arrow">
+							<image src="https://teacherapi.cocorobo.cn/teaching-file/static//mine/arrow-right_gray.png"
+								mode="aspectFill"></image>
 						</view>
 					</view>
 				</picker>
@@ -142,7 +177,9 @@
 			<view class="popup-container2" style="height: 175px;" v-show="showPopupConfirm">
 				<view class="popup">
 					<view class="header" style="margin-top: 15px;">
-						<image src="https://teacherapi.cocorobo.cn/teaching-file/static//gou1.png" mode="aspectFill">
+						<view class="imgShade" >
+							<image  src="../../static/mine/gou3.png" mode="aspectFill">
+						</view>
 						</image>
 						<text style="margin-bottom: 24px;">修改成功</text>
 					</view>
@@ -150,9 +187,24 @@
 				</view>
 			</view>
 		</view>
+		<u-popup :show="popupshow" mode="center" round="10" :closeable='true' @close="popupclose">
+			<view style="width: 600rpx;box-sizing: border-box;padding: 40px 20rpx; padding-bottom: 30px;">
+				<view class="" style="display: flex;align-items: center;">
+					<!-- <text>{{ typyInall?'专业':'学校' }} ：</text> -->
+					<u--input :placeholder="typyInall?'请输入专业':'请输入学校'" border="surround" v-model="typyInCon"></u--input>
+				</view>
+				<view style="display: flex;width: 100%;justify-content: space-around;margin-top: 20rpx;">
+					<view class="typyInbtn" @click="popupclose">
+						取消
+					</view>
+					<view class="typyInbtn" @click="popupaffirm">
+						确定
+					</view>
+				</view>
+			</view>
+		</u-popup>
 
-
-
+		<!-- <van-popup v-model="popupshow" round position="bottom" :style="{ height: '30%' }" /> -->
 
 
 
@@ -171,16 +223,24 @@
 					btn: 1
 				},
 
-
+				allShow: false,
+				searchStudent: '', //学校搜索栏
+				searchMajor: '', //专业搜索栏
 
 				// 相别选项
 				genderList: ['男', '女'],
 				//学校选项
-				schoolList: ['深圳信息XX学院', '深圳XX学院', '深圳XX学院'],
+				isshow: false,
+				stuName: '', //学校名称
+				colleges: [], //学校列表
+				// schoolList: ['深圳信息XX学院', '深圳XX学院', '深圳XX学院'],
 				//专业选项
-				speList: ['互联网', '网络通信', '航空', '汽修', '珠宝', '文秘', '设计'],
+				jorshow: false,
+				majorList: [],
+				majorName: '',
+				// speList: ['互联网', '网络通信', '航空', '汽修', '珠宝', '文秘', '设计'],
 				//职称选项
-				rankList: ['教授', '副教授', '讲师','助教','其他'],
+				rankList: ['教授', '副教授', '讲师', '助教', '其他'],
 				// rankList: ['xx', 'xx', 'xx'],
 				// 兴趣选项
 				hobbyList: ['篮球', '编程', '钢琴', '美术', '摄影'],
@@ -193,31 +253,204 @@
 				//修改成功弹窗
 				showPopupConfirm: false,
 				// isFirstShow: true,
-
+				// 手动录入弹窗
+				popupshow: false,
+				typyInCon: '',
+				typyInall: 0,
 				// 用户信息数据
+
+				// 这两个因为要监视,所以不能放对象里面
+				inpTxt: '', //学校id
+				majorInpTxt: '', //专业id
 				userData: {
-					oid: '',
-					avatar: '', //头像
-					username: '', //用户名
-					sex: '', //用户性别
-					school: '', //学校
-					spe: '', //专业
-					rankl: '', //职称
-					brief: '', //用户简介
+					// oid: '',
+					// avatar: '', //头像
+					// username: '', //用户名
+					// sex: '', //用户性别
+					// inpTxt: '', //学校
+					// majorInpTxt: '', //专业
+					// rankl: '', //职称
+					// brief: '', //用户简介
 				}
 
 
 			};
 		},
-		// computed: {
-		// 	startDate() {
-		// 		return this.getDate('start');
-		// 	},
-		// 	endDate() {
-		// 		return this.getDate('end');
-		// 	}
-		// },
+		watch: {
+
+			searchMajor: {
+				handler(val) {
+					// console.log('val', val);
+					if (val === '') {
+						this.majorInpTxt = ''
+					}
+					// 模糊搜索专业
+					let data = {
+						mid: this.inpTxt,
+						txt: val
+					}
+					this.$request('/selectLikeMajors', "get", data).then(res => {
+						// console.log('模糊搜索专业', res);
+						this.majorList = res[0]
+					})
+					// this.selectMajor(val)
+				}
+			},
+			searchStudent: {
+				handler(val) {
+					// console.log('val', val);
+					// 模糊搜索学院
+					// if (val === '') {
+					// 	this.inpTxt = ''
+					// 	this.majorName = ''
+					// 	this.majorInpTxt = ''
+					// }
+					this.$request('/selectLikeColleges', "get", {
+						txt: val
+					}).then(res => {
+						// console.log(res);
+						this.colleges = res[0]
+					})
+					// this.selectMajor(val)
+				}
+			},
+			inpTxt: {
+				handler(val) {
+					// console.log('val', val);
+					this.selectMajor(val)
+				}
+			}
+		},
+
 		methods: {
+			popupclose() {
+				this.popupshow = false
+				this.typyInCon = ''
+				this.searchStudent = ''
+			},
+			popupaffirm() {
+				if (!this.typyInall) {
+					if (!this.typyInCon) return uni.showToast({
+						title: '请输入学校',
+						icon: 'none',
+					})
+
+					this.userData.stuName = this.typyInCon
+					this.searchStudent = ''
+					this.inpTxt = ''
+					this.majorInpTxt = ''
+					this.searchMajor = ''
+					this.userData.majorName = ''
+					this.popupshow = false
+					// 赋值完清空
+					this.typyInCon = ''
+				} else {
+					if (!this.typyInCon) return uni.showToast({
+						title: '请输入专业',
+						icon: 'none',
+					})
+
+					this.userData.majorName = this.typyInCon
+					this.majorInpTxt = ''
+					this.searchMajor = ''
+					this.popupshow = false
+					// 赋值完清空
+					this.typyInCon = ''
+				}
+			},
+			// 遮罩层关闭
+			hiddenShade() {
+				this.isshow = false
+				this.jorshow = false
+				this.allShow = false
+			},
+			typeIn(e) {
+				this.hiddenShade()
+				this.typyInall = e
+				this.popupshow = true
+
+
+			},
+			// typeInMajor() {
+			// 	if (!this.searchMajor) return
+
+			// 	this.userData.majorName = this.searchMajor
+			// 	this.majorInpTxt = ''
+			// 	this.searchMajor = ''
+			// 	this.hiddenShade()
+			// },
+			// 学校list显示与隐藏
+			show() {
+				this.isshow = true
+				this.allShow = true
+			},
+			// 专业list显示与隐藏
+			majorshow() {
+				// console.log('专业list显示与隐藏',this.inpTxt);
+				if (!this.userData.stuName) {
+					uni.showToast({
+						title: '请先选择学校',
+						icon: 'none',
+						duration: 1000
+					});
+					return
+				}
+				this.allShow = true
+				this.jorshow = true
+			},
+			// 选择学校
+			addStu(e) {
+				let data = e.currentTarget.dataset.item
+				if (this.inpTxt == data.id) {
+					// uni.showToast({
+					// 	title: '请勿选择相同学校',
+					// 	icon: 'none',
+					// })
+					// this.userData.majorName = ''
+					this.userData.stuName = data.name
+					this.isshow = false
+					this.allShow = false
+					return
+				}
+				// 选择学校时,将专业的数据清除，让其重新选择
+				this.majorInpTxt = ''
+				this.userData.majorName = ''
+				this.majorList = []
+
+				// console.log(data);
+				this.inpTxt = data.id
+				this.userData.stuName = data.name
+
+				this.isshow = false
+				this.allShow = false
+			},
+			// 选择专业
+			addmajor(e) {
+				let data = e.currentTarget.dataset.jor
+				// console.log('选择专业', e);
+				this.majorInpTxt = data.id
+				this.userData.majorName = data.name
+				// console.log('选择专业', this.majorInpTxt);
+				this.jorshow = false
+				this.allShow = false
+			},
+			// 根据选择的学校来进行显示专业
+			selectMajor(e) {
+				// console.log('根据选择的学校来进行显示专业', e);
+				let data = {
+					mid: e
+				}
+				this.$request('/selectMajors', "get", data).then(res => {
+					console.log('显示专业列表', res);
+					// if (res[0].length === 0) {
+					// 	this.majorList[0] = {
+					// 		name: '此学校没有专业分类哦'
+					// 	}
+					// } else {
+					this.majorList = res[0]
+					// }
+				})
+			},
 			// 上传图片
 			updateava() {
 				let that = this
@@ -242,8 +475,8 @@
 							},
 							success: function(res) {
 								// console.log(res);
-								that.userData.avatar=res.data
-								
+								that.userData.avatar = res.data
+
 							},
 							fail: function(uploadFileFail) {
 								console.log('Error:', uploadFileFail.data);
@@ -264,15 +497,28 @@
 				const value = this.$store.state.user.openid;
 				if (value == '') return
 				// console.log('????', this.$store.state.user.openid);
-				this.$request('/selectUserInfo', "POST", {
+				this.$request('/selectUser', "POST", {
 					openid: this.$store.state.user.openid
 				}).then(res => {
 					// 假如简介为null
-					if(!res[0][0].brief){
-						res[0][0].brief=''
+					console.log('res[0][0].brief', res);
+					if (!res[0][0].brief) {
+						res[0][0].brief = ''
 					}
 					// console.log('获取渲染数据', res[0][0]);
 					this.userData = res[0][0]
+					this.inpTxt = res[0][0].school
+					this.majorInpTxt = res[0][0].spe
+					// this.stuName = res[0][0].stuName
+					// console.log('this.stuName', this.stuName);
+					this.majorName = res[0][0].majorName
+					this.selectMajor(this.inpTxt)
+
+				})
+				// 获取学院
+				this.$request('/selectColleges', "get", {}).then(res => {
+					console.log(res);
+					this.colleges = res[0]
 				})
 			},
 			// 取消操作
@@ -282,15 +528,21 @@
 			// 确认操作
 			conf() {
 				this.showPopup = false;
-				this.showPopupConfirm = true
-				console.log(' this.userData', this.userData);
+				// console.log(' this.userData', this.userData);
+				this.userData.school = this.inpTxt
+				this.userData.spe = this.majorInpTxt
+				// delete this.userData.stuName;
+				// delete this.userData.majorName;
+				// this.userData.stuName=this.searchStudent
+				// this.userData.majorName=this.searchMajor
+				// return console.log('提交修改', this.userData);
 				this.$request('/updateUserInfo', "POST", this.userData).then(res => {
-
+					this.showPopupConfirm = true
 					// console.log('this', this);
-					this.$request('/selectUserInfo', 'POST', {
+					this.$request('/selectUser', 'POST', {
 						oId: this.$store.state.user.openid
 					}).then(res => {
-						console.log('获取caozuo', res[0][0]);
+						// console.log('获取caozuo', res[0][0]);
 						this.$store.dispatch('asyncUpdateUser', res[0][0])
 					})
 					setTimeout(() => {
@@ -301,7 +553,7 @@
 			},
 			// 点击保存修改
 			saveInfo() {
-
+				console.log('点击保存修改', this.userData);
 				const value = this.$store.state.user.openid;
 				if (value == '') return uni.showToast({
 					title: '未登录',
@@ -313,28 +565,24 @@
 						icon: 'none'
 					})
 				}
+
+				if (!this.userData.stuName) {
+					return uni.showToast({
+						title: '学校不能为空',
+						icon: 'none'
+					})
+				}
 				this.showPopup = true
 			},
 			// 选择用户性别
 			handelGender(e) {
-				console.log(e);
+				// console.log(e);
 				this.userData.sex = e.detail.value
 			},
-			
-			// 学校
-			handelSchool(e) {
-				console.log(e);
-				this.userData.school = this.schoolList[e.detail.value]
-			},
-			// 专业
-			handelspe(e) {
-				console.log('handelspe', e);
-				this.userData.spe = this.speList[e.detail.value]
-				console.log('???', this.userData.spe);
-			},
+
 			// 职位
 			handelrank(e) {
-				console.log(e);
+				// console.log(e);
 				this.userData.rankl = this.rankList[e.detail.value]
 			},
 			// 兴趣
@@ -349,10 +597,12 @@
 					avatar: '', //头像
 					username: '', //用户名
 					sex: '', //用户性别
-					school: '', //学校
-					spe: '', //专业
+					school: '', //学校id
+					spe: '', //专业id
 					rankl: '', //职称
 					brief: '', //用户简介
+					stuName: '', //学校名称
+					majorName: '' //专业名称
 				}
 
 				this.$store.dispatch('asyncUpdateUser', user)
@@ -364,13 +614,54 @@
 			},
 		},
 		onReady() {
-			console.log(this.$store.state);
+			// console.log(this.$store.state);
 			this.getData()
 		}
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+	// .popupInp{
+	// 	width: 100%;
+	// 	display: flex;
+	// 	justify-content: center;
+	// 	align-items: center;
+	// }
+	// .typyInbtnS{
+	// 	width: 100%;
+	// 	display: flex;
+	// 	align-items: center;
+	// 	justify-content: flex-end;
+	.typyInbtn {
+		// width: 40rpx;
+		// width: 200rpx;
+		box-sizing: border-box;
+		padding: 10rpx 60rpx;
+		border-radius: 10rpx;
+		color: #fff;
+		// display: flex;
+		// justify-content: center;
+		// align-items: center;
+		background-color: #0081FE;
+	}
+	
+	::v-deep .u-safe-bottom{
+		display: none;
+	}
+
+	.typyInbtn2 {
+		box-sizing: border-box;
+		padding: 10rpx 20rpx;
+		border-radius: 10rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		background-color: #0081FE;
+		color: #E7E7E7;
+		margin-right: 20px;
+	}
+
+	// }
 	.mask {
 		position: fixed;
 		top: 0;
@@ -383,18 +674,120 @@
 		// display: none;
 	}
 
+	.stuListSty {
+		position: absolute;
+		top: calc(100% + 15rpx);
+		right: -20rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		z-index: 12;
+		background-color: #fff;
+		border-radius: 20rpx;
+		box-shadow: 0 0 20rpx 0 #ccc;
+		padding: 30rpx;
+		padding-top: 10rpx;
+
+		.Usearch {
+			margin: 20rpx 0;
+			// background-color: #0056a8;
+			width: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: flex-start;
+
+			.UsearchBtn {
+				width: 120rpx;
+				flex-shrink: 0;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				// background-color: #0056a8;
+				// color: #fff;
+			}
+		}
+	}
+
+	.shade {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		// background-color: #0056a8;
+		z-index: 10;
+	}
+
+	.list {
+		position: relative;
+		// top: calc(100% + 15rpx);
+		// right: -20rpx;
+		width: 550rpx;
+		height: 600rpx;
+		display: flex;
+		flex-direction: column;
+		background-color: #fff;
+		// padding: 10rpx 15rpx;
+		border-radius: 20rpx;
+		// box-shadow: 0 0 20rpx 0 #ccc;
+		z-index: 11;
+
+		.listcon {
+			width: 100%;
+			padding: 20rpx 0;
+			font-size: 28rpx;
+			border-bottom: 1rpx #e7e7e7 solid;
+		}
+	}
+
+	// .list {
+	// 	position: absolute;
+	// 	top: calc(100% + 15rpx);
+	// 	right: -20rpx;
+	// 	width: 550rpx;
+	// 	height: 600rpx;
+	// 	display: flex;
+	// 	flex-direction: column;
+	// 	background-color: #fff;
+	// 	padding: 10rpx 15rpx;
+	// 	border-radius: 20rpx;
+	// 	box-shadow: 0 0 20rpx 0 #ccc;
+	// 	z-index: 10;
+
+	// 	.listcon {
+	// 		width: 100%;
+	// 		padding: 20rpx 0;
+	// 		border-bottom: 1rpx #ccc solid;
+	// 	}
+	// }
+
+	.arrow {
+		display: flex;
+
+		image {
+			width: 32rpx;
+			height: 32rpx;
+		}
+	}
+
+	.uni-input {
+		text-align: right;
+		color: rgb(153, 153, 153);
+	}
+
 	.popup-container2 {
 		position: fixed;
 		top: 50%;
 		left: 50%;
 		transform: translate(-50%, -50%);
 		width: 520rpx;
-		height: 260rpx; 
+		height: 260rpx;
 		z-index: 1000;
 		border-radius: 16rpx;
 		// display: none;
 		box-shadow: 0rpx 3rpx 10rpx 5rpx rgba(0, 0, 0, .1);
 		overflow: hidden;
+
 		.popup {
 			width: 100%;
 			height: 100%;
@@ -413,7 +806,17 @@
 				margin-top: 24px;
 				font-size: 34rpx;
 				font-weight: 600;
-
+				.imgShade{
+					width: 170rpx;
+					height: 170rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					border: 10rpx #0056A8 solid;
+					border-radius: 50%;
+					box-shadow: 0 0 10rpx #0056A8;
+					margin-bottom: 10rpx;
+				}
 				image {
 					width: 150rpx;
 					height: 150rpx;
@@ -508,37 +911,32 @@
 		.setPicker {
 			height: 92rpx;
 			border-top: 1px solid #E7E7E7;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			font-size: 28rpx;
 
-			.content {
-				height: 92rpx;
+			.InpLeft {
+				color: rgb(153, 153, 153);
 				display: flex;
+				justify-content: flex-end;
 				align-items: center;
-				justify-content: space-between;
-
-				.input_details {
-					display: flex;
-					align-items: center;
-
-					.details {
-						display: flex;
-						flex-direction: row;
+			}
 
-						.text {
-							font-size: 28rpx;
-							color: rgb(153, 153, 153);
-						}
-					}
+			// .content {
+			// 	height: 92rpx;
+			// 	display: flex;
+			// 	align-items: center;
+			// 	justify-content: space-between;
 
-					.arrow {
-						display: flex;
+			.input_details {
+				display: flex;
+				align-items: center;
+				justify-content: flex-end;
 
-						image {
-							width: 32rpx;
-							height: 32rpx;
-						}
-					}
-				}
 			}
+
+			// }
 		}
 
 		.setIntro {

pages/msg/msg.vue

@@ -112,7 +112,7 @@
 								</view>
 								<view class="contxt">
 									我们很高兴通知您，您已成功加入<text
-										style="color: rgba(0, 86, 168, 1);">[XXX小程序会员]</text>！欢迎加入我们的团队，我们期待与您一同合作并参与。
+										style="color: rgba(0, 86, 168, 1);" @click="gotoHome">[丽湖国际双创虚拟教研室小程序会员]</text>！欢迎加入我们的团队，我们期待与您一同合作并参与。
 								</view>
 							</view>
 						</view>
@@ -174,6 +174,11 @@
 		},
 		methods: {
 			// 获取消息通知数据
+			gotoHome(){
+					uni.switchTab({
+						url:'/pages/index/index'
+					})
+			},
 			getdata() {
 				let data = {
 					oid: this.$store.state.user.openid, //用户id

pages/resource/resource.vue

@@ -23,13 +23,13 @@
 						mode="aspectFill"></image>
 				</view>
 			</view>
-			<view class="right" @click="costClass" :class="current == 2 ? info1 : info2">
+			<!-- <view class="right" @click="costClass" :class="current == 2 ? info1 : info2">
 				<text class="">付费课程</text>
 				<view v-if="current == 2" class="yun">
 					<image src="https://teacherapi.cocorobo.cn/teaching-file/static//yym/Ellipse 10.png"
 						mode="aspectFill"></image>
 				</view>
-			</view>
+			</view> -->
 		</view>
 
 		<swiper class="scroll-view-height" @change="swipeIndex" :current="current" :duration="300">
@@ -61,14 +61,14 @@
 				</scroll-view>
 			</swiper-item>
 
-			<swiper-item>
+			<!-- <swiper-item>
 				<scroll-view scroll-y="true" style="height: 100%;">
 					<view class=""
 						style="height: 100%; width: 750rpx;display: flex;justify-content: center;align-items: center;">
 						<image src="../../static/Frame.png" style="width: 400rpx;height: 400rpx;" mode=""></image>
 					</view>
 				</scroll-view>
-			</swiper-item>
+			</swiper-item> -->
 		</swiper>
 	</view>
 </template>
@@ -246,7 +246,7 @@
 					lim: 15
 				}
 				this.$request('/selectResource', "POST", data).then(res => {
-					console.log('获取资源库', res);
+					console.log('获取精品慕课', res);
 					if (!res[0].length) {
 						this.teaLoading = 2
 					} else {
@@ -343,7 +343,7 @@
 		.top {
 			width: 100%;
 			display: flex;
-			justify-content: space-between;
+			justify-content: space-around;
 			margin: auto;
 			background-color: #ffffff;
 			padding: 10px 60rpx;

pages/skipone/skipone.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="">
-		<web-view :src="url1"></web-view>
+		<!-- <statusBar :item="navBarData"></statusBar> -->
+		<web-view :src="url1" weixin-process="auto"></web-view>
 		<!-- <iframe :src="url" frameborder="0" style="width: 100%; height: 100vh;"></iframe> -->
 	</view>
 </template>
@@ -9,12 +10,28 @@
 	export default {
 		data() {
 			return {
-				url1: ''
+				url1: '',
+				navBarData: {
+					title: '详情',
+					btn: 1
+				},
 			};
 		},
 		onLoad(options) {
 			console.log(options);
 			this.url1 = decodeURIComponent(options.url);
+		},
+		methods: {
+			onBackPress(options) {
+				const currentWebview = this.$mp.page.$getAppWebview();
+				if (currentWebview) {
+					let child = currentWebview.children();
+					for (let i = 0; i < child.length; i++) {
+						currentWebview.remove(child[i]);
+					}
+				}
+				return false;
+			}
 		}
 	}
 </script>

static/publish/publish.vue

@@ -1,187 +0,0 @@
-<template>
-	<view class="publish">
-		<statusBar :item="navBarData"></statusBar>
-		
-		<input class="activity_title" placeholder="活动标题" />
-		<textarea class="text" placeholder="请输入内容"></textarea>
-		
-		<template>
-			<u-upload>
-				<view class="addPhoto">
-					<image src="../../static/publish/photo.png" mode="aspectFill"></image>
-					<view class="photo">添加图片</view>
-					<view class="num">(0/9)</view>
-				</view>
-			</u-upload>
-		</template>
-
-		<template>
-			<view class="userOptionsBox">
-				<view class="optionsItemBox">
-					<view class="optionItem">
-						<view class="option_left">
-							<text class="option_text">
-								招募人数
-							</text>
-						</view>
-						<view class="option_right">
-							<image src="../../static/mine/arrow-right.png" mode="aspectFill"></image>
-						</view>
-					</view>
-					<view class="optionItem">
-						<view class="option_left">
-							<text class="option_text">
-								活动形式
-							</text>
-						</view>
-						<view class="option_right">
-							<image src="../../static/mine/arrow-right.png" mode="aspectFill"></image>
-						</view>
-					</view>
-					<view class="optionItem">
-						<view class="option_left">
-							<text class="option_text">
-								活动地址
-							</text>
-						</view>
-						<view class="option_right">
-							<image src="../../static/mine/arrow-right.png" mode="aspectFill"></image>
-						</view>
-					</view>
-					<view class="optionItem">
-						<view class="option_left">
-							<text class="option_text">
-								活动时间
-							</text>
-						</view>
-						<view class="option_right">
-							<image src="../../static/mine/arrow-right.png" mode="aspectFill"></image>
-						</view>
-					</view>
-					<view class="optionItem">
-						<view class="option_left">
-							<text class="option_text">
-								活动费用
-							</text>
-						</view>
-						<view class="option_right">
-							<image src="../../static/mine/arrow-right.png" mode="aspectFill"></image>
-						</view>
-					</view>
-					<view class="optionItem">
-						<view class="option_left">
-							<text class="option_text">
-								报名截止
-							</text>
-						</view>
-						<view class="option_right">
-							<image src="../../static/mine/arrow-right.png" mode="aspectFill"></image>
-						</view>
-					</view>
-				</view>
-			</view>
-		</template>
-		<template>
-			<view class="publish_now">
-				<button class="btn">立即发布</button>
-			</view>
-		</template>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				navBarData:{
-					title:'发布', //导航栏标题
-					btn:0        //是否显示返回按钮 0不显示  1 显示
-				},
-				customStyle:{
-					width:'300rpx',
-					height:'80rpx',
-					backgroundColor:'#8BBEFF'
-				}
-			};
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.publish{
-		height: 80%;
-		background-color: #fff;
-		.activity_title{
-			padding: 16px;
-		}
-		.text{
-			font-size: 13px;
-			padding: 16px;
-		}
-		.addPhoto{
-			image{
-				width: 50px;
-				height: 50px;
-				margin-left: 48px;
-			}
-			.photo{
-				color: #000000A3;
-				padding-left: 44px;
-				font-size: 14px;
-			}
-			.num{
-				color:  #000000A3;
-				padding-left: 56px;
-				font-size: 14px;
-			}
-			
-		}
-		.userOptionsBox {
-			
-			width: 100%;
-			margin-top: 10px;
-		
-			.optionsItemBox {
-				width: 100%;
-				margin-bottom: 10px;
-				padding: 5px 23px;
-		
-				.optionItem {
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					height: 81rpx;
-					font-size: 24rpx;
-		
-					.option_left {
-						display: flex;
-						align-items: center;
-						height: 40rpx;
-					}
-		
-					.option_right {
-						height: 40rpx;
-		
-						image {
-							height: 32rpx;
-							width: 32rpx;
-						}
-					}
-				}
-			}
-		}
-		.publish_now{
-			display: flex;
-			.btn{
-				width: 420rpx;
-				height: 70rpx;
-				background-color: #8BBEFF;
-				color: #fff;
-				margin-top: 20px;
-				margin-bottom: 100rpx;
-				line-height: 70rpx;
-			}
-		}
-		
-	}
-</style>