From ffaf6fa23289916da0ba789832d149df29bee7f2 Mon Sep 17 00:00:00 2001
From: liy <1492230202@qq.com>
Date: Wed, 24 Jan 2024 00:44:13 +0800
Subject: [PATCH] 1

---
 pages/activitylist/activitylist.vue |   2 +-
 pages/home/home.vue                 | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 117 insertions(+), 20 deletions(-)

diff --git a/pages/activitylist/activitylist.vue b/pages/activitylist/activitylist.vue
index e477ce7..4cbe8dc 100644
--- a/pages/activitylist/activitylist.vue
+++ b/pages/activitylist/activitylist.vue
@@ -72,7 +72,7 @@
 			display: flex;
 			padding: 20rpx;
 			border-radius: 20rpx;
-			height: 200rpx;
+			// height: 200rpx;
 
 			.box_left {
 				display: flex;
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 85fe8aa..33b00f1 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -68,26 +68,30 @@
 					</view>
 				</view>
 				<view class="content" style="padding-bottom: 0;">
-					<view class="box_item" @click="goyl('http://icare.rsxmzj.91xxt.com:81/admin/resources/wsShop/html/index/oIndex_index.html')">
+					<view class="box_item"
+						@click="goyl('http://icare.rsxmzj.91xxt.com:81/admin/resources/wsShop/html/index/oIndex_index.html')">
 						<view style="margin-bottom: 20rpx;">
 							<image src="../../static/yl/image-2.png" style="height: 100rpx;" mode="heightFix"></image>
 						</view>
 						<view class="text">服务预约</view>
 					</view>
-					<view class="box_item" @click="goyl('http://icare.rsxmzj.91xxt.com:81/admin/resources/H5_YLZS/html/login.html')">
+					<view class="box_item"
+						@click="goyl('http://icare.rsxmzj.91xxt.com:81/admin/resources/H5_YLZS/html/login.html')">
 						<view style="margin-bottom: 20rpx;">
 							<image src="../../static/yl/image.png" style="height: 100rpx;" mode="heightFix"></image>
 						</view>
 						<view class="text">高龄津贴认证</view>
 					</view>
-					<view class="box_item" @click="goyl('http://show.rsxmzj.91xxt.com:81/2020/orgMap/html/map/list.html')">
+					<view class="box_item"
+						@click="goyl('http://show.rsxmzj.91xxt.com:81/2020/orgMap/html/map/list.html')">
 						<view style="margin-bottom: 20rpx;">
 							<image src="../../static/yl/image-4.png" style="height: 100rpx;" mode="heightFix"></image>
 						</view>
 						<view class="text">关爱地图</view>
 					</view>
-	
-					<view class="box_item" @click="goyl('http://icare.rsxmzj.91xxt.com:81/admin/mobile/meal_aid_copy/html/login.html')">
+
+					<view class="box_item"
+						@click="goyl('http://icare.rsxmzj.91xxt.com:81/admin/mobile/meal_aid_copy/html/login.html')">
 						<view style="margin-bottom: 20rpx;">
 							<image src="../../static/yl/image-5.png" style="height: 100rpx;" mode="heightFix"></image>
 						</view>
@@ -95,7 +99,8 @@
 					</view>
 				</view>
 				<view class="content" style="padding-top: 0;">
-					<view class="box_item" @click="goyl('http://cwservice.rsxmzj.91xxt.com:81/icare-admin/resources/cwbt/html/login.html')">
+					<view class="box_item"
+						@click="goyl('http://cwservice.rsxmzj.91xxt.com:81/icare-admin/resources/cwbt/html/login.html')">
 						<view style="margin-bottom: 20rpx;">
 							<image src="../../static/yl/image-3.png" style="height: 100rpx;" mode="heightFix"></image>
 						</view>
@@ -123,7 +128,7 @@
 						</view>
 						<view class="text">悄悄话</view>
 					</view>
-			<!-- 		<view class="box_item" @click="gopath('/pages/activitylist/activitylist?activeType=未成年')">
+					<!-- 		<view class="box_item" @click="gopath('/pages/activitylist/activitylist?activeType=未成年')">
 						<view style="margin-bottom: 20rpx;">
 							<image src="/static/new/image 4.png" style="height: 100rpx;" mode="heightFix"></image>
 						</view>
@@ -175,7 +180,7 @@
 						</view>
 						<view class="text">门楼牌备案</view>
 					</view>
-		<!-- 			<view class="box_item" @click="gopath('/pages/maptask/maptask')">
+					<!-- 			<view class="box_item" @click="gopath('/pages/maptask/maptask')">
 						<view style="margin-bottom: 20rpx;">
 							<image src="/static/new/image 1.png" style="width: 60%;height: 90rpx;" mode=""></image>
 						</view>
@@ -187,7 +192,7 @@
 						</view>
 						<view class="text">政策文件</view>
 					</view>
-			
+
 				</view>
 			</view>
 
@@ -227,23 +232,48 @@
 					</view>
 				</view>
 			</view>
-			<view class="xw" style="padding-top: 20rpx;padding-left: 20rpx;">
-					<view class="title">
-						<view class="box1">
-							<image src="../../static/new/矩形 331.png" mode=""></image>
-							<span>活动服务</span>
+			<view class="xw" style="padding-top: 20rpx;padding-left: 20rpx;padding-bottom: 20rpx;">
+				<view class="title">
+					<view class="box1">
+						<image src="../../static/new/矩形 331.png" mode=""></image>
+						<span>最新活动</span>
+					</view>
+					<view @click="gopath('/pages/activitylist/activitylist')" style="margin-right: 20rpx;font-size: 26rpx;display: flex;align-items: center;">
+						查看更多
+						<u-icon name="arrow-right"></u-icon>
+					</view>
+				</view>
+				<view v-if="list.length>0">
+					<view class="content1"  @click="gopath('/pages/activity/activity?id='+item.id)" v-for="(item,index) in list" :key="index">
+						<view class="box_item">
+							<view class="box_left">
+								<span class="f1">{{item.activityName}}</span>
+								<span
+									class="f2">{{item.eventStartDate?item.eventStartDate:'-'}}{{item.eventEndDate?'至'+item.eventEndDate:'-'}}</span>
+							</view>
+							<view class="box_right" v-if="item.activeImage">
+								<view class="images">
+									<image :src="BASE_URL + item.activeImage[0]"
+										style="width: 100%;height: 100%;border-radius: 20rpx;" mode="aspectFill">
+									</image>
+								</view>
+							</view>
 						</view>
 					</view>
-					<view class="content" >
+				</view>
+				<view v-else style="width: 100%;text-align: center;margin-top: 100rpx;font-size: 30rpx;">
+					暂无数据
+				</view>
+				<!-- 					<view class="content" >
 						<view class="box_item" @click="gopath('/pages/activitylist/activitylist')">
 							<view style="margin-bottom: 20rpx;">
 								<image src="/static/new/image 4.png" style="width: 60%;height: 90rpx;" mode=""></image>
 							</view>
 							<view class="text">活动</view>
 						</view>
-					</view>
-				</view>
-
+					</view> -->
+			</view>
+			<view style="height: 50rpx;"></view>
 		</view>
 	</view>
 
@@ -251,9 +281,16 @@
 
 <script>
 	import md5 from "../../common/md5.js";
+	import BASE_URL from "@/common/config.js"
 	export default {
 		data() {
 			return {
+				from:{
+					activeStatus:'展示',
+					activeType:''
+				},
+				BASE_URL,
+				list: [],
 				nvConfig: {
 					title: "数字民政服务平台",
 					bgColor: "#ffffff",
@@ -291,12 +328,26 @@
 		},
 		onLoad() {
 			uni.hideTabBar();
+			this.getlist()
 		},
 		methods: {
+			getlist() {
+				this.API.getactivityInfoSheet(this.from).then(res => {
+					console.log(res);
+					for (let i = 0; i < res.rows.length; i++) {
+						if (res.rows[i].activeImage) {
+							res.rows[i].activeImage = res.rows[i].activeImage.split(',')
+						}
+
+					}
+					this.list = res.rows
+
+				})
+			},
 			goyl(e) {
 				console.log(e)
 				uni.navigateTo({
-					url: '/pages/webviewyl/webviewyl?url='+e
+					url: '/pages/webviewyl/webviewyl?url=' + e
 				})
 			},
 			// 
@@ -434,4 +485,50 @@
 </script>
 <style scoped lang="scss">
 	@import 'home.scss';
+
+	.content1 {
+		padding: 20rpx;
+		border: 2rpx solid #eee;
+		border-radius: 36rpx;
+		margin-top: 20rpx;
+
+		.box_item {
+			background-color: #fff;
+			display: flex;
+			padding: 20rpx;
+			border-radius: 20rpx;
+			// height: 200rpx;
+
+			.box_left {
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				width: 100%;
+				// margin-right: 2%;
+
+				.f1 {
+					font-size: 30rpx;
+					font-weight: 600;
+					display: block;
+					margin-bottom: 20rpx;
+				}
+
+				.f2 {
+					color: #ababab;
+				}
+			}
+
+			.box_right {
+				width: 40%;
+
+				.images {
+					// background-color: #ababab;
+					height: 160rpx;
+					width: 100%;
+					// background-image: url("http://antis14.sherkxuan.cn/assets/images/a1.png");
+					// background-size: 100% 100%;
+				}
+			}
+		}
+	}
 </style>
\ No newline at end of file
--
libgit2 0.21.4