11wqe1 9 달 전
부모
커밋
81d2548207
4개의 변경된 파일51개의 추가작업 그리고 10개의 파일을 삭제
  1. 45 5
      pages/activityDetailNew/activityDetailNew.vue
  2. 2 2
      pages/activityPageNew/activityPageNew.vue
  3. 2 1
      pages/login_Wechat/login_Wechat.vue
  4. 2 2
      pages/resource/resource.vue

+ 45 - 5
pages/activityDetailNew/activityDetailNew.vue

@@ -117,11 +117,22 @@
 			</view>
 		</view>
 		<!-- 查看回放弹框 -->
-		<u-modal style="height: 350px;" :showConfirmButton="false" :show="PlaybackDig" closeOnClickOverlay
-			@close="PlaybackDig=false">
-			<u--image showMenuByLongpress :src="actItemList.playback"></u--image>
+		<u-modal :showConfirmButton="false" :show="PlaybackDig" closeOnClickOverlay @close="PlaybackDig=false">
+			<u--image :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: 22px;color: #1C56BA;font-weight: 600;">
+					报名需扫描二维码加入班级!
+				</view>
+				<u--image style="height: 400px !important;" :src="actItemList.qrlink"></u--image>
+			</u-modal>
+		</view>
+
+		<!-- @click="showBigImage" -->
 		<!-- 弹窗 -->
 		<view>
 			<view class="mask" v-show="showPopup" @click="showPopup = false"></view>
@@ -173,6 +184,9 @@
 				// 活动id
 				acId: '',
 				stuNum: 0,
+				// 报名跳转链接
+				// enrollImg: 'https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/file-1719281192664.png',
+				DigenrollImg: false,
 				// 页面数据
 				actItemList: {},
 
@@ -269,6 +283,12 @@
 			}
 		},
 		methods: {
+			// showBigImage() {
+			// 	uni.previewImage({
+			// 		current: this.actItemList.playback, // 当前显示的图片链接
+			// 		urls: [this.actItemList.playback] // 需要预览的图片链接列表
+			// 	});
+			// },
 			//跳转到第三方链接
 			gotoLink(e) {
 
@@ -289,7 +309,7 @@
 
 				this.PlaybackDig = true
 				// uni.navigateTo({
-				// 	// url: "/pages/skipone/skipone?item='+ encodeURIComponent(JSON.stringify(item))"
+				// 	// 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))
 				// });
@@ -408,6 +428,9 @@
 					this.getUsers()
 					setTimeout(() => {
 						this.showPopupConfirm = false
+						if (this.actItemList.qrlink) {
+							this.DigenrollImg = true
+						}
 						// this.getData()
 					}, 1500)
 				})
@@ -592,13 +615,30 @@
 
 		/deep/ .u-image {
 			height: 300px !important;
-			align-items: center !important;
+			// align-items: center !important;
 		}
 
 		/deep/ .u-image__image {
 			height: 300px !important;
 		}
 
+		.ellone {
+
+			/deep/ .u-image {
+				height: 400px !important;
+			}
+
+			/deep/ .u-image__image {
+				height: 600px !important;
+			}
+
+			/deep/ .u-modal__content {
+				flex-direction: column !important;
+				align-items: center;
+				height: 450px;
+			}
+		}
+
 		.popup-container2 {
 			position: fixed;
 			top: 50%;

+ 2 - 2
pages/activityPageNew/activityPageNew.vue

@@ -42,7 +42,7 @@
 			<swiper-item>
 				<scroll-view scroll-y="true" :refresher-enabled='true' :refresher-triggered="putrigger"
 					@refresherrefresh='purepulling' @scrolltolower="pulower" style="height: 100%;">
-					<view class="searchPagedata" v-if="!pulist.length">加载中...</view>
+					<view class="searchPagedata" v-if="!pulist.length">暂无数据</view>
 					<view>
 						<listBlock1 ref="listBlock2" :classList="pulist"></listBlock1>
 					</view>
@@ -59,7 +59,7 @@
 				<scroll-view scroll-y="true" :refresher-enabled='true' :refresher-triggered="trigger"
 					@refresherrefresh='repulling' @scrolltolower="aclower" style="height: 100%;">
 
-					<view class="searchPagedata" v-if="!teclist.length">加载中...</view>
+					<view class="searchPagedata" v-if="!teclist.length">暂无数据</view>
 
 					<view class="">
 						<listBlock1 ref="listBlock1" :classList="teclist"></listBlock1>

+ 2 - 1
pages/login_Wechat/login_Wechat.vue

@@ -460,6 +460,7 @@
 					console.log('失去焦点查询学号工号', res);
 					if (res[0].length) {
 						let aaa = res[0][0]
+						console.log('aaaaaaaa',aaa);
 						if (aaa.cid !== null) {
 							// console.log('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
 							this.inpTxt = aaa.cid
@@ -477,7 +478,7 @@
 						} else {
 							this.majorName = aaa.class_name
 						}
-						this.userData.username = aaa.name
+						this.uname = aaa.name
 					} else {
 						uni.showToast({
 							title: '学号/工号暂无查询结果',

+ 2 - 2
pages/resource/resource.vue

@@ -37,7 +37,7 @@
 			<swiper-item>
 				<scroll-view scroll-y="true" :refresher-enabled='refevent' :refresher-triggered="trigger"
 					@refresherrefresh='repulling' @scrolltolower="relower" style="height: 100%;">
-					<view class="searchPagedata" v-if="!classList.length">加载中...</view>
+					<view class="searchPagedata" v-if="!classList.length">暂无数据</view>
 					<view class="">
 						<teaching-case ref="reso" :acList='classList'></teaching-case>
 					</view>
@@ -51,7 +51,7 @@
 			<swiper-item>
 				<scroll-view scroll-y="true" :refresher-enabled='refevent' :refresher-triggered="putrigger"
 					@refresherrefresh='purepulling' @scrolltolower="tealower" style="height: 100%;">
-					<view class="searchPagedata" v-if="!classList2.length">加载中...</view>
+					<view class="searchPagedata" v-if="!classList2.length">暂无数据</view>
 					<view class="">
 						<teaching-case ref="tech" :acList='classList2'></teaching-case>
 					</view>