#

pages/activityDetailNew/activityDetailNew.vue

@@ -106,52 +106,41 @@
 				</view>
 			</view>
 			<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" style="width:200rpx;" v-if="isSign && !isExpired" @click="cancelAdd">取消报名
+				<view class="btnt" v-if="!isSign" @click="applyAdd">立即报名</view>
+				<view class="btnt1" style="width:200rpx;font-size: 15px;height: 40px;" v-if="isSign && !isExpired"
+					@click="cancelAdd">取消报名
 				</view>
-				<view class="btnt" style="width:200rpx;margin-left:15px" v-if="isSign && !isExpired"
-					@click="Attend">参与活动</view>
+				<view class="btnt" style="width:200rpx;margin-left:15px;font-size: 15px;height: 40px;"
+					v-if="isSign && !isExpired" @click="Attend">
+					参与活动</view>
 				<view class="btnt" v-else-if="isSign && isExpired" @click="lookPlayback">查看回放</view>
-				<!-- <view class="btnt" style="background-color: #ccc;" v-else-if="!isSign && isExpired">报名时间结束</view> -->
-				<!-- <view class="btnt1" v-else-if="actItemList.bnum>=actItemList.pers">人数已满</view> -->
-
-				<!-- <view class="btnt1" v-else-if="isSign && actItemList.openid!=oid">已报名</view> -->
 			</view>
 		</view>
 		<!-- 查看回放弹框 -->
 		<u-modal :showConfirmButton="false" :show="PlaybackDig" closeOnClickOverlay @close="PlaybackDig=false">
-			<u--image :src="actItemList.playback"></u--image>
+			<u--image showMenuByLongpress :src="actItemList.playback"></u--image>
 		</u-modal>
 
 		<!-- 报名成功展示跳转二维码 -->
 		<view class="ellone">
-			<u-modal style="height: 600px !important;flex-direction: column !important;" :showConfirmButton="false"
-				:show="DigenrollImg" closeOnClickOverlay @close="DigenrollImg=false">
-				<view style="font-size: 15px;font-weight: 600;margin-top: 20px;">
-					报名成功!
+			<u-modal style="flex-direction: column !important;" :showConfirmButton="false" :show="DigenrollImg"
+				closeOnClickOverlay @close="DigenrollImg=false">
+				<view class="ellTit">
+					<u-icon label="报名成功!" size="18"
+						name="https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/file-1720687091199.png"></u-icon>
 				</view>
-				<!-- <view style="font-size: 15px;font-weight: 600;margin-top: 5px;">
-					{{ popupMessage }}
-				</view> -->
-
-				<u--image style="height: 400px !important;" :src="actItemList.qrlink"></u--image>
+				<u--image style="height: 400px !important;" mode="aspectFit" :src="actItemList.qrlink"></u--image>
 			</u-modal>
 		</view>
+		<!-- 参与活动展示 -->
 		<view class="ellone">
-			<u-modal style="height: 600px !important;flex-direction: column !important;" :showConfirmButton="false"
-				:show="GetInvolved" closeOnClickOverlay @close="GetInvolved=false">
-				<view style="font-size: 15px;font-weight: 600;margin-top: 20px;">
-					已报名!
-				</view>
-				<view style="font-size: 15px;font-weight: 600;margin-top: 5px;">
-					请扫码进入腾讯会议
+			<u-modal style="flex-direction: column !important;" :showConfirmButton="false" :show="GetInvolved"
+				closeOnClickOverlay @close="GetInvolved=false">
+				<view class="ellTit">
+					<u-icon label="已报名!" size="18"
+						name="https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/file-1720687091199.png"></u-icon>
 				</view>
-				<view style="font-size: 15px;font-weight: 600;margin-top: 5px;">
-					参与此次教研活动
-				</view>
-				<u--image style="height: 400px !important;" :src="actItemList.qrlink"></u--image>
-
+				<u--image mode="aspectFit" :src="actItemList.qrlink"></u--image>
 			</u-modal>
 		</view>
 
@@ -226,8 +215,7 @@
 				// 用户订阅列表
 				// subArr: [],
 				uLoading: false,
-				//弹窗是否过期显示的内容
-				popupMessage:'',
+
 				// 收藏按钮节流
 				stopTimer: 0,
 
@@ -243,20 +231,6 @@
 				pic_coll2: 'https://teacherapi.cocorobo.cn/teaching-file/static/mine/Collect_yellow.png',
 
 				imgLoading: 'https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/file-1712113517547.png'
-				// nodes: [{
-				// 	name: 'div',
-				// 	attrs: {
-				// 		class: 'div-class',
-				// 		style: 'line-height: 60px; color: red; text-align:center;'
-				// 	},
-				// 	children: [{
-				// 		type: 'text',
-				// 		text: 'Hello&nbsp;uni-app!'
-				// 	}]
-				// }],
-				// strings: '<div style="text-align:center;"><img src="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/uni@2x.png"/></div>'
-				// pic_sub: 'https://teacherapi.cocorobo.cn/teaching-file/static/yym/Vector (Stroke) (1).png',
-				// pic_sub2: 'https://teacherapi.cocorobo.cn/teaching-file/static/dingyue_blue.png',
 			};
 		},
 		// 分享
@@ -295,16 +269,12 @@
 			});
 
 		},
-		// onUnload() {
-		// 	this.$store.dispatch('asyncDelAll')
-		// },
 		computed: {
 			isExpired() {
 				let dTime = this.dTime.split(',')
-				let bint = new Date(dTime[0]).getTime()
+				let bint = new Date(dTime[1]).getTime()
 				let now = new Date().getTime()
-				// console.log("过期时间",bint);
-				// console.log("当前日期",now);
+				console.log(dTime,bint,now);
 				return bint < now
 			}
 		},
@@ -334,11 +304,6 @@
 				}
 
 				this.PlaybackDig = true
-				// uni.navigateTo({
-				// 	// url: "/pages/skipone/skipone?item=" + encodeURIComponent(JSON.stringify('https://www.yuketang.cn/v2/web/forbidden'))
-				// 	url: "/pages/skipone/skipone?item=" + encodeURIComponent(JSON.stringify(this.actItemList
-				// 		.playback))
-				// });
 			},
 
 			// 获取页面数据
@@ -452,45 +417,28 @@
 					this.showPopupConfirm = true
 					this.btnEnroll()
 					this.getUsers()
-					
+					setTimeout(() => {
 						this.showPopupConfirm = false
 						if (this.actItemList.qrlink) {
 							this.DigenrollImg = true
 						}
-						if(this.isExpired){
+						if (this.isExpired) {
 							this.lookPlayback()
 						}
-						// // 根据活动是否过期来设置不同的弹窗内容
-						// if (this.isExpired) {
-						// 	// 活动过期时的弹窗内容
-						// 	this.popupMessage = "扫描后完成用户绑定，可查看活动回放";
-						// } else {
-						// 	// 活动未过期时的弹窗内容
-						// 	this.popupMessage = "参与此次教研活动";
-						// }
-						// this.getData()
-					
+					}, 1500)
 				})
 			},
 			// 参与活动操作
 			Attend() {
-
-				this.showPopup = false
-				
-					// 添加消息页面系统通知提示报名成功
-					this.addMessage()
-
-					this.btnEnroll()
-					this.getUsers()
-
-					this.showPopupConfirm = false
-					if (this.actItemList.qrlink) {
-						this.GetInvolved = true
-					}
-					// this.getData()
-				
+				if (this.actItemList.qrlink) {
+					this.GetInvolved = true
+				} else {
+					uni.showToast({
+						title: '此活动无链接',
+						icon: 'none'
+					})
+				}
 			},
-
 			// 添加消息页面系统通知提示报名成功
 			addMessage() {
 				let data = {
@@ -680,21 +628,27 @@
 
 		.ellone {
 
-			/deep/ .u-image {
-				height: 400px !important;
-			}
+			// /deep/ .u-image {
+			// 	max-height: 400px !important;
+			// }
 
-			/deep/ .u-image__image {
-				height: 600px !important;
-			}
+			// /deep/ .u-image__image {
+			// 	max-height: 600px !important;
+			// }
 
 			/deep/ .u-modal__content {
 				flex-direction: column !important;
 				align-items: center;
-				height: 450px;
+				// height: 450px;
 			}
 		}
 
+		.ellTit {
+			margin-bottom: 10px;
+			font-weight: bold;
+			color: 000;
+		}
+
 		.popup-container2 {
 			position: fixed;
 			top: 50%;

pages/login_Wechat/login_Wechat.vue

@@ -10,20 +10,12 @@
 
 		<view class="collpopul" v-if="popmsg">
 			<view class="contxt">
-				<!-- <image :src="i.collAoff?img1:img2" mode="aspectFill" style="width: 30rpx;height: 30rpx;">
-				</image> -->
 				登录成功
-				<!-- 收藏成功 -->
 			</view>
 		</view>
 
-		<!-- <view class="inp">
-			<view class="nc">昵称：</view>
-			<input type="nickname" class="weui-input" :value="nickname" @blur="inpvalue" placeholder="请输入昵称" />
-		</view> -->
 
 		<view class="mid">
-			<!-- <radio value="r1" @click="radioCheck" size="10" :checked="isOK" /> -->
 			<view class="" style="position: relative;padding-left:30rpx;">
 				我已阅读并同意<text>《教育小程序服务条款》</text>和 <text>《 隐私协议》</text>新用户自动注册
 				<view class="quan" @click="isDui">
@@ -37,11 +29,6 @@
 
 
 		<button class="btn" @click="gotoIndex">一键登录</button>
-		<!-- <button class="btn" @click="gotoIndex2">一键登录</button> -->
-		<!-- <view class="footer" @click="goto">
-			<text>手机号登录/账号密码登录</text>
-		</view> -->
-
 
 		<view class="popupBlock" v-if="popupShow">
 			<view class="shade" v-if="allShow" @click="hiddenShade">
@@ -81,34 +68,7 @@
 						<input type="text" class="inpSty" placeholder="请输入院校全称"
 							placeholder-style="font-size: 28rpx; color: rgb(153, 153, 153);" v-model="stuName" />
 					</view>
-					<!-- <view class="txtcell">
-						<view class="" style="width: 100rpx;">
-							<text class="dian">*</text><text class="celTit">学院</text>
-						</view>
-						<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="celTit">所在部门</text>
@@ -116,36 +76,7 @@
 						<input type="text" class="inpSty" placeholder="请输入所在部门"
 							placeholder-style="font-size: 28rpx; color: rgb(153, 153, 153);" v-model="majorName" />
 					</view>
-					<!-- 					<view class="txtcell">
-						<view class="" style="width: 100rpx;">
-							<text class="celTit">专业</text>
-						</view>
-						<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> -->
+					
 					<view class="txtcell">
 						<view class="">
 							<text class="celTit">职称</text><text
@@ -159,9 +90,7 @@
 						</view>
 					</view>
 				</view>
-				<!-- 	<view :class="btnColor" @click="register">
-					完善信息并登录
-				</view> -->
+				
 				<view class="logbtn2" @click="register">
 					完善信息并登录
 				</view>
@@ -173,7 +102,6 @@
 		<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;">
@@ -262,11 +190,6 @@
 			};
 		},
 		watch: {
-			// judgeNumber:{
-			// 	handler(val){
-
-			// 	}
-			// },
 			searchMajor: {
 				handler(val) {
 					// 模糊搜索专业
@@ -347,25 +270,7 @@
 				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
@@ -423,31 +328,18 @@
 					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
-				// console.log(value);
 				const newValue = value.replace(/\s*/g, '') // 只允许输入数字
-				// console.log(newValue);
 
-				// if (newValue.length <= 11) {
 				this.userData.tel = newValue
-				// }
-				// console.log(this.userData.tel);
+				
 			},
 			// 失去焦点查询学号工号
 			judgeNum() {
@@ -462,7 +354,6 @@
 						let aaa = res[0][0]
 						console.log('aaaaaaaa',aaa);
 						if (aaa.cid !== null) {
-							// console.log('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
 							this.inpTxt = aaa.cid
 						}
 						if (aaa.sid !== null) {
@@ -534,41 +425,18 @@
 
 				// this.avatarUrl = avatarUrl
 			},
-			// 手机号一键登录
-			gotoIndex2() {
-				uni.getProvider({
-					service: 'oauth',
-					success: function(res) {
-						console.log(res.provider) // ['qq', 'univerify']
-					}
-				});
-				return
-				uni.preLogin({
-					provider: 'univerify',
-					success() { //预登录成功
-						// 显示一键登录选项
-					},
-					fail(res) { // 预登录失败
-						// 不显示一键登录选项（或置灰）
-						// 根据错误信息判断失败原因，如有需要可将错误提交给统计服务器
-						console.log(res.errCode)
-						console.log(res.errMsg)
-					}
-				})
-
-			},
 			// 登录
 			gotoIndex() {
-				if (this.avatarUrl ==
-					'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0'
-				) {
-					uni.showToast({
-						title: '请选择头像',
-						icon: 'error',
-						duration: 1000
-					});
-					return
-				}
+				// if (this.avatarUrl ==
+				// 	'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0'
+				// ) {
+				// 	uni.showToast({
+				// 		title: '请选择头像',
+				// 		icon: 'error',
+				// 		duration: 1000
+				// 	});
+				// 	return
+				// }
 				if (!this.isShow) return uni.showToast({
 					title: '请勾选条约',
 					icon: 'error',
@@ -609,10 +477,7 @@
 
 			},
 			register() {
-				// username: '',
-				// tel: '',
-				// sch: '请选择',
-				// spe: '请选择',
+				
 				if (!this.uname) return uni.showToast({
 					title: '请输入姓名',
 					icon: 'none'
@@ -665,12 +530,7 @@
 					console.log(res);
 				})
 			},
-			// 跳转其他登录方式
-			goto() {
-				uni.navigateTo({
-					url: "/pages/login_two/login_two"
-				})
-			},
+			
 			// 勾选取消条约
 			isDui() {
 				this.isShow = !this.isShow
@@ -682,7 +542,6 @@
 					success: (res) => {
 						// console.log("所有", res);
 						this.avatarUrl = res.userInfo.avatarUrl; //获取微信头像
-
 					},
 					fail() {}
 				})
@@ -712,7 +571,7 @@
 		},
 		onLoad() {
 			this.avatarUrl =
-				'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0';
+				'https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/file-1720687971964.jpeg';
 			this.getdata()
 		}
 	}