修改了一些BUG

tjty-app/pages_course/tjty_course_course/course.vue

@@ -15,7 +15,7 @@
 		<!-- 选项卡内容轮播滑动显示，current为当前第几个swiper子项 -->
 		<swiper @change="change" :current="isActive" class="swiper-content" :style="fullHeight">
 			<swiper-item class="swiperitem-content">
-				<scroll-view scroll-y style="height: 100%;" @scrolltolower="ReachBottom" lower-threshold="150px">
+				<scroll-view scroll-y style="height: 100%;"  lower-threshold="20px">
 					<view class="nav_item">
 						<view v-if="ByTypelist.length == 0">
 							<view class="none">
@@ -28,7 +28,6 @@
 												margin: 40rpx 0 0 268rpx;
 												color: #666666;">暂无数据</view>
 								</view>
-
 							</view>
 						</view>
 						<view v-else class="card" v-for="(item,index) in ByTypelist" :key="index">
@@ -51,9 +50,7 @@
 								</view>
 							</view>
 						</view>
-						<view v-show="isLoadMore">  //loading加载提示处
-						                <uni-load-more :status="loadStatus" ></uni-load-more>
-						          </view>
+						<view class="bottomAdd" v-show="total >= max" @tap="more">查看更多</view>
 					</view>
 				</scroll-view>
 			</swiper-item>
@@ -245,6 +242,7 @@
 		},
 		data() {
 			return {
+				max:5,
 				// token:uni.getStorageSync("token"),
 				onMore: true,
 				loadStatus:'loading',
@@ -327,7 +325,7 @@
 			//获取手机屏幕的高度，让其等于swiper的高度，从而使屏幕充满
 			uni.getSystemInfo({
 				success: function(res) {
-					that.fullHeight = "height:" + res.windowHeight + "px";
+					that.fullHeight = "height:" + res.windowHeight + "rpx";
 				}
 			});
 			// 获取标题区域宽度，和每个子元素节点的宽度
@@ -347,6 +345,23 @@
 		//           }},
 		
 		methods: {
+			more() {
+							this.max += 10; //每次点击加1条
+							if (this.queryParams.pageNum * this.queryParams.pageSize >= this.total)
+								return uni.$showMsg('数据加载完毕！')
+							// if (this.isloading) return
+							//让页码自增1
+							this.queryParams.pageNum += 1
+							console.log(this.queryParams.pageNum)
+							// 重新获取列表数据
+							this.flag = false
+							this.list(this.type, this.queryParams.pageNum)	
+					},
+			
+			
+			
+			
+			
 			...mapMutations('m_user', ['updateToken']),
 			...mapMutations('m_user', ['updateUserInfo']),
 			//登录判断
@@ -404,17 +419,17 @@
 					}
 				});
 			},
-			ReachBottom() {
-				if (this.queryParams.pageNum * this.queryParams.pageSize >= this.total)
-					return uni.$showMsg('数据加载完毕！')
-				// if (this.isloading) return
-				//让页码自增1
-				this.queryParams.pageNum += 1
-				console.log(this.queryParams.pageNum)
-				// 重新获取列表数据
-				this.flag = false
-				this.list(this.type, this.queryParams.pageNum)
-			},
+			// ReachBottom() {
+			// 	if (this.queryParams.pageNum * this.queryParams.pageSize >= this.total)
+			// 		return uni.$showMsg('数据加载完毕！')
+			// 	// if (this.isloading) return
+			// 	//让页码自增1
+			// 	this.queryParams.pageNum += 1
+			// 	console.log(this.queryParams.pageNum)
+			// 	// 重新获取列表数据
+			// 	this.flag = false
+			// 	this.list(this.type, this.queryParams.pageNum)
+			// },
 			
 			
 			// lowerBottom() {
@@ -689,5 +704,15 @@
 			height: 334rpx;
 
 		}
+		
+		
+		
+		.bottomAdd {
+				display: flex;
+				justify-content: center;
+				
+				color: rgb(94, 94, 94);
+				padding-bottom: 10px;
+			}
 	}
 </style>

tjty-app/pages_my/myActicity/myActivity.vue

@@ -25,33 +25,17 @@
 			<view class="question"><text>{{item.activityName}}</text></view>
 			
 			<dividerface></dividerface>
-			<view class="item" style="display: flex">比赛时间:
-				<view class="time">
-					{{item.activityTime}}
-				</view>
-			</view>
+			<view class="item" style="display: flex">比赛时间:<view class="time">{{item.activityTime}}</view></view>
+			<view class="item" style="display: flex">报名时间:<view class="time">{{item.activityTime}}</view></view>
+			<view class="item" style="display: flex;margin-left: 34rpx;">参赛人:<view class="time">{{item.activityTime}}</view></view>
 			<view class="item1" >
 				<view > 
-					<!-- <text  style="color:#FCA624;font-family: Source Han Sans CN, Source Han Sans CN-Regular;
-font-weight: 400;" v-if="item.activityStatus==='0'">
-						未开始
-					</text>
-					<text  style="color:#36B25B;font-family: Source Han Sans CN, Source Han Sans CN-Regular;
-font-weight: 400;" v-if="item.activityStatus==='1'">
-						进行中
-					</text>
-					<text style="color:#999999;" v-if="item.activityStatus==='2'">
-						已结束
-					</text> -->
 					<image class="image-status" src="../../static/oper-icon/content_tag_weikaishi@2x.png"
 						v-if="item.activityStatus==='0'"></image>
 					<image class="image-status" src="../../static/oper-icon/content_tag_jinxingzhong@2x.png"
 						v-else-if="item.activityStatus==='1'"></image>
 					<image class="image-status" src="../../static/oper-icon/content_tag_yijieshu@2x.png" v-else></image>
-					
-					
-					
-						<button style="width: 111px;
+		<!-- 				<button style="width: 111px;
 										height: 30px;
 										background: #3b7cde;
 										border-radius: 15px;
@@ -59,9 +43,14 @@ font-weight: 400;" v-if="item.activityStatus==='1'">
 										display: block;
 										float: right;" @click="goActivity(item.type,wechatId,item.activityId)">
 										<text style="font-size: 14px;color: #ffffff;font-family: Source Han Sans CN, Source Han Sans CN-Regular;">报名详情</text>
-										</button>	
+										</button> -->	
 				</view>
 			</view>
+			<view style="display: flex;">
+				<button  style="width: 50%;background-color: #3b7cde;border-radius:0 0 0 16px;">报名详情</button>
+				<button @click="goActivity(item.type,wechatId,item.activityId)" style="width: 50%;background-color: #3b7cde;border-radius:0 0 16px 0;">活动详情</button>
+				
+			</view>
 		</view>
 	</view>
 	
@@ -109,7 +98,7 @@ import { userInfo } from 'os';
 						
 						url:'/pages_activity/activity_signInDetail/activity_signInDetail?wechat_id='+ wechatId  +'&activity_id=' + activityId
 					})
-					console.log('sdsdsds',activityId)
+
 					} else {
 						uni.navigateTo({
 							url:`/pages_events/tjty_ans_detail/tjty_ans_detail?activityId=${activityId}`
@@ -186,7 +175,7 @@ import { userInfo } from 'os';
 		}
 		.question{
 			margin-top: 5%;
-			margin: 2% 10% 0 5%;
+			margin: 2% 15% 0 5%;
 			min-height: 72px;
 			height: auto;
 			line-height: 30px;