修改

pages/kotra/activeInnerDetail.vue

@@ -100,11 +100,12 @@
 				
 			</view>
 		</view>
+		<template v-if="isShowBtn">
 			<view class="acdetailBtn" v-if="dataList.ActivityStatus==2">报名活动（已结束）</view>
 			<view class="acdetailBtn" @click="showModal=true" style="background-color: #000450;" v-if="dataList.ActivityStatus==1&&dataList.IsJoinActivity==0">马上报名</view>
 			<view class="acdetailBtn" style="background-color: #000450;" v-if="dataList.ActivityStatus==0">未开始</view>
 			<view class="acdetailBtn" v-if="dataList.IsJoinActivity==1">已报名</view>
-		
+		</template>
 		<u-popup v-model="showModal" mode="center" length="80%">
 			<view style='display: flex;flex-direction: column;align-items: center;background: #fff;'>
 				<view style="display: flex;width: 100%;margin-top:30px;padding-left:20px;">
@@ -142,7 +143,8 @@
 					ActivityId:0,
 					LinkMan:"",
 					LinkTel:""
-				}
+				},
+				isShowBtn:true
 			}
 		},
 		created() {},
@@ -154,6 +156,9 @@
 		onLoad(option) {
 			this.msg.Id = option.Id;
 			this.signMsg.ActivityId = option.Id;
+			if(option.isFromActive==1){
+				this.isShowBtn = false;
+			}
 			this.getList();
 		},
 		methods: {

pages/kotra/activityList.vue

 <style>
-	.activityList{
+	.activityList {
 		background-color: #F3F5F7;
-		padding:15px;
+		padding: 15px;
 	}
-	.activityList .activeList{
+
+	.activityList .activeList {
 		background-color: #fff;
-		margin-bottom:15px;
-		padding:15px;
+		margin-bottom: 15px;
+		padding: 15px;
 	}
-	.activityList .activeTop{
+
+	.activityList .activeTop {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
 	}
-	.activityList .activeLeftTitle{
-		color:#111111;
-		font-size:14px;
+
+	.activityList .activeLeftTitle {
+		color: #111111;
+		font-size: 14px;
 		font-weight: bold;
 	}
-	.activityList .activeBtm{
+
+	.activityList .activeBtm {
 		display: flex;
-		margin-top:10px;
+		margin-top: 10px;
 		justify-content: space-between;
 	}
-	.activityList .activeLeftImg{
-		width:111px;
-		height:70px;
+
+	.activityList .activeLeftImg {
+		width: 111px;
+		height: 70px;
 		flex-shrink: 0;
 	}
-	.activityList .activeRight{
-		margin-left:15px;
-		color:#B9B9B9;
-		font-size:12px;
+
+	.activityList .activeRight {
+		margin-left: 15px;
+		color: #B9B9B9;
+		font-size: 12px;
+		width:100%;
 	}
 </style>
 <template>
 	<view class="activityList" style="height:100vh;">
-		<view class="activeList">
+		<u-empty v-if="dataList.length==0" text="暂无数据" mode="data"></u-empty>
+		<scroll-view v-else :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ 'height': `calc(100%)`}">
+			<view>
+				<view class="activeList" v-for="(item,index) in dataList" :key="index" @click="goActiveDetail(item)">
 					<view class="activeTop">
-				<view class="activeLeftTitle">中韩贸易交流活动</view>
+						<view class="activeLeftTitle">{{item.ActivityName}}</view>
 						<view>
-					<image style="width:20px;height:20px;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/arrow_right.png" mode=""></image>
+							<image style="width:20px;height:20px;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/arrow_right.png"
+							 mode=""></image>
 						</view>
 					</view>
 					<view class="activeBtm">
 						<view class="activeLeftImg">
-					<image style="width:100%;height:100%;" src=""></image>
+							<image style="width:100%;height:100%;" :src="item.CoverImg"></image>
 						</view>
 						<view class="activeRight">
-					<view>活动类型：现场活动</view>
-					<view style="margin:10px 0">开放时间：2020-01-16</view>
-					<view>结束时间：2021-02-10</view>
+							<view>活动类型：{{item.ActivityTypeName}}</view>
+							<view style="margin:10px 0">开放时间：{{item.StartTimeStr}}</view>
+							<view>结束时间：{{item.EndTimeStr}}</view>
+						</view>
+					</view>
 				</view>
 			</view>
+			<view style="padding:10px 0;">
+				<u-loadmore :status="status" :load-text="loadText" bg-color="#F3F5F7" :font-size="24" :margin-top="0" :margin-bottom="0" />
 			</view>
+		</scroll-view>
 	</view>
 </template>
 <script>
@@ -61,8 +77,18 @@
 		data() {
 			return {
 				pageTitle: '活动列表',
-				qmsg:{pageIndex:1,pageSize:10},
-				dataList:{}
+				qmsg: {
+					pageIndex: 1,
+					pageSize: 10
+				},
+				pageCount: 1,
+				dataList: [],
+				loadText: {
+					loadmore: "轻轻上拉，加载更多",
+					loading: "努力加载中",
+					nomore: "没有更多了",
+				},
+				status:'',
 			}
 		},
 		created() {},
@@ -72,21 +98,41 @@
 			});
 		},
 		onLoad(option) {
-			this.getList();
+			this.getList(1);
 		},
 		methods: {
-			getList(){
+			getList(num) {
+				if (num == 1) {
+					this.dataList = [];
+				}
 				this.request2({
 						url: "/api/AppletTrade/GetUserActivityPage",
 						data: this.qmsg,
 					},
 					(res) => {
 						if (res.resultCode == 1) {
-							// this.dataList = res.data;
-							console.log(res,'采购数据');
+							this.dataList = res.data.pageData;
+							this.pageCount = res.data.pageCount;
+							console.log(res, '采购数据');
 						}
 					}
 				);
+			},
+			//滚动加载
+			lower(e) {
+				if (this.msg.pageIndex < this.pageCount) {
+					this.msg.pageIndex++;
+					this.status = "loading";
+					this.getList();
+				} else {
+					this.status = "nomore";
+				}
+			},
+			//跳转至活动详情
+			goActiveDetail(item){
+				uni.navigateTo({
+					url: '/pages/kotra/activeInnerDetail?Id=' + item.Id +'&isFromActive='+'1',					
+				});
 			}
 		}
 	}