no message

pages.json

@@ -164,7 +164,7 @@
 			},{
 				"path": "cardRecord/cardRecord",
 				"style": {
-					"navigationBarTitleText": "打卡记录",
+					"navigationBarTitleText": "全部打卡记录",
 					"enablePullDownRefresh": false
 				}
 			},{
@@ -226,7 +226,7 @@
 			{
 				"path": "statDetail/statDetail",
 				"style": {
-					"navigationBarTitleText": "统计",
+					"navigationBarTitleText": "月打卡记录",
 					"enablePullDownRefresh": false
 				}
 			},

pagesClockIn/cardRecord/cardRecord.vue

@@ -203,7 +203,7 @@
 			async getListData() {
 				this.time = this.year + "-" + this.format_month + "-01 00:00:00"
 				let res = await this.$myRequest_clockIn({
-					url: "/attendance/api/sign/check/in/list/month",
+					url: "/attendance/api/sign/check/in/list/month/all",
 					data: {
 						page: this.page,
 						size: this.size,

pagesClockIn/home/home.vue

@@ -219,8 +219,6 @@
 			},
 			// 获取用户详细信息
 			async getUserInfo() {
-
-
 				let userId = uni.getStorageSync("userInfo").id
 				let res = await this.$myRequest_clockIn({
 					url: `/attendance/api/system/user/detail/${userId}`,
@@ -290,7 +288,12 @@
 						this.list = res.data.reverse()
 						this.activeid = this.list[0].id
 						this.contrastObj = this.list[0]
-						this.changeType()
+						// setTimeout(()=>{
+						// 	this.changeType()
+						// },300)
+						this.$nextTick(() => {
+							this.changeType()
+						})
 						// console.log(this.contrastObj);
 					}
 				}

pagesClockIn/particulars/particulars.vue

@@ -65,6 +65,15 @@
 				this.nowTime_day = options.nowTime_day
 			}
 			this.type = options.type
+			if (this.type == 1) {
+				uni.setNavigationBarTitle({
+					title: '日汇总明细'
+				})
+			}else{
+				uni.setNavigationBarTitle({
+					title: '月汇总明细'
+				})
+			}
 			this.getTime()
 			this.getData()
 		},
@@ -96,7 +105,7 @@
 						name: this.searchValue,
 						page: this.page,
 						time: this.type == 1 ? this.nowTime_day : this.nowTime,
-						type: 2
+						type: this.type
 					}
 				})
 				// console.log(res);
@@ -129,7 +138,7 @@
 		min-width: 100vw;
 		min-height: 100vh;
 		background-color: #F2F2F2;
-		
+
 		.placeholder {
 			height: 20rpx;
 		}

pagesClockIn/rulesDetail/rulesDetail.vue

@@ -16,7 +16,7 @@
 			<!-- 列表区域 -->
 			<view class="listbox" v-if="list.length">
 				<!-- 每一个盒子区域 -->
-				<view class="item" v-for="item in list" :key="item.id">
+				<view class="item" v-for="item in list" :key="item.id" @click="handleGoStatDetail(item.userId)">
 					<view class="left">
 						<img :src="item.headImage||'../static/imgs/headImage.png'">
 					</view>
@@ -97,6 +97,12 @@
 			}
 		},
 		methods: {
+			handleGoStatDetail(id) {
+				// console.log(id);
+				uni.navigateTo({
+					url: `/pagesClockIn/statDetail/statDetail?id=${id}`
+				})
+			},
 			// 获取列表数据
 			async getData() {
 				let res = await this.$myRequest_clockIn({
@@ -139,6 +145,7 @@
 <style lang="scss" scoped>
 	.container {
 		padding-top: 20rpx;
+		background-color: #F2F2F2;
 
 		.search {
 			width: 750rpx;

pagesClockIn/stat/stat.vue

@@ -487,7 +487,7 @@
 			goToDetail() {
 				if (this.current == 1) {
 					uni.navigateTo({
-						url: `/pagesClockIn/statDetail/statDetail?month=${this.month}`
+						url: `/pagesClockIn/statDetail/statDetail`
 					})
 				} else {
 					uni.navigateTo({

pagesClockIn/statDetail/statDetail.vue

@@ -127,7 +127,7 @@
 				暂无数据
 			</view>
 		</view>
-		
+
 		<!-- 图片放大弹窗区域 -->
 		<uni-popup ref="popup">
 			<view class="popup_img">
@@ -161,10 +161,14 @@
 				// 列表数组
 				list: [],
 				// 弹窗图片路径
-				popupImg:""
+				popupImg: "",
+				peopleId: ""
 			};
 		},
-		onLoad() {
+		onLoad(options) {
+			if (options.id) {
+				this.peopleId = options.id
+			}
 			this.getTime()
 			this.getListData()
 		},
@@ -197,7 +201,7 @@
 				this.month = month
 				this.year = year
 			},
-			
+
 			// 点击放大图片
 			handleBigImg(url) {
 				this.popupImg = url
@@ -207,12 +211,14 @@
 			// 获取打卡记录列表数组
 			async getListData() {
 				this.time = this.year + "-" + this.format_month + "-01 00:00:00"
+				let userInfo = uni.getStorageSync("userInfo")
 				let res = await this.$myRequest_clockIn({
-					url: "/attendance/api/sign/check/in/list/month",
+					url: "/attendance/api/sign/check/in/list/month/all",
 					data: {
 						page: this.page,
 						status: this.status,
-						time: this.time
+						time: this.time,
+						userId: this.peopleId ? this.peopleId : userInfo.id
 					}
 				})
 				// console.log(res);
@@ -513,12 +519,12 @@
 				color: #5792F0;
 			}
 		}
-		
+
 		.popup_img {
 			width: 600rpx;
 			height: 600rpx;
 			background-color: #fff;
-		
+
 			img {
 				width: 100%;
 				height: 100%;