no message

pages/addRules/addRules.vue

@@ -49,7 +49,7 @@
 							{{item_week}}
 						</span>
 						<span v-for="(item_time,index_time) in item.list" :key="index_time">
-							{{item_time.startTime}}-{{item_time.endTime}}
+							{{item_time.beginTime}}-{{item_time.endTime}}
 						</span>
 					</span>
 				</view>
@@ -250,7 +250,7 @@
 							this.timeGroups.forEach((ele) => {
 								ele.periods.forEach((item) => {
 									temList.push({
-										beginTime: this.formatTime(item.startTime),
+										beginTime: this.formatTime(item.beginTime),
 										endTime: this.formatTime(item.endTime)
 									})
 								})

pages/cardRecord/cardRecord.vue

@@ -14,7 +14,7 @@
 				</view>
 				<!-- 时间区域 -->
 				<view class="time">
-					{{year}}-{{comMonth}}
+					{{year}}-{{format_month}}
 				</view>
 				<!-- 双右箭头区域 -->
 				<view class="single2" @click="handleRight">
@@ -35,13 +35,13 @@
 		</view>
 
 		<!-- 打卡记录区域 -->
-		<view class="list">
+		<view class="list" v-if="list.length">
 			<!-- 每一条记录区域 -->
-			<view class="box" v-for="item in list" :key="item.id">
+			<view class="box" v-for="(item,index) in list" :key="index">
 				<!-- 人物信息区域 -->
 				<view class="person">
 					<view class="img">
-						<img :src="item.peopleImg">
+						<img :src="item.headImage">
 					</view>
 					<view class="info">
 						<view class="name">
@@ -53,16 +53,33 @@
 					</view>
 				</view>
 				<!-- 图片区域 -->
-				<view class="imgs" v-if="item.imgsList">
-					<view class="imgs_item" v-for="(img,index) in (item.imgsList)" :key="index">
+				<view class="imgs" v-if="item.status==4">
+					<view class="imgs_item">
 						<view class="image">
-							<img :src="img.url">
+							<img :src="item.faceImage">
 						</view>
 						<view class="title">
-							{{img.title}}
+							匹对照片
 						</view>
 					</view>
 
+					<view class="imgs_item">
+						<view class="image">
+							<img :src="item.matchFaceImage">
+						</view>
+						<view class="title">
+							被匹对照片
+						</view>
+					</view>
+
+					<view class="imgs_item">
+						<view class="image">
+							<img :src="item.sceneImage">
+						</view>
+						<view class="title">
+							场景照片
+						</view>
+					</view>
 				</view>
 				<!-- 打卡信息区域 -->
 				<view class="msg">
@@ -71,7 +88,7 @@
 							打卡状态：
 						</view>
 						<view class="value">
-							{{item.status}}
+							{{item.status==4?"打卡成功":"打卡失败"}}
 						</view>
 					</view>
 					<view class="msg_item">
@@ -79,29 +96,42 @@
 							打卡规则：
 						</view>
 						<view class="value">
-							{{item.rule}}
+							{{item.ruleName}}
 						</view>
 					</view>
-					<view class="msg_item" v-if="item.time">
+					<view class="msg_item" v-if="item.status==4">
 						<view class="key">
 							打卡时间：
 						</view>
 						<view class="value">
-							{{item.time}}
+							{{format_time(item.updateTime)}}
 						</view>
 					</view>
-					<view class="msg_item" v-if="item.place">
+					<view class="msg_item" v-if="item.status==4">
 						<view class="key">
 							打卡地址：
 						</view>
 						<view class="value">
-							{{item.place}}
+							{{item.location}}
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
 
+		<!-- 暂无数据显示区域 -->
+		<view class="no_data" v-if="list.length==0">
+			<img src="../../static/nodata.png">
+			<view class="info">
+				暂无数据
+			</view>
+		</view>
+
+		<!-- 底线区域 -->
+		<view class="foot" v-if="flag">
+			------我是有底线的------
+		</view>
+
 	</view>
 </template>
 
@@ -109,109 +139,94 @@
 	export default {
 		data() {
 			return {
+				// 第几页
+				page: 1,
+				// 每页条数
+				size: 10,
+				// 数据总条数
+				total: 0,
+				// 打卡状态参数
+				status: "",
+				// 打卡时间参数
+				time: null,
+				// 当前年份
 				year: null,
+				// 当前月份
 				month: null,
+				// 分段器选项
 				items: ['全部', '打卡成功', '打卡失败'],
+				// 当前所在分段器索引
 				current: 0,
+				// 列表数组
 				list: [],
-				list2: [{
-						id: 1,
-						peopleImg: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-						name: "程佳欢",
-						college: "文法学院",
-						imgsList: [{
-								url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-								title: "匹对照片"
-							},
-							{
-								url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-								title: "被匹对照片"
-							},
-							{
-								url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-								title: "场景照片"
-							},
-						],
-						status: '打卡成功',
-						rule: "课间操打卡规则已打卡",
-						time: "2022-02-04   15:15:15",
-						place: "江西省南昌市南昌交通学院操场"
-					},
-
-					{
-						id: 2,
-						peopleImg: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-						name: "陈志斌",
-						college: "南昌交通学院",
-						imgsList: [{
-								url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-								title: "匹对照片"
-							},
-							{
-								url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-								title: "被匹对照片"
-							},
-							{
-								url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-								title: "场景照片"
-							},
-						],
-						status: '打卡成功',
-						rule: "课间操打卡规则已打卡",
-						time: "2022-11-04   15:15:15",
-						place: "江西省南昌市经开区"
-					},
-				],
-				list3: [{
-						id: 1,
-						peopleImg: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-						name: "甘昱新",
-						college: "文法学院",
-						status: '未打卡',
-						rule: "课间操打卡规则",
-					},
-					{
-						id: 2,
-						peopleImg: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-						name: "甘昱新",
-						college: "文法学院",
-						status: '未打卡',
-						rule: "课间操打卡规则",
-					},
-				]
+				// 底线区域显示隐藏控制标识
+				flag: false,
 			};
 		},
-		onLoad(options) {
-			this.month = options.month - 0 || 1
+		onLoad() {
 			this.getTime()
-			this.list = this.list2
+			this.getListData()
+		},
+		// 页面滑动到底部触发的回调
+		onReachBottom() {
+			if (this.list.length < this.total) {
+				this.page++
+				this.getListData()
+			} else {
+				this.flag = true
+			}
 		},
 		computed: {
-			comMonth() {
-				if (this.month) {
-					let month = this.month < 10 ? '0' + this.month : this.month
-					console.log(month);
-					return month
-				}
+			// 格式化月份
+			format_month() {
+				let temTime = this.month < 10 ? '0' + this.month : this.month
+				return temTime
 			}
 		},
 		methods: {
-			// 获取当前年份
+			// 获取当前年份,月份
 			getTime() {
 				let date = new Date()
 				let year = date.getFullYear()
+				let month = date.getMonth() + 1
+				this.month = month
 				this.year = year
 			},
 
+			// 获取打卡记录列表数组
+			async getListData() {
+				this.flag = false
+				this.time = this.year + "-" + this.format_month + "-01 00:00:00"
+				let res = await this.$myRequest({
+					url: "/attendance/api/sign/check/in/list/month",
+					data: {
+						page: this.page,
+						size: this.size,
+						status: this.status,
+						time: this.time
+					}
+				})
+				// console.log(res);
+				if (res.code == 200) {
+					this.total = res.data.total
+					this.list = res.data.list
+				}
+			},
+
+			// 点击分段器回调
 			onClickItem(e) {
-				console.log(e.currentIndex);
-				// if (e.currentIndex == 0) {
-				// 	this.list = this.list2
-				// } else {
-				// 	this.list = this.list3
-				// }
+				if (e.currentIndex == 0) {
+					this.status = ""
+				} else if (e.currentIndex == 1) {
+					this.status = 4
+				} else if (e.currentIndex == 2) {
+					this.status = 3
+				}
+				this.page = 1
+				this.getListData()
 			},
 
+			// 往后选择年份回调
 			handleDoubleLeft() {
 				if (this.year <= 2000) {
 					uni.showToast({
@@ -220,8 +235,26 @@
 					})
 				} else {
 					this.year -= 1
+					this.page = 1
+					this.getListData()
+				}
+			},
+
+			// 往前选择年份回调
+			handleDoubleRight() {
+				if (this.year >= 2025) {
+					uni.showToast({
+						title: "不能选择2025年之后",
+						icon: 'none'
+					})
+				} else {
+					this.year += 1
+					this.page = 1
+					this.getListData()
 				}
 			},
+
+			// 往后选择月份回调
 			handleLeft() {
 				if (this.month <= 1) {
 					if (this.year <= 2000) {
@@ -232,12 +265,17 @@
 					} else {
 						this.year -= 1
 						this.month = 12
+						this.page = 1
+						this.getListData()
 					}
 				} else {
 					this.month -= 1
+					this.page = 1
+					this.getListData()
 				}
-			},
 
+			},
+			// 往前选择月份回调
 			handleRight() {
 				if (this.month >= 12) {
 					if (this.year >= 2025) {
@@ -248,21 +286,32 @@
 					} else {
 						this.year += 1
 						this.month = 1
+						this.page = 1
+						this.getListData()
 					}
 				} else {
 					this.month += 1
+					this.page = 1
+					this.getListData()
 				}
 			},
-			handleDoubleRight() {
-				if (this.year >= 2025) {
-					uni.showToast({
-						title: "不能选择2025年之后",
-						icon: 'none'
-					})
-				} else {
-					this.year += 1
-				}
-			},
+
+			// 格式化时间
+			format_time(timestamp) {
+				//时间戳为10位需*1000，时间戳为13位的话不需乘1000
+				var date = new Date(timestamp);
+				var y = date.getFullYear();
+				var m = date.getMonth() + 1;
+				var d = date.getDate();
+				m = m < 10 ? "0" + m : m;
+				d = d < 10 ? "0" + d : d;
+				var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours());
+				var mm = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes());
+				var s = date.getSeconds()
+				s = s < 10 ? "0" + s : s;
+				let strDate = y + "-" + m + "-" + d + " " + h + ":" + mm + ":" + s;
+				return strDate;
+			}
 		}
 	}
 </script>
@@ -420,5 +469,27 @@
 				}
 			}
 		}
+
+		.no_data {
+			margin: 0 auto;
+			margin-top: 230rpx;
+			width: 480rpx;
+			height: 508rpx;
+			text-align: center;
+
+			img {
+				width: 100%;
+				height: 100%;
+			}
+
+			.info {
+				color: #5792F0;
+			}
+		}
+
+		.foot {
+			padding-bottom: 20rpx;
+			text-align: center;
+		}
 	}
 </style>

pages/editRules/editRules.vue

@@ -45,9 +45,9 @@
 					{{time}}
 				</view>
 				<view class="ele black" v-else>
-					<span>{{time}}</span>
+					<span>{{time.join("，")}}</span>
 					<span v-for="(item,index) in periods" :key="index">
-						{{format_time(item.beginTime)}}-{{format_time(item.endTime)}}
+						{{item.beginTime}}-{{item.endTime}}
 					</span>
 				</view>
 				<view class="right">
@@ -126,39 +126,93 @@
 				array: ['5分钟', '10分钟', '15分钟', '20分钟'],
 				periods: [],
 				index: 0,
-				id: ""
+				id: "",
+				groupIds: [],
+				timeGroups: []
 			};
 		},
 		onLoad(option) {
-			uni.$on('updateRuleName', (data) => {
-				this.ruleName = data
-			})
-			uni.$on('updateGroup', (data) => {
-				let temList = []
-				data.forEach((ele) => {
-					temList.push(ele.name)
-				})
-				this.group = temList.join("，")
-			})
-
-
 			this.info = JSON.parse(option.info)
 			console.log(this.info);
 			if (this.info) {
 				this.ruleName = this.info.name
 				this.group = this.info.groups
-				this.time = this.info.temList
 				this.place = this.info.locations
 				this.value = this.info.noticeTime
-				this.periods = this.info.periods
 				this.id = this.info.id
 
-				let ruleTime = []
-				ruleTime.push({
-					selectedWeeks: this.time,
-					list: this.periods
+				this.time = this.info.temList
+
+				this.periods = []
+				this.info.periods.forEach((ele) => {
+					this.periods.push({
+						beginTime: this.format_time(ele.beginTime),
+						endTime: this.format_time(ele.endTime)
+					})
 				})
-				uni.setStorageSync("ruleTime", ruleTime)
+			}
+		},
+		onShow() {
+			let ruleName = uni.getStorageSync("ruleName")
+			if (ruleName) {
+				this.ruleName = ruleName
+			}
+
+			let ruleGroup = uni.getStorageSync("ruleGroup")
+			if (ruleGroup) {
+				let temList = []
+				this.groupIds = []
+				ruleGroup.forEach((ele) => {
+					temList.push(ele.name)
+					this.groupIds.push(ele.id)
+				})
+				this.group = temList.join("，")
+			}
+
+			let ruleTime = uni.getStorageSync("ruleTime")
+			let flag = uni.getStorageSync("flag")
+			console.log(ruleTime);
+			console.log(flag);
+			if (ruleTime.length == 0 && flag) {
+				this.time = "未设置"
+			}
+			if (ruleTime.length > 0) {
+				this.time = ruleTime[0].selectedWeeks
+				this.periods = ruleTime[0].list
+				// this.time = ruleTime
+				// let temList = []
+				// ruleTime.forEach((ele) => {
+				// 	temList.push({
+				// 		dayOfWeeks: ele.selectedWeeks,
+				// 		periods: ele.list
+				// 	})
+				// })
+				// temList.forEach((item) => {
+				// 	item.dayOfWeeks = item.dayOfWeeks.map((element) => {
+				// 		if (element == '星期一') {
+				// 			return element = 1
+				// 		}
+				// 		if (element == '星期二') {
+				// 			return element = 2
+				// 		}
+				// 		if (element == '星期三') {
+				// 			return element = 3
+				// 		}
+				// 		if (element == '星期四') {
+				// 			return element = 4
+				// 		}
+				// 		if (element == '星期五') {
+				// 			return element = 5
+				// 		}
+				// 		if (element == '星期六') {
+				// 			return element = 6
+				// 		}
+				// 		if (element == '星期天') {
+				// 			return element = 7
+				// 		}
+				// 	})
+				// })
+				// this.timeGroups = temList
 			}
 		},
 		methods: {
@@ -209,24 +263,37 @@
 			changeSelect(e) {
 				let index = e.detail.value
 				this.value = this.array[index]
+				let index2 = this.value.indexOf("分", 0)
+				this.value = this.value.substring(0, index2);
+				uni.setStorageSync("ruleValue", this.value)
 			},
 			// 点击规则名称跳转回调
 			goPageRuleName() {
 				uni.navigateTo({
-					url: `/pages/ruleName/ruleName?flag=1`
+					url: `/pages/ruleName/ruleName`
 				})
 			},
 			// 点击考勤组跳转回调
 			goPageGroup() {
 				uni.navigateTo({
-					url: `/pages/group/group?flag=2&type=edit`
+					url: `/pages/group/group?flag=2`
 				})
 			},
 			// 点击打卡时间跳转回调
 			goPagePunchTime() {
-				uni.navigateTo({
-					url: "/pages/punchTime/punchTime"
-				})
+				if (this.time == "未设置") {
+					let periods = []
+					let time = []
+					uni.navigateTo({
+						url: `/pages/punchTime/punchTime?time=${time}&periods=${periods}`
+					})
+				} else {
+					let periods = JSON.stringify(this.periods)
+					let time = JSON.stringify(this.time)
+					uni.navigateTo({
+						url: `/pages/punchTime/punchTime?time=${time}&periods=${periods}`
+					})
+				}
 			},
 			// 点击打卡地点跳转回调
 			goPagePunchLocation() {

pages/group/group.vue

@@ -3,7 +3,7 @@
 		<!-- 头部搜索栏区域 -->
 		<view class="search">
 			<uni-search-bar bgColor="#fff" placeholder="请输入搜索内容" cancelButton="none" v-model="searchValue"
-				@clear="clear" @blur="getGroupData">
+				@clear="clear" @input="getGroupData">
 			</uni-search-bar>
 		</view>
 
@@ -136,11 +136,13 @@
 				group_total: 0,
 				// 新增考勤组ID数组
 				userOrgList: [],
+				// 判断是新增考勤组还是关联考勤组标识
 				flag: null,
 				// 考勤组勾选框禁用标识
 				checkStatus: false,
 				// 搜索框绑定的值
 				searchValue: "",
+				// 左滑选项配置
 				options: [{
 					text: '删除',
 					style: {
@@ -149,13 +151,12 @@
 				}],
 				// 考勤组列表数据
 				list: [],
+				// 考勤组范围数组
 				range: [],
-				type: ""
 			};
 		},
 		onLoad(options) {
 			this.flag = options.flag
-			this.type = options.type
 			if (this.flag == 1) {
 				this.checkStatus = true
 			}
@@ -264,7 +265,6 @@
 					url: "/attendance/api/settings/group/add",
 					method: "post",
 					header: {
-						'content-type': 'application/json',
 						'Authorization': uni.getStorageSync("token") ||
 							'eyJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjo1MDQ2LCJ1c2VyX3V1aWQiOjEzNDc3NzE0NzM1NTY5NzE1MiwibmJmIjoxNjcxMTU1ODQzfQ.u4-N762Ijfb9RkuuFOFkeMiJQI9uCi0IaheJlGwi5Ms'
 					},
@@ -324,11 +324,7 @@
 						icon: "none"
 					})
 				} else {
-					if (this.type == "edit") {
-						uni.$emit('updateGroup', temList)
-					} else {
-						uni.setStorageSync("ruleGroup", temList)
-					}
+					uni.setStorageSync("ruleGroup", temList)
 					uni.navigateBack({
 						delta: 1
 					})
@@ -358,7 +354,7 @@
 								}
 							})
 							// console.log(res);
-							if (res.code == 200) {
+							if (res.code == 200 && res.data) {
 								uni.showToast({
 									title: "删除成功",
 									icon: 'success'
@@ -369,7 +365,8 @@
 							} else {
 								uni.showToast({
 									title: res.message,
-									icon: 'success'
+									icon: 'none',
+									duration:3000
 								})
 							}
 						} else if (res.cancel) {}

pages/punchTime/punchTime.vue

@@ -33,7 +33,7 @@
 								</view>
 								<view class="value">
 									<span v-for="(item_time,index_time) in item.list" :key="index_time">
-										{{item_time.startTime||item_time.beginTime}}-{{item_time.endTime}}
+										{{item_time.beginTime}}-{{item_time.endTime}}
 									</span>
 								</view>
 							</view>
@@ -61,6 +61,29 @@
 				}],
 			}
 		},
+		onLoad(options) {
+			if(options.time){
+				let time = JSON.parse(options.time)
+				let periods = JSON.parse(options.periods)
+				console.log(time);
+				console.log(periods);
+				// let temArr = []
+				// periods.forEach((ele) => {
+				// 	temArr.push({
+				// 		beginTime: this.format_time(ele.beginTime),
+				// 		endTime: this.format_time(ele.endTime)
+				// 	})
+				// })
+				// periods = temArr
+				let temList = []
+				temList.push({
+					selectedWeeks: time,
+					list: periods
+				})
+				this.list = temList
+				uni.setStorageSync("ruleTime", this.list)
+			}
+		},
 		onShow() {
 			let ruleTime = uni.getStorageSync("ruleTime")
 			if (ruleTime) {
@@ -95,10 +118,23 @@
 							})
 							this.list.splice(index, 1)
 							uni.setStorageSync("ruleTime", this.list)
+							var flag = uni.getStorageSync("ruleTime")
+							if (flag == []) {
+								uni.setStorageSync("flag", true)
+							}
 						} else if (res.cancel) {}
 					}
 				});
 			},
+			// 格式化时间
+			// format_time(timestamp) {
+			// 	//时间戳为10位需*1000，时间戳为13位的话不需乘1000
+			// 	var date = new Date(timestamp);
+			// 	var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+			// 	var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes());
+			// 	let strDate = h + m;
+			// 	return strDate;
+			// }
 		}
 	}
 </script>
@@ -175,6 +211,10 @@
 							overflow: hidden;
 							white-space: nowrap;
 							text-overflow: ellipsis;
+
+							span {
+								margin-right: 10rpx;
+							}
 						}
 					}
 				}

pages/ruleName/ruleName.vue

@@ -16,13 +16,9 @@
 	export default {
 		data() {
 			return {
-				name: "",
-				flag: null
+				name: ""
 			};
 		},
-		onLoad(options) {
-			this.flag = options.flag
-		},
 		methods: {
 			// 点击确认按钮回调
 			handleConfirm() {
@@ -32,11 +28,7 @@
 						icon: 'none'
 					})
 				} else {
-					if (this.flag == 1) {
-						uni.$emit('updateRuleName', this.name)
-					} else {
-						uni.setStorageSync("ruleName", this.name)
-					}
+					uni.setStorageSync("ruleName", this.name)
 					uni.navigateBack({
 						delta: 1
 					})

pages/setPunchTime/setPunchTime.vue

@@ -27,10 +27,10 @@
 
 					<view class="item">
 						<view class="item_box">
-							<picker mode="time" :value="item.startTime" @change="bindTimeChange($event,1,item)">
+							<picker mode="time" :value="item.beginTime" @change="bindTimeChange($event,1,item)">
 								<view class="uni-input">
 									<view class="input_time">
-										{{item.startTime}}
+										{{item.beginTime}}
 									</view>
 									<view class="input_icon">
 										<img src="../../static/time.png">
@@ -91,7 +91,7 @@
 				selectedWeeks: [],
 				// 打卡时间段列表
 				list: [{
-					startTime: "00:00",
+					beginTime: "00:00",
 					endTime: "00:00",
 				}],
 				// 是否同步法定节假日
@@ -228,7 +228,7 @@
 			// 选择时间段回调
 			bindTimeChange(e, val, item) {
 				if (val == 1) {
-					item.startTime = e.detail.value
+					item.beginTime = e.detail.value
 				} else {
 					item.endTime = e.detail.value
 				}
@@ -236,7 +236,7 @@
 			// 添加时段回调
 			handleAddTime() {
 				this.list.push({
-					startTime: "00:00",
+					beginTime: "00:00",
 					endTime: "00:00",
 				})
 			},

pages/stat/stat.vue

@@ -19,7 +19,7 @@
 			<view class="state">
 				<view class="err">
 					<view class="number">
-						0
+						{{fail_count}}
 					</view>
 					<view class="mes">
 						异常次数（次）
@@ -27,7 +27,7 @@
 				</view>
 				<view class="success">
 					<view class="number">
-						1
+						{{success_count}}
 					</view>
 					<view class="mes">
 						打卡成功（次）
@@ -212,7 +212,12 @@
 				],
 				progress_txt: 50,
 				progress_total: 70,
-				nowTime: ""
+				// 当前时间
+				nowTime: "",
+				// 打卡异常次数
+				fail_count: 0,
+				// 打卡成功次数
+				success_count: 0
 			};
 		},
 		onLoad() {
@@ -220,6 +225,7 @@
 				this.current = 0
 			}
 			this.getTime()
+			this.getMonthTimes()
 			this.getRulesList()
 		},
 		computed: {
@@ -242,6 +248,21 @@
 				this.month = month
 			},
 
+			// 获取我的月打卡次数
+			async getMonthTimes() {
+				let res = await this.$myRequest({
+					url: "/attendance/api/sign/check/in/month/times",
+					data: {
+						time: this.nowTime
+					}
+				})
+				// console.log(res);
+				if (res.code == 200) {
+					this.fail_count = res.data.fail
+					this.success_count = res.data.success
+				}
+			},
+
 			// 获取打卡规则列表
 			async getRulesList() {
 				let name = uni.getStorageSync("userInfo").username
@@ -253,7 +274,7 @@
 						beginTimeBegin: this.nowTime
 					}
 				})
-				console.log(res);
+				// console.log(res);
 				if (res.code == 200) {
 					this.list2 = res.data.list
 				}
@@ -262,7 +283,7 @@
 			// 点击日历日期回调
 			change(e) {
 				console.log('change 返回:', e.fulldate)
-				this.nowTime = e.fulldate+ " " + "00:00:00"
+				this.nowTime = e.fulldate + " " + "00:00:00"
 				this.getRulesList()
 			},
 			onClickItem(e) {

pages/statDetail/statDetail.vue

@@ -14,7 +14,7 @@
 				</view>
 				<!-- 时间区域 -->
 				<view class="time">
-					{{year}}-{{comMonth}}
+					{{year}}-{{format_month}}
 				</view>
 				<!-- 双右箭头区域 -->
 				<view class="single2" @click="handleRight">
@@ -35,13 +35,13 @@
 		</view>
 
 		<!-- 打卡记录区域 -->
-		<view class="list">
+		<view class="list" v-if="list.length">
 			<!-- 每一条记录区域 -->
-			<view class="box" v-for="item in list" :key="item.id">
+			<view class="box" v-for="(item,index) in list" :key="index">
 				<!-- 人物信息区域 -->
 				<view class="person">
 					<view class="img">
-						<img :src="item.peopleImg">
+						<img :src="item.headImage">
 					</view>
 					<view class="info">
 						<view class="name">
@@ -53,13 +53,30 @@
 					</view>
 				</view>
 				<!-- 图片区域 -->
-				<view class="imgs" v-if="item.imgsList">
-					<view class="imgs_item" v-for="(img,index) in (item.imgsList)" :key="index">
+				<view class="imgs" v-if="item.status==4">
+					<view class="imgs_item">
 						<view class="image">
-							<img :src="img.url">
+							<img :src="item.faceImage">
 						</view>
 						<view class="title">
-							{{img.title}}
+							匹对照片
+						</view>
+					</view>
+
+					<view class="imgs_item">
+						<view class="image">
+							<img :src="item.matchFaceImage">
+						</view>
+						<view class="title">
+							被匹对照片
+						</view>
+					</view>
+					<view class="imgs_item">
+						<view class="image">
+							<img :src="item.sceneImage">
+						</view>
+						<view class="title">
+							场景照片
 						</view>
 					</view>
 
@@ -71,7 +88,7 @@
 							打卡状态：
 						</view>
 						<view class="value">
-							{{item.status}}
+							{{item.status==4?"打卡成功":"打卡失败"}}
 						</view>
 					</view>
 					<view class="msg_item">
@@ -79,29 +96,42 @@
 							打卡规则：
 						</view>
 						<view class="value">
-							{{item.rule}}
+							{{item.ruleName}}
 						</view>
 					</view>
-					<view class="msg_item" v-if="item.time">
+					<view class="msg_item" v-if="item.status==4">
 						<view class="key">
 							打卡时间：
 						</view>
 						<view class="value">
-							{{item.time}}
+							{{format_time(item.updateTime)}}
 						</view>
 					</view>
-					<view class="msg_item" v-if="item.place">
+					<view class="msg_item" v-if="item.status==4">
 						<view class="key">
 							打卡地址：
 						</view>
 						<view class="value">
-							{{item.place}}
+							{{item.location}}
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
 
+		<!-- 暂无数据显示区域 -->
+		<view class="no_data" v-if="list.length==0">
+			<img src="../../static/nodata.png">
+			<view class="info">
+				暂无数据
+			</view>
+		</view>
+
+		<!-- 底线区域 -->
+		<view class="foot" v-if="flag">
+			------我是有底线的------
+		</view>
+
 	</view>
 </template>
 
@@ -109,88 +139,47 @@
 	export default {
 		data() {
 			return {
+				// 当前年份
 				year: null,
+				// 当前月份
 				month: null,
-				items: ['打卡成功（30次）', '打卡失败（28次）'],
+				// 分段器选项
+				items: ['打卡成功', '打卡失败'],
+				// 当前所在分段器索引
 				current: 0,
+				// 第几页
+				page: 1,
+				// 每页条数
+				size: 10,
+				// 数据总条数
+				total: 0,
+				// 打卡状态参数
+				status: 4,
+				// 打卡时间参数
+				time: null,
+				// 列表数组
 				list: [],
-				list2: [{
-						id: 1,
-						peopleImg: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-						name: "程佳欢",
-						college: "文法学院",
-						imgsList: [{
-								url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-								title: "匹对照片"
-							},
-							{
-								url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-								title: "被匹对照片"
-							},
-							{
-								url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-								title: "场景照片"
-							},
-						],
-						status: '打卡成功',
-						rule: "课间操打卡规则已打卡",
-						time: "2022-02-04   15:15:15",
-						place: "江西省南昌市南昌交通学院操场"
-					},
-
-					{
-						id: 2,
-						peopleImg: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-						name: "陈志斌",
-						college: "南昌交通学院",
-						imgsList: [{
-								url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-								title: "匹对照片"
-							},
-							{
-								url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-								title: "被匹对照片"
-							},
-							{
-								url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-								title: "场景照片"
-							},
-						],
-						status: '打卡成功',
-						rule: "课间操打卡规则已打卡",
-						time: "2022-11-04   15:15:15",
-						place: "江西省南昌市经开区"
-					},
-				],
-				list3: [{
-						id: 1,
-						peopleImg: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-						name: "甘昱新",
-						college: "文法学院",
-						status: '未打卡',
-						rule: "课间操打卡规则",
-					},
-					{
-						id: 2,
-						peopleImg: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-						name: "甘昱新",
-						college: "文法学院",
-						status: '未打卡',
-						rule: "课间操打卡规则",
-					},
-				]
+				// 底线区域显示隐藏控制标识
+				flag: false,
 			};
 		},
-		onLoad(options) {
-			this.month = options.month - 0 || 1
+		onLoad() {
 			this.getTime()
-			this.list = this.list2
+			this.getListData()
+		},
+		// 页面滑动到底部触发的回调
+		onReachBottom() {
+			if (this.list.length < this.total) {
+				this.page++
+				this.getListData()
+			} else {
+				this.flag = true
+			}
 		},
 		computed: {
-			comMonth() {
+			format_month() {
 				if (this.month) {
 					let month = this.month < 10 ? '0' + this.month : this.month
-					console.log(month);
 					return month
 				}
 			}
@@ -200,18 +189,51 @@
 			getTime() {
 				let date = new Date()
 				let year = date.getFullYear()
+				let month = date.getMonth() + 1
+				this.month = month
 				this.year = year
 			},
 
+			// 获取打卡记录列表数组
+			async getListData() {
+				this.flag = false
+				this.time = this.year + "-" + this.format_month + "-01 00:00:00"
+				let res = await this.$myRequest({
+					url: "/attendance/api/sign/check/in/list/month",
+					data: {
+						page: this.page,
+						size: this.size,
+						status: this.status,
+						time: this.time
+					}
+				})
+				// console.log(res);
+				if (res.code == 200) {
+					this.total = res.data.total
+					this.list = res.data.list
+					if (this.status == 4) {
+						this.items[0] = `打卡成功（${this.total}次）`
+						this.items[1] = `打卡失败`
+					} else {
+						this.items[0] = `打卡成功`
+						this.items[1] = `打卡失败（${this.total}次）`
+					}
+				}
+			},
+
+			// 点击分段器回调
 			onClickItem(e) {
-				console.log(e.currentIndex);
+				// console.log(e.currentIndex);
 				if (e.currentIndex == 0) {
-					this.list = this.list2
+					this.status = 4
 				} else {
-					this.list = this.list3
+					this.status = 3
 				}
+				this.page = 1
+				this.getListData()
 			},
 
+			// 往后选择年份回调
 			handleDoubleLeft() {
 				if (this.year <= 2000) {
 					uni.showToast({
@@ -220,8 +242,24 @@
 					})
 				} else {
 					this.year -= 1
+					this.page = 1
+					this.getListData()
 				}
 			},
+			// 往前选择年份回调
+			handleDoubleRight() {
+				if (this.year >= 2025) {
+					uni.showToast({
+						title: "不能选择2025年之后",
+						icon: 'none'
+					})
+				} else {
+					this.year += 1
+					this.page = 1
+					this.getListData()
+				}
+			},
+			// 往后选择月份回调
 			handleLeft() {
 				if (this.month <= 1) {
 					if (this.year <= 2000) {
@@ -232,12 +270,17 @@
 					} else {
 						this.year -= 1
 						this.month = 12
+						this.page = 1
+						this.getListData()
 					}
 				} else {
 					this.month -= 1
+					this.page = 1
+					this.getListData()
 				}
 			},
 
+			// 往前选择月份回调
 			handleRight() {
 				if (this.month >= 12) {
 					if (this.year >= 2025) {
@@ -248,21 +291,33 @@
 					} else {
 						this.year += 1
 						this.month = 1
+						this.page = 1
+						this.getListData()
 					}
 				} else {
 					this.month += 1
+					this.page = 1
+					this.getListData()
 				}
 			},
-			handleDoubleRight() {
-				if (this.year >= 2025) {
-					uni.showToast({
-						title: "不能选择2025年之后",
-						icon: 'none'
-					})
-				} else {
-					this.year += 1
-				}
-			},
+
+
+			// 格式化时间
+			format_time(timestamp) {
+				//时间戳为10位需*1000，时间戳为13位的话不需乘1000
+				var date = new Date(timestamp);
+				var y = date.getFullYear();
+				var m = date.getMonth() + 1;
+				var d = date.getDate();
+				m = m < 10 ? "0" + m : m;
+				d = d < 10 ? "0" + d : d;
+				var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours());
+				var mm = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes());
+				var s = date.getSeconds()
+				s = s < 10 ? "0" + s : s;
+				let strDate = y + "-" + m + "-" + d + " " + h + ":" + mm + ":" + s;
+				return strDate;
+			}
 		}
 	}
 </script>
@@ -420,5 +475,27 @@
 				}
 			}
 		}
+
+		.no_data {
+			margin: 0 auto;
+			margin-top: 230rpx;
+			width: 480rpx;
+			height: 508rpx;
+			text-align: center;
+
+			img {
+				width: 100%;
+				height: 100%;
+			}
+
+			.info {
+				color: #5792F0;
+			}
+		}
+
+		.foot {
+			padding-bottom: 20rpx;
+			text-align: center;
+		}
 	}
 </style>

unpackage/dist/dev/mp-weixin/pages/addRules/addRules.js

@@ -414,7 +414,7 @@ var _default = {
                     _this2.timeGroups.forEach(function (ele) {
                       ele.periods.forEach(function (item) {
                         temList.push({
-                          beginTime: _this2.formatTime(item.startTime),
+                          beginTime: _this2.formatTime(item.beginTime),
                           endTime: _this2.formatTime(item.endTime)
                         });
                       });

unpackage/dist/dev/mp-weixin/pages/cardRecord/cardRecord.js

@@ -129,6 +129,17 @@ var render = function () {
   var m1 = __webpack_require__(/*! ../../static/left.png */ 85)
   var m2 = __webpack_require__(/*! ../../static/right2.png */ 86)
   var m3 = __webpack_require__(/*! ../../static/double_right.png */ 87)
+  var l0 = _vm.list.length
+    ? _vm.__map(_vm.list, function (item, index) {
+        var $orig = _vm.__get_orig(item)
+        var m4 = item.status == 4 ? _vm.format_time(item.updateTime) : null
+        return {
+          $orig: $orig,
+          m4: m4,
+        }
+      })
+    : null
+  var m5 = _vm.list.length == 0 ? __webpack_require__(/*! ../../static/nodata.png */ 394) : null
   _vm.$mp.data = Object.assign(
     {},
     {
@@ -137,6 +148,8 @@ var render = function () {
         m1: m1,
         m2: m2,
         m3: m3,
+        l0: l0,
+        m5: m5,
       },
     }
   )
@@ -175,10 +188,43 @@ __webpack_require__.r(__webpack_exports__);
 "use strict";
 /* WEBPACK VAR INJECTION */(function(uni) {
 
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 3);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 39));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 41));
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 //
 //
 //
@@ -289,96 +335,108 @@ exports.default = void 0;
 var _default = {
   data: function data() {
     return {
+      // 第几页
+      page: 1,
+      // 每页条数
+      size: 10,
+      // 数据总条数
+      total: 0,
+      // 打卡状态参数
+      status: "",
+      // 打卡时间参数
+      time: null,
+      // 当前年份
       year: null,
+      // 当前月份
       month: null,
+      // 分段器选项
       items: ['全部', '打卡成功', '打卡失败'],
+      // 当前所在分段器索引
       current: 0,
+      // 列表数组
       list: [],
-      list2: [{
-        id: 1,
-        peopleImg: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-        name: "程佳欢",
-        college: "文法学院",
-        imgsList: [{
-          url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-          title: "匹对照片"
-        }, {
-          url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-          title: "被匹对照片"
-        }, {
-          url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-          title: "场景照片"
-        }],
-        status: '打卡成功',
-        rule: "课间操打卡规则已打卡",
-        time: "2022-02-04   15:15:15",
-        place: "江西省南昌市南昌交通学院操场"
-      }, {
-        id: 2,
-        peopleImg: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-        name: "陈志斌",
-        college: "南昌交通学院",
-        imgsList: [{
-          url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-          title: "匹对照片"
-        }, {
-          url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-          title: "被匹对照片"
-        }, {
-          url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-          title: "场景照片"
-        }],
-        status: '打卡成功',
-        rule: "课间操打卡规则已打卡",
-        time: "2022-11-04   15:15:15",
-        place: "江西省南昌市经开区"
-      }],
-      list3: [{
-        id: 1,
-        peopleImg: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-        name: "甘昱新",
-        college: "文法学院",
-        status: '未打卡',
-        rule: "课间操打卡规则"
-      }, {
-        id: 2,
-        peopleImg: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-        name: "甘昱新",
-        college: "文法学院",
-        status: '未打卡',
-        rule: "课间操打卡规则"
-      }]
+      // 底线区域显示隐藏控制标识
+      flag: false
     };
   },
-  onLoad: function onLoad(options) {
-    this.month = options.month - 0 || 1;
+  onLoad: function onLoad() {
     this.getTime();
-    this.list = this.list2;
+    this.getListData();
+  },
+  // 页面滑动到底部触发的回调
+  onReachBottom: function onReachBottom() {
+    if (this.list.length < this.total) {
+      this.page++;
+      this.getListData();
+    } else {
+      this.flag = true;
+    }
   },
   computed: {
-    comMonth: function comMonth() {
-      if (this.month) {
-        var month = this.month < 10 ? '0' + this.month : this.month;
-        console.log(month);
-        return month;
-      }
+    // 格式化月份
+    format_month: function format_month() {
+      var temTime = this.month < 10 ? '0' + this.month : this.month;
+      return temTime;
     }
   },
   methods: {
-    // 获取当前年份
+    // 获取当前年份,月份
     getTime: function getTime() {
       var date = new Date();
       var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      this.month = month;
       this.year = year;
     },
+    // 获取打卡记录列表数组
+    getListData: function getListData() {
+      var _this = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var res;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _this.flag = false;
+                _this.time = _this.year + "-" + _this.format_month + "-01 00:00:00";
+                _context.next = 4;
+                return _this.$myRequest({
+                  url: "/attendance/api/sign/check/in/list/month",
+                  data: {
+                    page: _this.page,
+                    size: _this.size,
+                    status: _this.status,
+                    time: _this.time
+                  }
+                });
+              case 4:
+                res = _context.sent;
+                // console.log(res);
+                if (res.code == 200) {
+                  _this.total = res.data.total;
+                  _this.list = res.data.list;
+                }
+              case 6:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))();
+    },
+    // 点击分段器回调
     onClickItem: function onClickItem(e) {
-      console.log(e.currentIndex);
-      // if (e.currentIndex == 0) {
-      // 	this.list = this.list2
-      // } else {
-      // 	this.list = this.list3
-      // }
+      if (e.currentIndex == 0) {
+        this.status = "";
+      } else if (e.currentIndex == 1) {
+        this.status = 4;
+      } else if (e.currentIndex == 2) {
+        this.status = 3;
+      }
+      this.page = 1;
+      this.getListData();
     },
+    // 往后选择年份回调
     handleDoubleLeft: function handleDoubleLeft() {
       if (this.year <= 2000) {
         uni.showToast({
@@ -387,8 +445,24 @@ var _default = {
         });
       } else {
         this.year -= 1;
+        this.page = 1;
+        this.getListData();
+      }
+    },
+    // 往前选择年份回调
+    handleDoubleRight: function handleDoubleRight() {
+      if (this.year >= 2025) {
+        uni.showToast({
+          title: "不能选择2025年之后",
+          icon: 'none'
+        });
+      } else {
+        this.year += 1;
+        this.page = 1;
+        this.getListData();
       }
     },
+    // 往后选择月份回调
     handleLeft: function handleLeft() {
       if (this.month <= 1) {
         if (this.year <= 2000) {
@@ -399,11 +473,16 @@ var _default = {
         } else {
           this.year -= 1;
           this.month = 12;
+          this.page = 1;
+          this.getListData();
         }
       } else {
         this.month -= 1;
+        this.page = 1;
+        this.getListData();
       }
     },
+    // 往前选择月份回调
     handleRight: function handleRight() {
       if (this.month >= 12) {
         if (this.year >= 2025) {
@@ -414,20 +493,30 @@ var _default = {
         } else {
           this.year += 1;
           this.month = 1;
+          this.page = 1;
+          this.getListData();
         }
       } else {
         this.month += 1;
+        this.page = 1;
+        this.getListData();
       }
     },
-    handleDoubleRight: function handleDoubleRight() {
-      if (this.year >= 2025) {
-        uni.showToast({
-          title: "不能选择2025年之后",
-          icon: 'none'
-        });
-      } else {
-        this.year += 1;
-      }
+    // 格式化时间
+    format_time: function format_time(timestamp) {
+      //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+      var date = new Date(timestamp);
+      var y = date.getFullYear();
+      var m = date.getMonth() + 1;
+      var d = date.getDate();
+      m = m < 10 ? "0" + m : m;
+      d = d < 10 ? "0" + d : d;
+      var h = date.getHours() < 10 ? '0' + date.getHours() : date.getHours();
+      var mm = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();
+      var s = date.getSeconds();
+      s = s < 10 ? "0" + s : s;
+      var strDate = y + "-" + m + "-" + d + " " + h + ":" + mm + ":" + s;
+      return strDate;
     }
   }
 };

unpackage/dist/dev/mp-weixin/pages/cardRecord/cardRecord.wxss

@@ -126,4 +126,22 @@
 .container .list .box .msg .msg_item .key.data-v-5abf34a6 {
   color: #808080;
 }
+.container .no_data.data-v-5abf34a6 {
+  margin: 0 auto;
+  margin-top: 230rpx;
+  width: 480rpx;
+  height: 508rpx;
+  text-align: center;
+}
+.container .no_data ._img.data-v-5abf34a6 {
+  width: 100%;
+  height: 100%;
+}
+.container .no_data .info.data-v-5abf34a6 {
+  color: #5792F0;
+}
+.container .foot.data-v-5abf34a6 {
+  padding-bottom: 20rpx;
+  text-align: center;
+}
 

unpackage/dist/dev/mp-weixin/pages/editRules/editRules.js

@@ -104,31 +104,20 @@ var render = function () {
   var _c = _vm._self._c || _h
   var m0 = __webpack_require__(/*! ../../static/right.png */ 82)
   var m1 = __webpack_require__(/*! ../../static/right.png */ 82)
-  var l0 = !(_vm.time == "未设置")
-    ? _vm.__map(_vm.periods, function (item, index) {
-        var $orig = _vm.__get_orig(item)
-        var m2 = _vm.format_time(item.beginTime)
-        var m3 = _vm.format_time(item.endTime)
-        return {
-          $orig: $orig,
-          m2: m2,
-          m3: m3,
-        }
-      })
-    : null
+  var g0 = !(_vm.time == "未设置") ? _vm.time.join("，") : null
+  var m2 = __webpack_require__(/*! ../../static/right.png */ 82)
+  var m3 = __webpack_require__(/*! ../../static/right.png */ 82)
   var m4 = __webpack_require__(/*! ../../static/right.png */ 82)
-  var m5 = __webpack_require__(/*! ../../static/right.png */ 82)
-  var m6 = __webpack_require__(/*! ../../static/right.png */ 82)
   _vm.$mp.data = Object.assign(
     {},
     {
       $root: {
         m0: m0,
         m1: m1,
-        l0: l0,
+        g0: g0,
+        m2: m2,
+        m3: m3,
         m4: m4,
-        m5: m5,
-        m6: m6,
       },
     }
   )
@@ -301,39 +290,94 @@ var _default = {
       array: ['5分钟', '10分钟', '15分钟', '20分钟'],
       periods: [],
       index: 0,
-      id: ""
+      id: "",
+      groupIds: [],
+      timeGroups: []
     };
   },
   onLoad: function onLoad(option) {
     var _this = this;
-    uni.$on('updateRuleName', function (data) {
-      _this.ruleName = data;
-    });
-    uni.$on('updateGroup', function (data) {
-      var temList = [];
-      data.forEach(function (ele) {
-        temList.push(ele.name);
-      });
-      _this.group = temList.join("，");
-    });
     this.info = JSON.parse(option.info);
     console.log(this.info);
     if (this.info) {
       this.ruleName = this.info.name;
       this.group = this.info.groups;
-      this.time = this.info.temList;
       this.place = this.info.locations;
       this.value = this.info.noticeTime;
-      this.periods = this.info.periods;
       this.id = this.info.id;
-      var ruleTime = [];
-      ruleTime.push({
-        selectedWeeks: this.time,
-        list: this.periods
+      this.time = this.info.temList;
+      this.periods = [];
+      this.info.periods.forEach(function (ele) {
+        _this.periods.push({
+          beginTime: _this.format_time(ele.beginTime),
+          endTime: _this.format_time(ele.endTime)
+        });
       });
-      uni.setStorageSync("ruleTime", ruleTime);
     }
   },
+  onShow: function onShow() {
+    var _this2 = this;
+    var ruleName = uni.getStorageSync("ruleName");
+    if (ruleName) {
+      this.ruleName = ruleName;
+    }
+    var ruleGroup = uni.getStorageSync("ruleGroup");
+    if (ruleGroup) {
+      var temList = [];
+      this.groupIds = [];
+      ruleGroup.forEach(function (ele) {
+        temList.push(ele.name);
+        _this2.groupIds.push(ele.id);
+      });
+      this.group = temList.join("，");
+    }
+    var ruleTime = uni.getStorageSync("ruleTime");
+    var flag = uni.getStorageSync("flag");
+    console.log(ruleTime);
+    console.log(flag);
+    if (ruleTime.length == 0 && flag) {
+      this.time = "未设置";
+    }
+    if (ruleTime.length > 0) {
+      this.time = ruleTime[0].selectedWeeks;
+      this.periods = ruleTime[0].list;
+      // this.time = ruleTime
+      // let temList = []
+      // ruleTime.forEach((ele) => {
+      // 	temList.push({
+      // 		dayOfWeeks: ele.selectedWeeks,
+      // 		periods: ele.list
+      // 	})
+      // })
+      // temList.forEach((item) => {
+      // 	item.dayOfWeeks = item.dayOfWeeks.map((element) => {
+      // 		if (element == '星期一') {
+      // 			return element = 1
+      // 		}
+      // 		if (element == '星期二') {
+      // 			return element = 2
+      // 		}
+      // 		if (element == '星期三') {
+      // 			return element = 3
+      // 		}
+      // 		if (element == '星期四') {
+      // 			return element = 4
+      // 		}
+      // 		if (element == '星期五') {
+      // 			return element = 5
+      // 		}
+      // 		if (element == '星期六') {
+      // 			return element = 6
+      // 		}
+      // 		if (element == '星期天') {
+      // 			return element = 7
+      // 		}
+      // 	})
+      // })
+      // this.timeGroups = temList
+    }
+  },
+
   methods: {
     // 点击确认按钮回调
     handleConfirm: function handleConfirm() {
@@ -349,7 +393,7 @@ var _default = {
     },
     // 点击删除按钮回调
     handleDelete: function handleDelete() {
-      var _this2 = this;
+      var _this3 = this;
       uni.showModal({
         title: '提示',
         content: '确定删除吗？',
@@ -365,11 +409,11 @@ var _default = {
                       break;
                     }
                     _context.next = 3;
-                    return _this2.$myRequest({
+                    return _this3.$myRequest({
                       url: "/attendance/api/settings/rule/delete",
                       method: "delete",
                       data: {
-                        ids: [_this2.id]
+                        ids: [_this3.id]
                       }
                     });
                   case 3:
@@ -407,24 +451,37 @@ var _default = {
     changeSelect: function changeSelect(e) {
       var index = e.detail.value;
       this.value = this.array[index];
+      var index2 = this.value.indexOf("分", 0);
+      this.value = this.value.substring(0, index2);
+      uni.setStorageSync("ruleValue", this.value);
     },
     // 点击规则名称跳转回调
     goPageRuleName: function goPageRuleName() {
       uni.navigateTo({
-        url: "/pages/ruleName/ruleName?flag=1"
+        url: "/pages/ruleName/ruleName"
       });
     },
     // 点击考勤组跳转回调
     goPageGroup: function goPageGroup() {
       uni.navigateTo({
-        url: "/pages/group/group?flag=2&type=edit"
+        url: "/pages/group/group?flag=2"
       });
     },
     // 点击打卡时间跳转回调
     goPagePunchTime: function goPagePunchTime() {
-      uni.navigateTo({
-        url: "/pages/punchTime/punchTime"
-      });
+      if (this.time == "未设置") {
+        var periods = [];
+        var time = [];
+        uni.navigateTo({
+          url: "/pages/punchTime/punchTime?time=".concat(time, "&periods=").concat(periods)
+        });
+      } else {
+        var _periods = JSON.stringify(this.periods);
+        var _time = JSON.stringify(this.time);
+        uni.navigateTo({
+          url: "/pages/punchTime/punchTime?time=".concat(_time, "&periods=").concat(_periods)
+        });
+      }
     },
     // 点击打卡地点跳转回调
     goPagePunchLocation: function goPagePunchLocation() {

unpackage/dist/dev/mp-weixin/pages/group/group.js

@@ -221,11 +221,13 @@ var _default = {
       group_total: 0,
       // 新增考勤组ID数组
       userOrgList: [],
+      // 判断是新增考勤组还是关联考勤组标识
       flag: null,
       // 考勤组勾选框禁用标识
       checkStatus: false,
       // 搜索框绑定的值
       searchValue: "",
+      // 左滑选项配置
       options: [{
         text: '删除',
         style: {
@@ -234,13 +236,12 @@ var _default = {
       }],
       // 考勤组列表数据
       list: [],
-      range: [],
-      type: ""
+      // 考勤组范围数组
+      range: []
     };
   },
   onLoad: function onLoad(options) {
     this.flag = options.flag;
-    this.type = options.type;
     if (this.flag == 1) {
       this.checkStatus = true;
     }
@@ -406,7 +407,6 @@ var _default = {
                   url: "/attendance/api/settings/group/add",
                   method: "post",
                   header: {
-                    'content-type': 'application/json',
                     'Authorization': uni.getStorageSync("token") || 'eyJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjo1MDQ2LCJ1c2VyX3V1aWQiOjEzNDc3NzE0NzM1NTY5NzE1MiwibmJmIjoxNjcxMTU1ODQzfQ.u4-N762Ijfb9RkuuFOFkeMiJQI9uCi0IaheJlGwi5Ms'
                   },
                   data: {
@@ -475,11 +475,7 @@ var _default = {
           icon: "none"
         });
       } else {
-        if (this.type == "edit") {
-          uni.$emit('updateGroup', temList);
-        } else {
-          uni.setStorageSync("ruleGroup", temList);
-        }
+        uni.setStorageSync("ruleGroup", temList);
         uni.navigateBack({
           delta: 1
         });
@@ -523,7 +519,7 @@ var _default = {
                   case 3:
                     _res = _context4.sent;
                     // console.log(res);
-                    if (_res.code == 200) {
+                    if (_res.code == 200 && _res.data) {
                       uni.showToast({
                         title: "删除成功",
                         icon: 'success'
@@ -534,7 +530,8 @@ var _default = {
                     } else {
                       uni.showToast({
                         title: _res.message,
-                        icon: 'success'
+                        icon: 'none',
+                        duration: 3000
                       });
                     }
                     _context4.next = 8;

unpackage/dist/dev/mp-weixin/pages/punchTime/punchTime.js

@@ -249,6 +249,29 @@ var _default = {
       }]
     };
   },
+  onLoad: function onLoad(options) {
+    if (options.time) {
+      var time = JSON.parse(options.time);
+      var periods = JSON.parse(options.periods);
+      console.log(time);
+      console.log(periods);
+      // let temArr = []
+      // periods.forEach((ele) => {
+      // 	temArr.push({
+      // 		beginTime: this.format_time(ele.beginTime),
+      // 		endTime: this.format_time(ele.endTime)
+      // 	})
+      // })
+      // periods = temArr
+      var temList = [];
+      temList.push({
+        selectedWeeks: time,
+        list: periods
+      });
+      this.list = temList;
+      uni.setStorageSync("ruleTime", this.list);
+    }
+  },
   onShow: function onShow() {
     var ruleTime = uni.getStorageSync("ruleTime");
     if (ruleTime) {
@@ -284,10 +307,22 @@ var _default = {
             });
             _this.list.splice(index, 1);
             uni.setStorageSync("ruleTime", _this.list);
+            var flag = uni.getStorageSync("ruleTime");
+            if (flag == []) {
+              uni.setStorageSync("flag", true);
+            }
           } else if (res.cancel) {}
         }
       });
-    }
+    } // 格式化时间
+    // format_time(timestamp) {
+    // 	//时间戳为10位需*1000，时间戳为13位的话不需乘1000
+    // 	var date = new Date(timestamp);
+    // 	var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+    // 	var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes());
+    // 	let strDate = h + m;
+    // 	return strDate;
+    // }
   }
 };
 exports.default = _default;

unpackage/dist/dev/mp-weixin/pages/punchTime/punchTime.wxss

@@ -67,6 +67,9 @@
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+.container .list .box .left .week .value ._span.data-v-9a207284 {
+  margin-right: 10rpx;
+}
 .container .list .box .right.data-v-9a207284 {
   flex: 2;
   display: flex;

unpackage/dist/dev/mp-weixin/pages/ruleName/ruleName.js

@@ -181,13 +181,9 @@ exports.default = void 0;
 var _default = {
   data: function data() {
     return {
-      name: "",
-      flag: null
+      name: ""
     };
   },
-  onLoad: function onLoad(options) {
-    this.flag = options.flag;
-  },
   methods: {
     // 点击确认按钮回调
     handleConfirm: function handleConfirm() {
@@ -197,11 +193,7 @@ var _default = {
           icon: 'none'
         });
       } else {
-        if (this.flag == 1) {
-          uni.$emit('updateRuleName', this.name);
-        } else {
-          uni.setStorageSync("ruleName", this.name);
-        }
+        uni.setStorageSync("ruleName", this.name);
         uni.navigateBack({
           delta: 1
         });

unpackage/dist/dev/mp-weixin/pages/setPunchTime/setPunchTime.js

@@ -196,7 +196,7 @@ var _default = {
       selectedWeeks: [],
       // 打卡时间段列表
       list: [{
-        startTime: "00:00",
+        beginTime: "00:00",
         endTime: "00:00"
       }],
       // 是否同步法定节假日
@@ -333,7 +333,7 @@ var _default = {
     // 选择时间段回调
     bindTimeChange: function bindTimeChange(e, val, item) {
       if (val == 1) {
-        item.startTime = e.detail.value;
+        item.beginTime = e.detail.value;
       } else {
         item.endTime = e.detail.value;
       }
@@ -341,7 +341,7 @@ var _default = {
     // 添加时段回调
     handleAddTime: function handleAddTime() {
       this.list.push({
-        startTime: "00:00",
+        beginTime: "00:00",
         endTime: "00:00"
       });
     },

unpackage/dist/dev/mp-weixin/pages/stat/stat.js

@@ -256,13 +256,14 @@ var _default = {
       peopleImg: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
       name: "李四",
       num: 30
-    }]), (0, _defineProperty2.default)(_ref, "progress_txt", 50), (0, _defineProperty2.default)(_ref, "progress_total", 70), (0, _defineProperty2.default)(_ref, "nowTime", ""), _ref;
+    }]), (0, _defineProperty2.default)(_ref, "progress_txt", 50), (0, _defineProperty2.default)(_ref, "progress_total", 70), (0, _defineProperty2.default)(_ref, "nowTime", ""), (0, _defineProperty2.default)(_ref, "fail_count", 0), (0, _defineProperty2.default)(_ref, "success_count", 0), _ref;
   },
   onLoad: function onLoad() {
     if (this.flag) {
       this.current = 0;
     }
     this.getTime();
+    this.getMonthTimes();
     this.getRulesList();
   },
   computed: {
@@ -284,37 +285,68 @@ var _default = {
       this.year = year;
       this.month = month;
     },
-    // 获取打卡规则列表
-    getRulesList: function getRulesList() {
+    // 获取我的月打卡次数
+    getMonthTimes: function getMonthTimes() {
       var _this = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var name, res;
+        var res;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                name = uni.getStorageSync("userInfo").username;
-                _context.next = 3;
+                _context.next = 2;
                 return _this.$myRequest({
+                  url: "/attendance/api/sign/check/in/month/times",
+                  data: {
+                    time: _this.nowTime
+                  }
+                });
+              case 2:
+                res = _context.sent;
+                // console.log(res);
+                if (res.code == 200) {
+                  _this.fail_count = res.data.fail;
+                  _this.success_count = res.data.success;
+                }
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))();
+    },
+    // 获取打卡规则列表
+    getRulesList: function getRulesList() {
+      var _this2 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        var name, res;
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                name = uni.getStorageSync("userInfo").username;
+                _context2.next = 3;
+                return _this2.$myRequest({
                   url: "/attendance/api/sign/check/in/list",
                   data: {
                     name: name ? name : "",
                     size: 999,
-                    beginTimeBegin: _this.nowTime
+                    beginTimeBegin: _this2.nowTime
                   }
                 });
               case 3:
-                res = _context.sent;
-                console.log(res);
+                res = _context2.sent;
+                // console.log(res);
                 if (res.code == 200) {
-                  _this.list2 = res.data.list;
+                  _this2.list2 = res.data.list;
                 }
-              case 6:
+              case 5:
               case "end":
-                return _context.stop();
+                return _context2.stop();
             }
           }
-        }, _callee);
+        }, _callee2);
       }))();
     },
     // 点击日历日期回调

unpackage/dist/dev/mp-weixin/pages/statDetail/statDetail.js

@@ -129,6 +129,17 @@ var render = function () {
   var m1 = __webpack_require__(/*! ../../static/left.png */ 85)
   var m2 = __webpack_require__(/*! ../../static/right2.png */ 86)
   var m3 = __webpack_require__(/*! ../../static/double_right.png */ 87)
+  var l0 = _vm.list.length
+    ? _vm.__map(_vm.list, function (item, index) {
+        var $orig = _vm.__get_orig(item)
+        var m4 = item.status == 4 ? _vm.format_time(item.updateTime) : null
+        return {
+          $orig: $orig,
+          m4: m4,
+        }
+      })
+    : null
+  var m5 = _vm.list.length == 0 ? __webpack_require__(/*! ../../static/nodata.png */ 394) : null
   _vm.$mp.data = Object.assign(
     {},
     {
@@ -137,6 +148,8 @@ var render = function () {
         m1: m1,
         m2: m2,
         m3: m3,
+        l0: l0,
+        m5: m5,
       },
     }
   )
@@ -175,10 +188,43 @@ __webpack_require__.r(__webpack_exports__);
 "use strict";
 /* WEBPACK VAR INJECTION */(function(uni) {
 
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 3);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 39));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 41));
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 //
 //
 //
@@ -289,77 +335,47 @@ exports.default = void 0;
 var _default = {
   data: function data() {
     return {
+      // 当前年份
       year: null,
+      // 当前月份
       month: null,
-      items: ['打卡成功（30次）', '打卡失败（28次）'],
+      // 分段器选项
+      items: ['打卡成功', '打卡失败'],
+      // 当前所在分段器索引
       current: 0,
+      // 第几页
+      page: 1,
+      // 每页条数
+      size: 10,
+      // 数据总条数
+      total: 0,
+      // 打卡状态参数
+      status: 4,
+      // 打卡时间参数
+      time: null,
+      // 列表数组
       list: [],
-      list2: [{
-        id: 1,
-        peopleImg: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-        name: "程佳欢",
-        college: "文法学院",
-        imgsList: [{
-          url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-          title: "匹对照片"
-        }, {
-          url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-          title: "被匹对照片"
-        }, {
-          url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-          title: "场景照片"
-        }],
-        status: '打卡成功',
-        rule: "课间操打卡规则已打卡",
-        time: "2022-02-04   15:15:15",
-        place: "江西省南昌市南昌交通学院操场"
-      }, {
-        id: 2,
-        peopleImg: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-        name: "陈志斌",
-        college: "南昌交通学院",
-        imgsList: [{
-          url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-          title: "匹对照片"
-        }, {
-          url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-          title: "被匹对照片"
-        }, {
-          url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-          title: "场景照片"
-        }],
-        status: '打卡成功',
-        rule: "课间操打卡规则已打卡",
-        time: "2022-11-04   15:15:15",
-        place: "江西省南昌市经开区"
-      }],
-      list3: [{
-        id: 1,
-        peopleImg: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-        name: "甘昱新",
-        college: "文法学院",
-        status: '未打卡',
-        rule: "课间操打卡规则"
-      }, {
-        id: 2,
-        peopleImg: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F13579194276%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1671596163&t=52c9def84f0fa7832bfc5824364917e0",
-        name: "甘昱新",
-        college: "文法学院",
-        status: '未打卡',
-        rule: "课间操打卡规则"
-      }]
+      // 底线区域显示隐藏控制标识
+      flag: false
     };
   },
-  onLoad: function onLoad(options) {
-    this.month = options.month - 0 || 1;
+  onLoad: function onLoad() {
     this.getTime();
-    this.list = this.list2;
+    this.getListData();
+  },
+  // 页面滑动到底部触发的回调
+  onReachBottom: function onReachBottom() {
+    if (this.list.length < this.total) {
+      this.page++;
+      this.getListData();
+    } else {
+      this.flag = true;
+    }
   },
   computed: {
-    comMonth: function comMonth() {
+    format_month: function format_month() {
       if (this.month) {
         var month = this.month < 10 ? '0' + this.month : this.month;
-        console.log(month);
         return month;
       }
     }
@@ -369,16 +385,65 @@ var _default = {
     getTime: function getTime() {
       var date = new Date();
       var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      this.month = month;
       this.year = year;
     },
+    // 获取打卡记录列表数组
+    getListData: function getListData() {
+      var _this = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var res;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _this.flag = false;
+                _this.time = _this.year + "-" + _this.format_month + "-01 00:00:00";
+                _context.next = 4;
+                return _this.$myRequest({
+                  url: "/attendance/api/sign/check/in/list/month",
+                  data: {
+                    page: _this.page,
+                    size: _this.size,
+                    status: _this.status,
+                    time: _this.time
+                  }
+                });
+              case 4:
+                res = _context.sent;
+                // console.log(res);
+                if (res.code == 200) {
+                  _this.total = res.data.total;
+                  _this.list = res.data.list;
+                  if (_this.status == 4) {
+                    _this.items[0] = "\u6253\u5361\u6210\u529F\uFF08".concat(_this.total, "\u6B21\uFF09");
+                    _this.items[1] = "\u6253\u5361\u5931\u8D25";
+                  } else {
+                    _this.items[0] = "\u6253\u5361\u6210\u529F";
+                    _this.items[1] = "\u6253\u5361\u5931\u8D25\uFF08".concat(_this.total, "\u6B21\uFF09");
+                  }
+                }
+              case 6:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))();
+    },
+    // 点击分段器回调
     onClickItem: function onClickItem(e) {
-      console.log(e.currentIndex);
+      // console.log(e.currentIndex);
       if (e.currentIndex == 0) {
-        this.list = this.list2;
+        this.status = 4;
       } else {
-        this.list = this.list3;
+        this.status = 3;
       }
+      this.page = 1;
+      this.getListData();
     },
+    // 往后选择年份回调
     handleDoubleLeft: function handleDoubleLeft() {
       if (this.year <= 2000) {
         uni.showToast({
@@ -387,8 +452,24 @@ var _default = {
         });
       } else {
         this.year -= 1;
+        this.page = 1;
+        this.getListData();
       }
     },
+    // 往前选择年份回调
+    handleDoubleRight: function handleDoubleRight() {
+      if (this.year >= 2025) {
+        uni.showToast({
+          title: "不能选择2025年之后",
+          icon: 'none'
+        });
+      } else {
+        this.year += 1;
+        this.page = 1;
+        this.getListData();
+      }
+    },
+    // 往后选择月份回调
     handleLeft: function handleLeft() {
       if (this.month <= 1) {
         if (this.year <= 2000) {
@@ -399,11 +480,16 @@ var _default = {
         } else {
           this.year -= 1;
           this.month = 12;
+          this.page = 1;
+          this.getListData();
         }
       } else {
         this.month -= 1;
+        this.page = 1;
+        this.getListData();
       }
     },
+    // 往前选择月份回调
     handleRight: function handleRight() {
       if (this.month >= 12) {
         if (this.year >= 2025) {
@@ -414,20 +500,30 @@ var _default = {
         } else {
           this.year += 1;
           this.month = 1;
+          this.page = 1;
+          this.getListData();
         }
       } else {
         this.month += 1;
+        this.page = 1;
+        this.getListData();
       }
     },
-    handleDoubleRight: function handleDoubleRight() {
-      if (this.year >= 2025) {
-        uni.showToast({
-          title: "不能选择2025年之后",
-          icon: 'none'
-        });
-      } else {
-        this.year += 1;
-      }
+    // 格式化时间
+    format_time: function format_time(timestamp) {
+      //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+      var date = new Date(timestamp);
+      var y = date.getFullYear();
+      var m = date.getMonth() + 1;
+      var d = date.getDate();
+      m = m < 10 ? "0" + m : m;
+      d = d < 10 ? "0" + d : d;
+      var h = date.getHours() < 10 ? '0' + date.getHours() : date.getHours();
+      var mm = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();
+      var s = date.getSeconds();
+      s = s < 10 ? "0" + s : s;
+      var strDate = y + "-" + m + "-" + d + " " + h + ":" + mm + ":" + s;
+      return strDate;
     }
   }
 };

unpackage/dist/dev/mp-weixin/pages/statDetail/statDetail.wxss

@@ -126,4 +126,22 @@
 .container .list .box .msg .msg_item .key.data-v-6f03e226 {
   color: #808080;
 }
+.container .no_data.data-v-6f03e226 {
+  margin: 0 auto;
+  margin-top: 230rpx;
+  width: 480rpx;
+  height: 508rpx;
+  text-align: center;
+}
+.container .no_data ._img.data-v-6f03e226 {
+  width: 100%;
+  height: 100%;
+}
+.container .no_data .info.data-v-6f03e226 {
+  color: #5792F0;
+}
+.container .foot.data-v-6f03e226 {
+  padding-bottom: 20rpx;
+  text-align: center;
+}
 

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -2,7 +2,8 @@
     "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
     "projectname": "mp-weixin",
     "setting": {
-        "compileHotReLoad": true
+        "compileHotReLoad": true,
+        "urlCheck": false
     },
     "condition": {
         "miniprogram": {
@@ -48,6 +49,13 @@
                     "query": "",
                     "launchMode": "default",
                     "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/my/my",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
                 }
             ]
         }