调整年度选择

pages.json

@@ -455,6 +455,28 @@
 			"style" : 
 			{
 				 
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/staffHome/teamHonor/teamYear",
+			"style" : 
+			{
+				
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/staffHome/activityCenter/activityYear",
+			"style" : 
+			{
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/staffHome/activityReward/activityYear",
+			"style" : 
+			{
 				"enablePullDownRefresh" : false
 			}
 		}

pages/staffHome/activityCenter/activityCenter.vue

@@ -6,7 +6,7 @@
 				:list="tabList" :is-scroll="false" :current="current" @change="change"></u-tabs>
 		</view>
 		<view class="main">
-			 <view class="activity-item"  v-for="(item,i) in list" :key="i">
+			 <view class="activity-item"  v-for="(item,i) in list" :key="i"  @click="ckItem(item)" >
 			 	<view class="title">
 			 		{{item.title}}
 					<view class="have-used" v-if="item.status=='77d93870-e1e1-4369-b2b6-629e8645e8d9'" >
@@ -25,7 +25,7 @@
 				<view class="introduce">
 					{{item.synopsis}}
 				</view>
-				<view class="to-detail"  @click="ckItem(item)" >
+				<view class="to-detail" >
 					<view class="tag" >
 						{{item.typeName}}
 					</view>
@@ -63,10 +63,15 @@
 				list:[],
 				recordsTotal:0,
 					tabList: [],
+					year:null,
 			}
 		},
 		onLoad(op){
-		
+			if(op.year){
+				this.year=op.year
+				this.listForm.year=op.year
+				
+			}
 			this.getList()
 			this.dataList()
 		},

pages/staffHome/activityCenter/activityYear.vue

@@ -0,0 +1,193 @@
+<template>
+	<view>
+		<u-navbar title="活动中心"></u-navbar>
+		
+		
+		<view class="commend-box" v-for="(item,i) in list" :key="i" @click="ckItem(item)">
+			<view class="commend-content">
+				<view class="title">
+					<view class="title1">查看{{item}}年活动<span v-if="listObj[item]!==''" style="margin-left: 8px;">( {{listObj[item]}} )</span></view>
+					
+				</view>
+				
+				
+			</view>
+			
+		</view>
+		
+		
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/pagejs/activity.js'
+	
+	export default {
+		data() {
+			return {
+				title:'',
+				type:'',
+				listForm:{
+					pageIndex:1,
+					pageSize:20,
+					
+				},
+				list:[],
+				listObj:{},
+				recordsTotal:0,
+				tabList: [{
+					name: '全部'
+				}, {
+					name: '荣誉类型'
+				}, {
+					name: '荣誉类型',
+				}],
+				current: 0
+			}
+		},
+		onLoad(op){
+			
+			for (var i=2024;i>=2023;i--){
+				this.list.push(i)
+				this.getList(i)
+			}
+			 
+		
+		},
+		onReachBottom() {
+			
+		},
+		methods: {
+			getList(key){
+				
+				
+				API.pageList({
+					pageIndex:1,
+					pageSize:0,
+					year:key,
+					isTeam:this.listForm.isTeam
+				}).then((res) => {
+					this.listObj[key]=res.data.recordsTotal
+					this.$forceUpdate()
+					//var num=res.data.recordsTotal;
+					
+				}).catch(error => {
+					
+				})
+			},
+			ckItem(item){
+				var url=`/pages/staffHome/activityCenter/activityCenter?year=${item}`;
+				uni.navigateTo({
+					url:url
+				})
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tabs{
+		background-color: rgba(255, 255, 255, 1);
+		// /deep/.u-tabs{
+		// 	width: 408rpx;
+		// }
+		margin-bottom: 24rpx;
+	}
+	
+	.commend-box{
+		background-color: #fff;
+		border-radius: 8px;
+	    margin: 24rpx 32rpx 24rpx 32rpx;
+		padding: 36rpx;
+		display: flex;
+		justify-content: space-between;
+		.commend-content{
+			width: 100%;
+			.title{
+				color: rgba(51, 51, 51, 1);
+				font-size: 42rpx;
+				
+				font-family: 'Medium';
+				display: flex;
+				justify-content: space-between;
+				align-items: baseline;
+				.title1{
+					
+					min-width:  430rpx;
+					//font-weight: bold;
+					padding-left: 4px;
+					//padding-bottom: 4px;
+				}
+				.title2{
+					width: 30%;
+					text-align: right;
+				}
+			}
+			.commendation{
+				color: rgba(119, 119, 119, 1);
+				font-size: 12px;
+				line-height: 17px;
+				margin-top: 4rpx;
+				padding: 8rpx 0px;
+				//width: 430rpx;
+			
+			}
+			.commendationMy{
+				
+				
+			}
+			.integralMain{
+				display: flex;
+				justify-content: space-between;
+				.text2{
+					vertical-align: middle;
+					padding-top: 14rpx;
+					margin-top: 10rpx;
+					font-size: 32rpx;
+				}
+			}
+			.integral{
+				font-family: 'Regular';
+				margin-top: 14rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				background-color: rgba(230, 239, 255, 1);
+				//width: 260rpx;
+				border-radius: 50px;
+				height: 28px;
+				font-size: 24rpx;
+				.icon{
+					width: 32rpx;
+					height: 32rpx;
+					img{
+						width: 100%;
+					}
+				}
+				.text{
+					font-size: 24rpx;
+					color: rgba(119, 119, 119, 1);
+					
+					
+				}
+				
+			}
+		}
+	
+	.gainer{
+			
+		img{
+			width: 136rpx;
+			height: 140rpx;
+			border-radius: 50px;
+		}
+		.name{
+			text-align: center;
+			color: rgba(51, 51, 51, 1);
+			font-family: 'Regular';
+		
+		}
+	}
+	}
+</style>

pages/staffHome/activityReward/activityReward.vue

@@ -49,7 +49,11 @@
 			}
 		},
 		onLoad(op){
-		
+			if(op.year){
+				this.year=op.year
+				this.listForm.year=op.year
+				
+			}
 			this.getList()
 		},
 		onReachBottom() {

pages/staffHome/activityReward/activityYear.vue

@@ -0,0 +1,193 @@
+<template>
+	<view>
+		<u-navbar title="活动中心奖励"></u-navbar>
+		
+		
+		<view class="commend-box" v-for="(item,i) in list" :key="i" @click="ckItem(item)">
+			<view class="commend-content">
+				<view class="title">
+					<view class="title1">查看{{item}}年活动奖励<span v-if="listObj[item]!==''" style="margin-left: 8px;">( {{listObj[item]}} )</span></view>
+					
+				</view>
+				
+				
+			</view>
+			
+		</view>
+		
+		
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/pagejs/activity.js'
+	
+	export default {
+		data() {
+			return {
+				title:'',
+				type:'',
+				listForm:{
+					pageIndex:1,
+					pageSize:20,
+					
+				},
+				list:[],
+				listObj:{},
+				recordsTotal:0,
+				tabList: [{
+					name: '全部'
+				}, {
+					name: '荣誉类型'
+				}, {
+					name: '荣誉类型',
+				}],
+				current: 0
+			}
+		},
+		onLoad(op){
+			
+			for (var i=2024;i>=2023;i--){
+				this.list.push(i)
+				this.getList(i)
+			}
+			 
+		
+		},
+		onReachBottom() {
+			
+		},
+		methods: {
+			getList(key){
+				
+				
+				API.pageList({
+					pageIndex:1,
+					pageSize:0,
+					year:key,
+					isTeam:this.listForm.isTeam
+				}).then((res) => {
+					this.listObj[key]=res.data.recordsTotal
+					this.$forceUpdate()
+					//var num=res.data.recordsTotal;
+					
+				}).catch(error => {
+					
+				})
+			},
+			ckItem(item){
+				var url=`/pages/staffHome/activityReward/activityReward?year=${item}`;
+				uni.navigateTo({
+					url:url
+				})
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tabs{
+		background-color: rgba(255, 255, 255, 1);
+		// /deep/.u-tabs{
+		// 	width: 408rpx;
+		// }
+		margin-bottom: 24rpx;
+	}
+	
+	.commend-box{
+		background-color: #fff;
+		border-radius: 8px;
+	    margin: 24rpx 32rpx 24rpx 32rpx;
+		padding: 36rpx;
+		display: flex;
+		justify-content: space-between;
+		.commend-content{
+			width: 100%;
+			.title{
+				color: rgba(51, 51, 51, 1);
+				font-size: 42rpx;
+				
+				font-family: 'Medium';
+				display: flex;
+				justify-content: space-between;
+				align-items: baseline;
+				.title1{
+					
+					min-width:  430rpx;
+					//font-weight: bold;
+					padding-left: 4px;
+					//padding-bottom: 4px;
+				}
+				.title2{
+					width: 30%;
+					text-align: right;
+				}
+			}
+			.commendation{
+				color: rgba(119, 119, 119, 1);
+				font-size: 12px;
+				line-height: 17px;
+				margin-top: 4rpx;
+				padding: 8rpx 0px;
+				//width: 430rpx;
+			
+			}
+			.commendationMy{
+				
+				
+			}
+			.integralMain{
+				display: flex;
+				justify-content: space-between;
+				.text2{
+					vertical-align: middle;
+					padding-top: 14rpx;
+					margin-top: 10rpx;
+					font-size: 32rpx;
+				}
+			}
+			.integral{
+				font-family: 'Regular';
+				margin-top: 14rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				background-color: rgba(230, 239, 255, 1);
+				//width: 260rpx;
+				border-radius: 50px;
+				height: 28px;
+				font-size: 24rpx;
+				.icon{
+					width: 32rpx;
+					height: 32rpx;
+					img{
+						width: 100%;
+					}
+				}
+				.text{
+					font-size: 24rpx;
+					color: rgba(119, 119, 119, 1);
+					
+					
+				}
+				
+			}
+		}
+	
+	.gainer{
+			
+		img{
+			width: 136rpx;
+			height: 140rpx;
+			border-radius: 50px;
+		}
+		.name{
+			text-align: center;
+			color: rgba(51, 51, 51, 1);
+			font-family: 'Regular';
+		
+		}
+	}
+	}
+</style>

pages/staffHome/activityReward/rewardDetail.vue

@@ -1,90 +1,100 @@
-<template>
-	<view>
-		<u-navbar title="活动奖励详情"></u-navbar>
-		
-		<view class="reward-group" >
-				<view v-for="(item,i) in list" :key="i">
-					<view class="reward-item">
-						{{item.place}}
-					</view>
-					<view class="reward-item">
-						{{item.listName.join()}}
-					</view>
-				</view>
-			
-			
-			</view>
-			<u-divider :isnone="list.length==0" nonetext="没有找到相关内容" bg-color="#F2F4F4" border-color="#CFD2D5">已经到底了</u-divider>
-			
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/pagejs/activity.js'
-	
-	export default {
-		data() {
-			return {
-				id:'',
-				list:[],
-			}
-		},
-		onLoad(op){
-			if(op.id){
-				this.id=op.id
-				this.getInfo()
-			}
-			
-		},
-		methods: {
-			getInfo(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				API.notesList(this.id).then((res) => {
-					
-					uni.hideLoading();
-					//this.list=response.data.data
-					this.list=res.data;
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	
-	.banner {
-		margin: 32rpx;
-		background: url(../../../assets/img/banner.png) no-repeat;
-		background-size: 100% 200rpx;
-		color: rgba(255, 255, 255, 1);
-		font-size: 20px;
-		text-align: center;
-		padding: 44rpx 0;
-		font-family: 'Medium';
-	}
-	
- .reward-group{
-	 margin:24rpx 32rpx;
-	 background-color: #fff;
-	 .reward-item{
-		 	border-bottom: solid 1px #e6e6e6;
-			
-			min-height: 64px;
-		 line-height: 44px;
-		 padding-left: 16rpx;
-	 }
-	 .reward-item:last-of-type{
-		min-height: 84px;
-	 }
- }
-</style>
+<template>
+	<view>
+		<u-navbar title="活动奖励详情"></u-navbar>
+
+		<view class="reward-group">
+			<view v-for="(item,i) in list" :key="i">
+				<view class="reward-item reward-item-place">
+					{{item.place}}
+				</view>
+				<view class="reward-item">
+					{{item.listName.join(' , ')}}
+				</view>
+			</view>
+
+
+		</view>
+		<u-divider :isnone="list.length==0" nonetext="没有找到相关内容" bg-color="#F2F4F4"
+			border-color="#CFD2D5">已经到底了</u-divider>
+
+	</view>
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/pagejs/activity.js'
+
+	export default {
+		data() {
+			return {
+				id: '',
+				list: [],
+			}
+		},
+		onLoad(op) {
+			if (op.id) {
+				this.id = op.id
+				this.getInfo()
+			}
+
+		},
+		methods: {
+			getInfo() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+
+				API.notesList(this.id).then((res) => {
+
+					uni.hideLoading();
+					//this.list=response.data.data
+					this.list = res.data;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.banner {
+		margin: 32rpx;
+		background: url(../../../assets/img/banner.png) no-repeat;
+		background-size: 100% 200rpx;
+		color: rgba(255, 255, 255, 1);
+		font-size: 20px;
+		text-align: center;
+		padding: 44rpx 0;
+		font-family: 'Medium';
+	}
+
+	.reward-group {
+		font-size: 32rpx;
+		margin: 24rpx 32rpx;
+		background-color: #fff;
+
+		.reward-item-place {
+			font-weight: bold;
+			color: #000;
+			font-size: 40rpx;
+
+		}
+
+		.reward-item {
+			border-bottom: solid 1px #e6e6e6;
+
+			min-height: 64px;
+			line-height: 44px;
+			padding-left: 16rpx;
+		}
+
+		.reward-item:last-of-type {
+			min-height: 84px;
+		}
+	}
+</style>

pages/staffHome/staffHome.vue

@@ -18,13 +18,13 @@
 					</view>
 					<view class="grid-text">荣誉列表</view>
 				</u-grid-item>
-				<u-grid-item @click="gotoUrl('pages/staffHome/teamHonor/teamHonor?type=my')">
+				<u-grid-item @click="gotoUrl('pages/staffHome/teamHonor/teamYear?type=my')">
 					<view class="icon">
 						<img src="../../assets/img/riFill-vip-crown-2-fill@2x.png" alt="">
 					</view>
 					<view class="grid-text">个人荣誉</view>
 				</u-grid-item>
-				<u-grid-item @click="gotoUrl('pages/staffHome/teamHonor/teamHonor?type=team')">
+				<u-grid-item @click="gotoUrl('pages/staffHome/teamHonor/teamYear?type=team')">
 					<view class="icon icon0">
 						<img src="../../assets/img/tdry.png" alt="">
 					</view>
@@ -36,13 +36,13 @@
 					</view>
 					<view class="grid-text">分享空间</view>
 				</u-grid-item>
-				<u-grid-item @click="gotoUrl('pages/staffHome/activityCenter/activityCenter')">
+				<u-grid-item @click="gotoUrl('pages/staffHome/activityCenter/activityYear')">
 					<view class="icon icon 2">
 						<img src="../../assets/img/hdzx.png" alt="">
 					</view>
 					<view class="grid-text">活动中心</view>
 				</u-grid-item>
-				<u-grid-item @click="gotoUrl('pages/staffHome/activityReward/activityReward')">
+				<u-grid-item @click="gotoUrl('pages/staffHome/activityReward/activityYear')">
 					<view class="icon icon3">
 						<img src="../../assets/img/hdjl.png" alt="">
 					</view>

pages/staffHome/teamHonor/badgeDetails-old.vue

@@ -1,254 +0,0 @@
-<template>
-	<view>
-		<u-navbar title="荣誉详情"></u-navbar>
-		<!-- 荣誉名称 -->
-		<view class="honor-name">
-			<view class="icon">
-				<!-- <img :src="info.img" alt=""> -->
-				<!-- <img src="@/assets/img/honorPic2.png" alt=""> -->
-			</view>
-			
-			<view class="explain">
-				{{info.content}}
-			</view>
-			
-		</view>
-		<!-- 荣誉记录 -->
-		<view class="record">
-			<view class="record-title">
-				<view class="rec">
-
-				</view>
-				<view class="text">
-					荣誉记录
-				</view>
-			</view>
-
-			<view class="commend-box"  v-for="(item,i) in list" :key="i">
-				<view class="commend-content">
-					<view class="title">
-						{{item.orgName?item.orgName:item.typeName}}
-					</view>
-					<view class="commendation">
-						{{item.content}}
-					</view>
-					<view class="integral">
-						<view class="flex">
-							<view class="icon">
-								<img src="../../../assets/img/riFill-copper-diamond-fill@2x.png" alt="">
-							</view>
-							<view class="text">
-								{{item.scoreInfo}}积分
-							</view>
-						</view>
-						<view class="date">
-							{{item.createTime}}
-						</view>
-					</view>
-				</view>
-				
-			</view>
-			
-		</view>
-		<u-divider bg-color="#F2F4F4" border-color="#CFD2D5">已经到底了</u-divider>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/pagejs/cite.js'
-	
-	export default {
-		data() {
-			return {
-				type:'',
-				listForm:{
-					pageIndex:1,
-					pageSize:20,
-					
-				},
-				info:{},
-				list:[],
-				recordsTotal:0,
-			}
-		},
-		onLoad(op){
-			this.type=op.id
-			
-			this.getInfo()
-			
-		},
-		onReachBottom() {
-			if (this.list.length < this.recordsTotal) {			
-				this.myLoadmore();
-			}
-		},
-		methods: {
-			myLoadmore(){
-				this.listForm.pageIndex += 1;
-				this.getList();
-			},
-			getInfo(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				API.editBadge(this.type).then((res) => {
-					
-					uni.hideLoading();
-					//this.list=response.data.data
-					this.info=res.data.cite;
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			getList(){
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				API.pageList(this.listForm).then((res) => {
-					
-					uni.hideLoading();
-					//this.list=response.data.data
-					if(this.listForm.pageIndex==1){
-						this.list = res.data.data;
-					}else{
-						this.list = [
-							...this.list,
-							...res.data.data
-						];
-					}
-					this.recordsTotal = res.data.recordsTotal;
-					
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	page{
-		font-family: 'Regular';
-	}
-	// 荣誉名称
-	.honor-name {
-		background-color: #fff;
-		padding: 32rpx 0;
-		text-align: center;
-    
-		.icon {
-			img {
-				max-width: 536rpx;
-				height: 140rpx;
-			}
-		}
-
-		.name {
-			color: rgba(51, 51, 51, 1);
-			font-size: 18px;
-		}
-
-		.explain {
-			color: rgba(119, 119, 119, 1);
-			margin-top: 24rpx;
-
-		}
-	}
-
-	// 荣誉记录
-	.record {
-		margin-top: 26px;
-		padding: 0 32rpx;
-
-		.record-title {
-			display: flex;
-			align-items: center;
-			margin-bottom: 19px;
-           color: rgba(51, 51, 51, 1);
-            font-size: 18px;
-			line-height: 18px;
-			font-family: 'Regular';
-			.rec {
-				width: 4px;
-				height: 16px;
-				background-color: rgba(31, 74, 153, 1);
-				margin-right: 4px;
-			}
-		}
-
-
-		.commend-box {
-			background-color: #fff;
-			border-radius: 8px;
-			padding: 24rpx;
-			display: flex;
-			justify-content: space-between;
-            margin-bottom: 12px;
-			.commend-content {
-				    width: 100%;
-				.title {
-					color: rgba(51, 51, 51, 1);
-					font-size: 16px;
-					line-height: 23px;
-					font-family: 'Medium';
-				}
-
-				.commendation {
-					color: rgba(119, 119, 119, 1);
-					font-size: 12px;
-					line-height: 17px;
-					margin-top: 4rpx;
-					
-				}
-
-				.integral {
-					margin-top: 14rpx;
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					
-					.flex{
-						display: flex;
-						border-radius: 50px;
-						height: 28px;
-						font-size: 24rpx;
-						background-color: rgba(230, 239, 255, 1);
-						justify-content: center;
-						align-items: center;
-						padding: 0 16rpx;
-						.icon {
-							width: 32rpx;
-							height: 32rpx;
-						
-							img {
-								width: 100%;
-							}
-						}
-						
-						.text {
-							font-size: 24rpx;
-							color: rgba(119, 119, 119, 1);
-						}
-					}
-
-				}
-				.date{
-					color: rgba(153, 153, 153, 1);
-					font-size: 12px;
-				}
-			}
-
-			
-		}
-	}
-</style>

pages/staffHome/teamHonor/badgeDetails.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="" ></u-navbar>
+		<u-navbar title="荣誉详情" ></u-navbar>
 		
 		<view class="news">
 			<table  class="table"  >
@@ -249,7 +249,7 @@
 		}
 		td{
 			border: 1px solid;
-			
+			color: #000;
 			margin: 0;
 			padding: 10px 0px;
 			

pages/staffHome/teamHonor/teamHonor.vue

@@ -9,44 +9,31 @@
 			<view class="commend-content">
 				<view class="title">
 					<view class="title1">{{item.honorId}}</view>
-					<view class="title2"></view>
+					<view class="title2">
+						
+						<view class="integral">
+							<view class="icon">
+								<img src="../../../assets/img/riFill-copper-diamond-fill@2x.png" alt="">
+							</view>
+							<view class="text">
+								<span  class="text1"><span v-if="type=='team'" >每人</span>+{{item.scoreInfo}}积分</span>
+								
+							</view>
+						</view>
+					</view>
 				</view>
 				<!-- <view class="commendation">
 					{{item.content}}
 					
 				</view> -->
 				<view  class="integralMain">
-					<view class="integral">
-						<view class="icon">
-							<img src="../../../assets/img/riFill-copper-diamond-fill@2x.png" alt="">
-						</view>
-						<view class="text">
-							<span  class="text1"><span v-if="type=='team'" >每人</span>+{{item.scoreInfo}}积分</span>
-							
-						</view>
-					</view>
+					
 					<span  class="text2"   >{{item.remark?item.remark:''}}<!-- {{item.userName?item.userName:item.badgeName}} --> </span>
 					
 				</view>
 				
 			</view>
-			<view class="gainer" v-if="false" >
-				<template v-if="type=='team'">
-					<!-- <img src="@/assets/img/honorPic2.png" alt=""> -->
-					<!-- <img v-if="item.badge&&item.badge.imgUrl" :src="item.badge.imgUrl" alt="">
-					<u-avatar  v-else  size="136" ></u-avatar> -->
-					
-				</template>
-				<template v-if="type=='my'">
-				<!-- 	<img v-if="item.regUser&&item.regUser.headImg" :src="item.regUser.headImg" alt="">
-					<u-avatar  v-else  size="136" ></u-avatar> -->
-				</template>
 			
-			
-				<view class="name">
-					<!-- {{item.userName?item.userName:item.badgeName}} -->
-				</view>
-			</view>
 		</view>
 		
 		
@@ -76,10 +63,16 @@
 				}, {
 					name: '荣誉类型',
 				}],
-				current: 0
+				current: 0,
+				year:null,
 			}
 		},
 		onLoad(op){
+			if(op.year){
+				this.year=op.year
+				this.listForm.year=op.year
+				
+			}
 			if(op.type){
 				this.type=op.type
 				if(this.type=='my'){
@@ -189,18 +182,18 @@
 			width: 100%;
 			.title{
 				color: rgba(51, 51, 51, 1);
-				font-size: 16px;
-				line-height: 23px;
+				font-size: 32rpx;
+				line-height: 46rpx;
 				font-family: 'Medium';
 				display: flex;
 				justify-content: space-between;
-				
+				align-items: baseline;
 				.title1{
 					width: 60%;
 					min-width:  430rpx;
 					font-weight: bold;
 					padding-left: 4px;
-					    padding-bottom: 4px;
+					 padding-bottom: 4px;
 				}
 				.title2{
 					width: 30%;
@@ -237,7 +230,7 @@
 				align-items: center;
 				justify-content: center;
 				background-color: rgba(230, 239, 255, 1);
-				width: 260rpx;
+				//width: 260rpx;
 				border-radius: 50px;
 				height: 28px;
 				font-size: 24rpx;

pages/staffHome/teamHonor/teamYear.vue

@@ -0,0 +1,202 @@
+<template>
+	<view>
+		<u-navbar :title="title"></u-navbar>
+		
+		
+		<view class="commend-box" v-for="(item,i) in list" :key="i" @click="ckItem(item)">
+			<view class="commend-content">
+				<view class="title">
+					<view class="title1">查看{{item}}年{{title}}<span v-if="listObj[item]!==''" style="margin-left: 8px;">( {{listObj[item]}} )</span></view>
+					
+				</view>
+				
+				
+			</view>
+			
+		</view>
+		
+		
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/pagejs/cite.js'
+	
+	export default {
+		data() {
+			return {
+				title:'',
+				type:'',
+				listForm:{
+					pageIndex:1,
+					pageSize:20,
+					
+				},
+				list:[],
+				listObj:{},
+				recordsTotal:0,
+				tabList: [{
+					name: '全部'
+				}, {
+					name: '荣誉类型'
+				}, {
+					name: '荣誉类型',
+				}],
+				current: 0
+			}
+		},
+		onLoad(op){
+			if(op.type){
+				this.type=op.type
+				if(this.type=='my'){
+					this.listForm.isTeam=false
+					this.title="个人荣誉"
+				}else if(this.type=='team'){
+					this.listForm.isTeam=true
+					this.title="团队荣誉"
+				}	
+			}
+			for (var i=2024;i>=2023;i--){
+				this.list.push(i)
+				this.getList(i)
+			}
+			 
+		
+		},
+		onReachBottom() {
+			
+		},
+		methods: {
+			getList(key){
+				
+				
+				API.pageList({
+					pageIndex:1,
+					pageSize:0,
+					year:key,
+					isTeam:this.listForm.isTeam
+				}).then((res) => {
+					this.listObj[key]=res.data.recordsTotal
+					this.$forceUpdate()
+					//var num=res.data.recordsTotal;
+					
+				}).catch(error => {
+					
+				})
+			},
+			ckItem(item){
+				var url=`/pages/staffHome/teamHonor/teamHonor?type=${this.type}&year=${item}`;
+				uni.navigateTo({
+					url:url
+				})
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tabs{
+		background-color: rgba(255, 255, 255, 1);
+		// /deep/.u-tabs{
+		// 	width: 408rpx;
+		// }
+		margin-bottom: 24rpx;
+	}
+	
+	.commend-box{
+		background-color: #fff;
+		border-radius: 8px;
+	    margin: 24rpx 32rpx 24rpx 32rpx;
+		padding: 36rpx;
+		display: flex;
+		justify-content: space-between;
+		.commend-content{
+			width: 100%;
+			.title{
+				color: rgba(51, 51, 51, 1);
+				font-size: 42rpx;
+				
+				font-family: 'Medium';
+				display: flex;
+				justify-content: space-between;
+				align-items: baseline;
+				.title1{
+					
+					min-width:  430rpx;
+					//font-weight: bold;
+					padding-left: 4px;
+					//padding-bottom: 4px;
+				}
+				.title2{
+					width: 30%;
+					text-align: right;
+				}
+			}
+			.commendation{
+				color: rgba(119, 119, 119, 1);
+				font-size: 12px;
+				line-height: 17px;
+				margin-top: 4rpx;
+				padding: 8rpx 0px;
+				//width: 430rpx;
+			
+			}
+			.commendationMy{
+				
+				
+			}
+			.integralMain{
+				display: flex;
+				justify-content: space-between;
+				.text2{
+					vertical-align: middle;
+					padding-top: 14rpx;
+					margin-top: 10rpx;
+					font-size: 32rpx;
+				}
+			}
+			.integral{
+				font-family: 'Regular';
+				margin-top: 14rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				background-color: rgba(230, 239, 255, 1);
+				//width: 260rpx;
+				border-radius: 50px;
+				height: 28px;
+				font-size: 24rpx;
+				.icon{
+					width: 32rpx;
+					height: 32rpx;
+					img{
+						width: 100%;
+					}
+				}
+				.text{
+					font-size: 24rpx;
+					color: rgba(119, 119, 119, 1);
+					
+					
+				}
+				
+			}
+		}
+	
+	.gainer{
+			
+		img{
+			width: 136rpx;
+			height: 140rpx;
+			border-radius: 50px;
+		}
+		.name{
+			text-align: center;
+			color: rgba(51, 51, 51, 1);
+			font-family: 'Regular';
+		
+		}
+	}
+	}
+</style>