no message

main.js

@@ -1,9 +1,17 @@
 // #ifndef VUE3
 import Vue from 'vue'
 import App from './App'
+
+import {
+	myRequest
+} from "./util/api"
+
 import dropDown from '@/uni_modules/zwx-dropDown/components/zwx-dropDown/zwx-dropDown'
+
 Vue.component("dropDown", dropDown)
 
+Vue.prototype.$myRequest = myRequest
+
 Vue.config.productionTip = false
 
 App.mpType = 'app'

manifest.json

@@ -1,68 +1,69 @@
 {
-    "name" : "clock-in",
-    "appid" : "__UNI__28774C0",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    "app-plus" : {
-        /* 5+App特有相关 */
-        "usingComponents" : true,
-        "nvueCompiler" : "uni-app",
-        "nvueStyleCompiler" : "uni-app",
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        "modules" : {},
-        /* 模块配置 */
-        "distribute" : {
-            /* 应用发布信息 */
-            "android" : {
-                /* android打包配置 */
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            "ios" : {},
-            /* ios打包配置 */
-            "sdkConfigs" : {}
-        }
-    },
-    /* SDK配置 */
-    "quickapp" : {},
-    /* 快应用特有相关 */
-    "mp-weixin" : {
-        /* 小程序特有相关 */
-        "appid" : "wxbf52cb973062d110",
-        "setting" : {
-            "urlCheck" : false,
-            "postcss" : false,
-            "minified" : false
-        },
-        "usingComponents" : true,
-        "permission" : {}
-    },
-    "vueVersion" : "2",
-    "h5" : {
-        "sdkConfigs" : {
-            "maps" : {}
-        }
-    }
+	"name": "clock-in",
+	"appid": "__UNI__28774C0",
+	"description": "",
+	"versionName": "1.0.0",
+	"versionCode": "100",
+	"transformPx": false,
+	"app-plus": {
+		/* 5+App特有相关 */
+		"usingComponents": true,
+		"nvueCompiler": "uni-app",
+		"nvueStyleCompiler": "uni-app",
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		"modules": {},
+		/* 模块配置 */
+		"distribute": {
+			/* 应用发布信息 */
+			"android": {
+				/* android打包配置 */
+				"permissions": [
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				]
+			},
+			"ios": {},
+			/* ios打包配置 */
+			"sdkConfigs": {}
+		}
+	},
+	/* SDK配置 */
+	"quickapp": {},
+	/* 快应用特有相关 */
+	"mp-weixin": {
+		/* 小程序特有相关 */
+		"appid": "wxbf52cb973062d110",
+		"lazyCodeLoading": "requiredComponents",
+		"setting": {
+			"urlCheck": false,
+			"postcss": false,
+			"minified": false
+		},
+		"usingComponents": true,
+		"permission": {}
+	},
+	"vueVersion": "2",
+	"h5": {
+		"sdkConfigs": {
+			"maps": {}
+		}
+	}
 }

pages.json

@@ -1,8 +1,29 @@
 {
 	"pages": [{
-			"path": "pages/setPunchTime/setPunchTime",
+			"path": "pages/stat/stat",
 			"style": {
-				"navigationBarTitleText": "添加打卡时间",
+				"navigationBarTitleText": "统计",
+				// "navigationStyle": "custom",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/home/home",
+			"style": {
+				"navigationBarTitleText": "智慧校园打卡",
+				// "navigationStyle": "custom",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/my/my",
+			"style": {
+				"navigationBarTitleText": "系统设置",
+				// "navigationStyle": "custom",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/ruleSet/ruleSet",
+			"style": {
+				"navigationBarTitleText": "规则设置",
 				// "navigationStyle": "custom",
 				"enablePullDownRefresh": false
 			}
@@ -14,6 +35,13 @@
 				"enablePullDownRefresh": false
 			}
 		}, {
+			"path": "pages/setPunchTime/setPunchTime",
+			"style": {
+				"navigationBarTitleText": "添加打卡时间",
+				// "navigationStyle": "custom",
+				"enablePullDownRefresh": false
+			}
+		}, {
 			"path": "pages/rulesDetail/rulesDetail",
 			"style": {
 				"navigationBarTitleText": "规则明细",
@@ -29,13 +57,6 @@
 			}
 		},
 		{
-			"path": "pages/home/home",
-			"style": {
-				"navigationBarTitleText": "智慧校园打卡",
-				// "navigationStyle": "custom",
-				"enablePullDownRefresh": false
-			}
-		}, {
 			"path": "pages/punchLocation/punchLocation",
 			"style": {
 				"navigationBarTitleText": "打卡位置",
@@ -65,14 +86,7 @@
 				"enablePullDownRefresh": false
 			}
 		},
-		{
-			"path": "pages/stat/stat",
-			"style": {
-				"navigationBarTitleText": "统计",
-				// "navigationStyle": "custom",
-				"enablePullDownRefresh": false
-			}
-		},
+
 		{
 			"path": "pages/authentication/authentication",
 			"style": {
@@ -86,20 +100,6 @@
 				"navigationBarTitleText": "授权中"
 			}
 		}, {
-			"path": "pages/my/my",
-			"style": {
-				"navigationBarTitleText": "系统设置",
-				// "navigationStyle": "custom",
-				"enablePullDownRefresh": false
-			}
-		}, {
-			"path": "pages/ruleSet/ruleSet",
-			"style": {
-				"navigationBarTitleText": "规则设置",
-				// "navigationStyle": "custom",
-				"enablePullDownRefresh": false
-			}
-		}, {
 			"path": "pages/powerSet/powerSet",
 			"style": {
 				"navigationBarTitleText": "权限设置",

pages/addLocation/addLocation.vue

@@ -76,16 +76,19 @@
 						title: "江西财经大学",
 						place: "江西省南昌市经开区广兰大道899号"
 					}
-				]
+				],
+				rangeList:['300米', '400米', '500米'],
 			}
 		},
 		methods: {
 			// 点击选择打卡范围回调
 			changeRange() {
 				uni.showActionSheet({
-					itemList: ['300米', '400米', '500米'],
+					itemList: this.rangeList,
 					success: (res) => {
+						console.log(res);
 						console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
+						console.log(this.rangeList[res.tapIndex]);
 					},
 					fail: (res) => {
 						console.log(res.errMsg);

pages/addRules/addRules.vue

@@ -22,16 +22,19 @@
 			<view class="name">
 				考 勤 组：
 			</view>
-			<picker class="val" :value="index_group" :range="array_group" @change="changeSelect_group">
-				<view class="ele" v-if="group=='未设置'">
-					{{group}}
-				</view>
-				<view class="ele black" v-else>
-					{{group}}
-				</view>
-				<view class="right">
-					<img src="../../static/right.png">
+			<picker :value="index_group" :range="array_group" @change="changeSelect_group">
+				<view class="val">
+					<view class="ele" v-if="group=='未设置'">
+						{{group}}
+					</view>
+					<view class="ele black" v-else>
+						{{group}}
+					</view>
+					<view class="right">
+						<img src="../../static/right.png">
+					</view>
 				</view>
+
 			</picker>
 		</view>
 
@@ -39,7 +42,7 @@
 			<view class="name">
 				打卡时间：
 			</view>
-			<view class="val">
+			<view class="val" @click="goPagePunchTime">
 				<view class="ele" v-if="time=='未设置'">
 					{{time}}
 				</view>
@@ -56,7 +59,7 @@
 			<view class="name">
 				打卡地点：
 			</view>
-			<view class="val">
+			<view class="val" @click="goPagePunchLocation">
 				<view class="ele" v-if="place=='未设置'">
 					{{place}}
 				</view>
@@ -73,18 +76,19 @@
 			<view class="name">
 				提前通知：
 			</view>
-			<picker class="val" :value="index" :range="array" @change="changeSelect">
-				<view class="ele" v-if="value=='未设置'">
-					{{value}}
-				</view>
-				<view class="ele black" v-else>
-					{{value}}
-				</view>
-				<view class="right">
-					<img src="../../static/right.png">
+			<picker :value="index" :range="array" @change="changeSelect">
+				<view class="val">
+					<view class="ele" v-if="value=='未设置'">
+						{{value}}
+					</view>
+					<view class="ele black" v-else>
+						{{value}}
+					</view>
+					<view class="right">
+						<img src="../../static/right.png">
+					</view>
 				</view>
 			</picker>
-
 		</view>
 
 
@@ -113,7 +117,7 @@
 				array: ['5分钟', '10分钟', '15分钟', '20分钟'],
 				array_group: ['分组一分组一分组一分组一分组一分组一', '分组二', '分组三', '分组四'],
 				index: 0,
-				index_group:0
+				index_group: 0
 			};
 		},
 		onLoad() {
@@ -128,46 +132,46 @@
 		methods: {
 			// 点击确认按钮回调
 			handleConfirm() {
-				if(this.ruleName=='未设置'){
+				if (this.ruleName == '未设置') {
 					uni.showToast({
-						title:"请设置规则名称",
-						icon:'none'
+						title: "请设置规则名称",
+						icon: 'none'
 					})
 					return
 				}
-				
-				if(this.group=='未设置'){
+
+				if (this.group == '未设置') {
 					uni.showToast({
-						title:"请设置考勤组",
-						icon:'none'
+						title: "请设置考勤组",
+						icon: 'none'
 					})
 					return
 				}
-				
-				if(this.time=='未设置'){
+
+				if (this.time == '未设置') {
 					uni.showToast({
-						title:"请设置打卡时间",
-						icon:'none'
+						title: "请设置打卡时间",
+						icon: 'none'
 					})
 					return
 				}
-				
-				if(this.place=='未设置'){
+
+				if (this.place == '未设置') {
 					uni.showToast({
-						title:"请设置打卡地点",
-						icon:'none'
+						title: "请设置打卡地点",
+						icon: 'none'
 					})
 					return
 				}
-				
-				if(this.value=='未设置'){
+
+				if (this.value == '未设置') {
 					uni.showToast({
-						title:"请设置提前通知时间",
-						icon:'none'
+						title: "请设置提前通知时间",
+						icon: 'none'
 					})
 					return
 				}
-				
+
 				uni.showModal({
 					title: '提示',
 					content: '确定新增吗？',
@@ -186,7 +190,7 @@
 				this.value = this.array[index]
 			},
 			// 考勤组选择框点击回调
-			changeSelect_group(e){
+			changeSelect_group(e) {
 				let index = e.detail.value
 				this.group = this.array_group[index]
 			},
@@ -195,6 +199,18 @@
 				uni.navigateTo({
 					url: "/pages/ruleName/ruleName"
 				})
+			},
+			// 点击打卡时间跳转回调
+			goPagePunchTime() {
+				uni.navigateTo({
+					url: "/pages/punchTime/punchTime"
+				})
+			},
+			// 点击打卡地点跳转回调
+			goPagePunchLocation() {
+				uni.navigateTo({
+					url: "/pages/punchLocation/punchLocation"
+				})
 			}
 		}
 	}

pages/cardRecord/cardRecord.vue

@@ -1,6 +1,107 @@
 <template>
 	<view class="container">
-		打卡记录
+		<!-- 头部区域 -->
+		<view class="header">
+			<!-- 时间区域 -->
+			<view class="calendar">
+				<!-- 双左箭头区域 -->
+				<view class="double" @click="handleDoubleLeft">
+					<img src="../../static/double_left.png">
+				</view>
+				<!-- 左箭头区域区域 -->
+				<view class="single" @click="handleLeft">
+					<img src="../../static/left.png">
+				</view>
+				<!-- 时间区域 -->
+				<view class="time">
+					{{year}}-{{comMonth}}
+				</view>
+				<!-- 双右箭头区域 -->
+				<view class="single2" @click="handleRight">
+					<img src="../../static/right2.png">
+				</view>
+				<!-- 右箭头区域 -->
+				<view class="double" @click="handleDoubleRight">
+					<img src="../../static/double_right.png">
+				</view>
+
+			</view>
+
+			<!-- 打卡状态切换区域 -->
+			<view class="state">
+				<uni-segmented-control :current="current" :values="items" styleType="text" @clickItem="onClickItem"
+					activeColor="#0082FC"></uni-segmented-control>
+			</view>
+		</view>
+
+		<!-- 打卡记录区域 -->
+		<view class="list">
+			<!-- 每一条记录区域 -->
+			<view class="box" v-for="item in list" :key="item.id">
+				<!-- 人物信息区域 -->
+				<view class="person">
+					<view class="img">
+						<img :src="item.peopleImg">
+					</view>
+					<view class="info">
+						<view class="name">
+							{{item.name}}
+						</view>
+						<view class="college">
+							{{item.college}}
+						</view>
+					</view>
+				</view>
+				<!-- 图片区域 -->
+				<view class="imgs" v-if="item.imgsList">
+					<view class="imgs_item" v-for="(img,index) in (item.imgsList)" :key="index">
+						<view class="image">
+							<img :src="img.url">
+						</view>
+						<view class="title">
+							{{img.title}}
+						</view>
+					</view>
+
+				</view>
+				<!-- 打卡信息区域 -->
+				<view class="msg">
+					<view class="msg_item">
+						<view class="key">
+							打卡状态：
+						</view>
+						<view class="value">
+							{{item.status}}
+						</view>
+					</view>
+					<view class="msg_item">
+						<view class="key">
+							打卡规则：
+						</view>
+						<view class="value">
+							{{item.rule}}
+						</view>
+					</view>
+					<view class="msg_item" v-if="item.time">
+						<view class="key">
+							打卡时间：
+						</view>
+						<view class="value">
+							{{item.time}}
+						</view>
+					</view>
+					<view class="msg_item" v-if="item.place">
+						<view class="key">
+							打卡地址：
+						</view>
+						<view class="value">
+							{{item.place}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
 	</view>
 </template>
 
@@ -8,14 +109,316 @@
 	export default {
 		data() {
 			return {
-				
+				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: "课间操打卡规则",
+					},
+				]
 			};
+		},
+		onLoad(options) {
+			this.month = options.month - 0 || 1
+			this.getTime()
+			this.list = this.list2
+		},
+		computed: {
+			comMonth() {
+				if (this.month) {
+					let month = this.month < 10 ? '0' + this.month : this.month
+					console.log(month);
+					return month
+				}
+			}
+		},
+		methods: {
+			// 获取当前年份
+			getTime() {
+				let date = new Date()
+				let year = date.getFullYear()
+				this.year = year
+			},
+
+			onClickItem(e) {
+				console.log(e.currentIndex);
+				// if (e.currentIndex == 0) {
+				// 	this.list = this.list2
+				// } else {
+				// 	this.list = this.list3
+				// }
+			},
+
+			handleDoubleLeft() {
+				if (this.year <= 2000) {
+					uni.showToast({
+						title: "不能选择2000年之前",
+						icon: 'none'
+					})
+				} else {
+					this.year -= 1
+				}
+			},
+			handleLeft() {
+				if (this.month <= 1) {
+					if (this.year <= 2000) {
+						uni.showToast({
+							title: "不能选择2000年之前",
+							icon: 'none'
+						})
+					} else {
+						this.year -= 1
+						this.month = 12
+					}
+				} else {
+					this.month -= 1
+				}
+			},
+
+			handleRight() {
+				if (this.month >= 12) {
+					if (this.year >= 2025) {
+						uni.showToast({
+							title: "不能选择2025年之后",
+							icon: 'none'
+						})
+					} else {
+						this.year += 1
+						this.month = 1
+					}
+				} else {
+					this.month += 1
+				}
+			},
+			handleDoubleRight() {
+				if (this.year >= 2025) {
+					uni.showToast({
+						title: "不能选择2025年之后",
+						icon: 'none'
+					})
+				} else {
+					this.year += 1
+				}
+			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-.container{
-	
-}
+	.container {
+		padding-top: 20rpx;
+
+		.header {
+			display: flex;
+			flex-direction: column;
+			justify-content: space-evenly;
+			margin: 0 auto;
+			width: 690rpx;
+			height: 192rpx;
+			background-color: #fff;
+
+			.calendar {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				flex: 1;
+
+				.double {
+					width: 40rpx;
+					height: 40rpx;
+
+					img {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.single {
+					margin-left: 30rpx;
+					width: 40rpx;
+					height: 40rpx;
+
+					img {
+						width: 80%;
+						height: 70%;
+					}
+				}
+
+				.single2 {
+					margin-right: 30rpx;
+					width: 40rpx;
+					height: 40rpx;
+
+					img {
+						width: 100%;
+						height: 70%;
+					}
+				}
+
+				.time {
+					width: 180rpx;
+					height: 44rpx;
+					font-size: 32rpx;
+					text-align: center;
+				}
+			}
+
+			.state {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				flex: 1;
+			}
+		}
+
+		.list {
+			padding-bottom: 50rpx;
+
+			.box {
+				margin: 0 auto;
+				margin-top: 20rpx;
+				width: 690rpx;
+				background-color: #fff;
+
+				.person {
+					display: flex;
+					align-items: center;
+					height: 134rpx;
+
+					.img {
+						margin: 0 20rpx 0 30rpx;
+						width: 70rpx;
+						height: 70rpx;
+
+						img {
+							width: 100%;
+							height: 100%;
+						}
+					}
+
+					.info {
+						width: 620rpx;
+						height: 70rpx;
+
+						.name {
+							font-size: 32rpx;
+						}
+
+						.college {
+							font-size: 24rpx;
+							color: #A6A6A6;
+						}
+					}
+				}
+
+				.imgs {
+					display: flex;
+					justify-content: space-evenly;
+					height: 201rpx;
+
+					.imgs_item {
+						display: flex;
+						flex-direction: column;
+						align-items: center;
+						flex: 1;
+
+						.image {
+							width: 120rpx;
+							height: 120rpx;
+
+							img {
+								width: 100%;
+								height: 100%;
+							}
+						}
+
+						.title {
+							margin-top: 10rpx;
+							font-size: 28rpx;
+						}
+					}
+				}
+
+				.msg {
+					margin-left: 30rpx;
+
+					.msg_item {
+						display: flex;
+						align-items: center;
+						height: 63rpx;
+						font-size: 28rpx;
+
+						.key {
+							color: #808080;
+						}
+
+						.value {}
+					}
+				}
+			}
+		}
+	}
 </style>

pages/editRules/editRules.vue

@@ -22,15 +22,17 @@
 			<view class="name">
 				考 勤 组：
 			</view>
-			<picker class="val" :value="index_group" :range="array_group" @change="changeSelect_group">
-				<view class="ele" v-if="group=='未设置'">
-					{{group}}
-				</view>
-				<view class="ele black" v-else>
-					{{group}}
-				</view>
-				<view class="right">
-					<img src="../../static/right.png">
+			<picker :value="index_group" :range="array_group" @change="changeSelect_group">
+				<view class="val">
+					<view class="ele" v-if="group=='未设置'">
+						{{group}}
+					</view>
+					<view class="ele black" v-else>
+						{{group}}
+					</view>
+					<view class="right">
+						<img src="../../static/right.png">
+					</view>
 				</view>
 			</picker>
 		</view>
@@ -39,7 +41,7 @@
 			<view class="name">
 				打卡时间：
 			</view>
-			<view class="val">
+			<view class="val"  @click="goPagePunchTime">
 				<view class="ele" v-if="time=='未设置'">
 					{{time}}
 				</view>
@@ -56,7 +58,7 @@
 			<view class="name">
 				打卡地点：
 			</view>
-			<view class="val">
+			<view class="val" @click="goPagePunchLocation">
 				<view class="ele" v-if="place=='未设置'">
 					{{place}}
 				</view>
@@ -73,15 +75,17 @@
 			<view class="name">
 				提前通知：
 			</view>
-			<picker class="val" :value="index" :range="array" @change="changeSelect">
-				<view class="ele" v-if="value=='未设置'">
-					{{value}}
-				</view>
-				<view class="ele black" v-else>
-					{{value}}
-				</view>
-				<view class="right">
-					<img src="../../static/right.png">
+			<picker :value="index" :range="array" @change="changeSelect">
+				<view class="val">
+					<view class="ele" v-if="value=='未设置'">
+						{{value}}
+					</view>
+					<view class="ele black" v-else>
+						{{value}}
+					</view>
+					<view class="right">
+						<img src="../../static/right.png">
+					</view>
 				</view>
 			</picker>
 
@@ -186,6 +190,18 @@
 				uni.navigateTo({
 					url: "/pages/ruleName/ruleName"
 				})
+			},
+			// 点击打卡时间跳转回调
+			goPagePunchTime() {
+				uni.navigateTo({
+					url: "/pages/punchTime/punchTime"
+				})
+			},
+			// 点击打卡地点跳转回调
+			goPagePunchLocation() {
+				uni.navigateTo({
+					url: "/pages/punchLocation/punchLocation"
+				})
 			}
 		}
 	}

pages/home/home.vue

@@ -104,7 +104,19 @@
 				timeFlags: false
 			};
 		},
+		onLoad() {
+			// this.getRulesList()
+		},
 		methods: {
+			// 获取打卡规则列表
+			async getRulesList() {
+				console.log(1);
+				let res = await this.$myRequest({
+					url: "/attendance/api/settings/rule/list",
+				})
+				console.log(res);
+				console.log(2);
+			},
 			// 点击打卡按钮回调
 			handlePunch() {
 				// 获取用户摄像头权限
@@ -131,7 +143,6 @@
 						});
 					}
 				})
-
 			}
 		}
 	}

pages/powerSet/powerSet.vue

@@ -1,6 +1,31 @@
 <template>
-	<view>
-		权限设置
+	<view class="container">
+		<!-- 头部分段选择器区域 -->
+		<view class="control">
+			<uni-segmented-control :current="current" :values="items" styleType="text" @clickItem="onClickItem"
+				activeColor="#0082FC"></uni-segmented-control>
+		</view>
+
+		<!-- 选中人物区域 -->
+		<view class="choose">
+
+			<view class="box" v-for="item in chooseList" :key="item.id">
+				<view class="name">
+					{{item.name}}
+				</view>
+				<view class="icon" @click="handleDelete(item.id)">
+					<img src="../../static/close.png">
+				</view>
+			</view>
+		</view>
+
+		<!-- 人员展示区域 -->
+		<view class="list">
+			<!-- 每一个人员区域 -->
+			<view class="item" v-for="item in list" :key="item.id">
+				{{item.name}} - {{item.type}} - {{item.number}}
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -8,12 +33,139 @@
 	export default {
 		data() {
 			return {
-
+				items: ['管理员', '子管理员'],
+				current: 0,
+				list: [{
+						id: 1,
+						name: "张三",
+						number: 360730199525462589,
+						type: "学生"
+					},
+					{
+						id: 2,
+						name: "李四",
+						number: 360730199525462589,
+						type: "老师"
+					},
+					{
+						id: 3,
+						name: "王五",
+						number: 360730199525462589,
+						type: "教职工"
+					},
+				],
+				chooseList: [{
+						id: 1,
+						name: "张三",
+					},
+					{
+						id: 2,
+						name: "李四",
+					},
+					{
+						id: 3,
+						name: "王五",
+					},
+					{
+						id: 4,
+						name: "李四",
+					},
+					{
+						id: 5,
+						name: "王五",
+					},
+					{
+						id: 6,
+						name: "李四",
+					},
+					{
+						id: 7,
+						name: "王五",
+					},
+				]
 			};
+		},
+		methods: {
+			onClickItem(e) {
+				console.log(e.currentIndex);
+				// if (e.currentIndex == 0) {
+				// 	this.list = this.list2
+				// } else {
+				// 	this.list = this.list3
+				// }
+			},
+			handleDelete(id){
+				console.log(id);
+			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.container {
+		padding-top: 20rpx;
+
+		.control {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			width: 750rpx;
+			height: 86rpx;
+			background-color: #fff;
+		}
+
+		.choose {
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-evenly;
+			align-items: center;
+			margin-top: 20rpx;
+			padding: 30rpx;
+			width: 690rpx;
+			border-bottom: 1rpx solid #E5E5E5;
+			background-color: #fff;
+
+			.box {
+				display: flex;
+				align-items: center;
+				width: 150rpx;
+				height: 60rpx;
 
+				.name {
+					flex: 2;
+					text-align: center;
+					font-size: 28rpx;
+				}
+
+				.icon {
+					flex: 1;
+					display: flex;
+					align-items: center;
+					height: 50rpx;
+
+					img {
+						width: 30rpx;
+						height: 30rpx;
+					}
+				}
+			}
+		}
+
+		.list {
+			display: flex;
+			flex-direction: column;
+			justify-content: space-evenly;
+			padding-top: 22rpx;
+			width: 750rpx;
+			border-bottom: 1rpx solid #E5E5E5;
+			background-color: #fff;
+
+			.item {
+				margin-bottom: 22rpx;
+				margin-left: 65rpx;
+				height: 41rpx;
+				font-size: 28rpx;
+			}
+		}
+	}
 </style>

pages/punchLocation/punchLocation.vue

@@ -77,6 +77,9 @@
 		methods: {
 			handleAdd() {
 				console.log("添加打卡位置");
+				uni.navigateTo({
+					url:"/pages/addLocation/addLocation"
+				})
 			},
 			// 点击右侧删除按钮回调
 			onClick(id) {

pages/punchTime/punchTime.vue

@@ -17,7 +17,7 @@
 				<!-- 每一个时间段区域 -->
 				<uni-swipe-action-item :auto-close="true" :right-options="options" @click="onClick(item.id)"
 					v-for="item in list" :key="item.id">
-					<view class="box">
+					<view class="box" @click="handleEdit(item)">
 						<view class="left">
 							<view class="week">
 								<view class="key">
@@ -80,10 +80,17 @@
 			}
 		},
 		methods: {
+			// 点击添加打卡时间回调 跳转到添加页面
 			handleAdd() {
-				console.log("添加打卡时间");
 				uni.navigateTo({
-					url:"/pages/setPunchTime/setPunchTime"
+					url: `/pages/setPunchTime/setPunchTime?flag=1`
+				})
+			},
+			// 点击每一个时间段回调 跳转到编辑页面
+			handleEdit(item) {
+				let info = JSON.stringify(item)
+				uni.navigateTo({
+					url: `/pages/setPunchTime/setPunchTime?flag=2&info=${info}`
 				})
 			},
 			// 点击右侧删除按钮回调
@@ -105,6 +112,7 @@
 					}
 				});
 			},
+
 		}
 	}
 </script>

pages/setPunchTime/setPunchTime.vue

@@ -20,38 +20,45 @@
 
 		<view class="list">
 
-			<!-- 每一个时间段区域 -->
-			<view class="item" v-for="(item,index) in list" :key="index">
-				<view class="item_box">
-					<picker mode="time" :value="item.startTime" @change="bindTimeChange($event,1,item)">
-						<view class="uni-input">
-							<view class="input_time">
-								{{item.startTime}}
-							</view>
-							<view class="input_icon">
-								<img src="../../static/time.png">
-							</view>
+			<uni-swipe-action>
+				<!-- 每一个时间段区域 -->
+				<uni-swipe-action-item :auto-close="true" :right-options="options" @click="onClick(item.id)"
+					v-for="(item,index) in list" :key="index">
+
+					<view class="item">
+						<view class="item_box">
+							<picker mode="time" :value="item.startTime" @change="bindTimeChange($event,1,item)">
+								<view class="uni-input">
+									<view class="input_time">
+										{{item.startTime}}
+									</view>
+									<view class="input_icon">
+										<img src="../../static/time.png">
+									</view>
+								</view>
+							</picker>
 						</view>
-					</picker>
-				</view>
-				--
-				<view class="item_box">
-					<picker mode="time" :value="item.endTime" @change="bindTimeChange($event,2,item)">
-						<view class="uni-input">
-							<view class="input_time">
-								{{item.endTime}}
-							</view>
-							<view class="input_icon">
-								<img src="../../static/time.png">
-							</view>
+						--
+						<view class="item_box">
+							<picker mode="time" :value="item.endTime" @change="bindTimeChange($event,2,item)">
+								<view class="uni-input">
+									<view class="input_time">
+										{{item.endTime}}
+									</view>
+									<view class="input_icon">
+										<img src="../../static/time.png">
+									</view>
+								</view>
+							</picker>
 						</view>
-					</picker>
-				</view>
-			</view>
+					</view>
+
+				</uni-swipe-action-item>
+			</uni-swipe-action>
 
-			<view class="edit">
+			<!-- <view class="edit">
 				编辑
-			</view>
+			</view> -->
 
 		</view>
 
@@ -65,6 +72,10 @@
 			</view>
 		</view>
 
+		<view class="button">
+			保存
+		</view>
+
 	</view>
 </template>
 
@@ -77,17 +88,38 @@
 		data() {
 			return {
 				selectedWeeks: [],
-				startTime: "09:00",
-				endTime: "12:00",
 				list: [{
-						startTime: "09:00",
-						endTime: "12:00",
+						startTime: "00:00",
+						endTime: "00:00",
 					},
 					{
 						startTime: "00:00",
 						endTime: "00:00",
 					},
-				]
+				],
+				info: {},
+				options: [{
+					text: '删除',
+					style: {
+						backgroundColor: '#D43030'
+					}
+				}],
+			}
+		},
+		onLoad(options) {
+			if (options.flag == 1) {
+				uni.setNavigationBarTitle({
+					title: '添加打卡时间'
+				});
+			} else {
+				uni.setNavigationBarTitle({
+					title: '编辑打卡时间'
+				});
+				this.selectedWeeks = [0, 1]
+				// this.info=JSON.parse(options.info)
+				// console.log(this.info);
+				// let temList=this.info.time.split("、")
+				// console.log(temList);
 			}
 		},
 		methods: {
@@ -95,7 +127,7 @@
 				console.log(value);
 				this.selectedWeeks = value
 			},
-			bindTimeChange(e, val,item) {
+			bindTimeChange(e, val, item) {
 				console.log(e);
 				console.log(val);
 				console.log(item);
@@ -114,6 +146,25 @@
 			switchChange(e) {
 				console.log('switch1 发生 change 事件，携带值为', e.detail.value)
 			},
+			// 点击右侧删除按钮回调
+			onClick(id) {
+				console.log(id);
+				uni.showModal({
+					title: '提示',
+					content: '确定删除该打卡时间段吗？',
+					success: function(res) {
+						if (res.confirm) {
+							console.log('用户点击确定');
+							uni.showToast({
+								title: "删除成功",
+								icon: 'success'
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
 		}
 	}
 </script>
@@ -163,6 +214,7 @@
 			margin: 0 auto;
 			margin-top: 13rpx;
 			padding-top: 20rpx;
+			padding-bottom: 20rpx;
 			width: 690rpx;
 			border-radius: 10rpx;
 			background-color: #fff;
@@ -208,15 +260,15 @@
 				}
 			}
 
-			.edit {
-				margin-left: 20rpx;
-				padding-top: 10rpx;
-				width: 70rpx;
-				height: 60rpx;
-				color: #3396FB;
-				font-size: 24rpx;
-				font-weight: 500;
-			}
+			// .edit {
+			// 	margin-left: 20rpx;
+			// 	padding-top: 10rpx;
+			// 	width: 70rpx;
+			// 	height: 60rpx;
+			// 	color: #3396FB;
+			// 	font-size: 24rpx;
+			// 	font-weight: 500;
+			// }
 		}
 
 		.switch {
@@ -241,10 +293,28 @@
 				flex: 1;
 			}
 		}
+
+		.button {
+			margin: 0 auto;
+			margin-top: 50rpx;
+			width: 690rpx;
+			height: 80rpx;
+			line-height: 80rpx;
+			text-align: center;
+			color: #fff;
+			font-size: 32rpx;
+			border-radius: 16rpx;
+			background-color: #3396FB;
+		}
 	}
 
 	// 选择星期区域圆角效果
 	::v-deep .weeks-outer {
 		border-radius: 10rpx;
 	}
+	
+	// 解决左滑区域突出问题
+	::v-deep .uni-swipe_button-group {
+		margin-bottom: 20rpx;
+	}
 </style>

pages/stat/stat.vue

@@ -1,5 +1,11 @@
 <template>
 	<view class="container">
+
+		<!-- 顶部分段器区域 -->
+		<view class="control">
+			<uni-segmented-control :current="current" :values="items" styleType="text" @clickItem="onClickItem"
+				activeColor="#0082FC"></uni-segmented-control>
+		</view>
 		<!-- 头部月份区域 -->
 		<view class="header">
 			<view class="title">
@@ -55,10 +61,67 @@
 						<span>{{item.time}}</span>
 					</view>
 				</view>
+			</view>
+		</view>
+
+		<!-- 异常人员名单区域 -->
+		<view class="errPeople">
+			<!-- 标题区域 -->
+			<view class="e_header">
+				<view class="left">
+					异常人员名单
+				</view>
+				<view class="right">
+					<view class="icon">
+						<img src="../../static/notice.png">
+					</view>
+					<view class="info">
+						通知
+					</view>
+				</view>
+			</view>
+
+			<!-- 选择时间区域 -->
+			<view class="e_calendar">
+				<!-- 双左箭头区域 -->
+				<view class="double" @click="handleDoubleLeft">
+					<img src="../../static/double_left.png">
+				</view>
+				<!-- 左箭头区域区域 -->
+				<view class="single" @click="handleLeft">
+					<img src="../../static/left.png">
+				</view>
+				<!-- 时间区域 -->
+				<view class="time">
+					{{year}}-{{comMonth}}
+				</view>
+				<!-- 双右箭头区域 -->
+				<view class="single2" @click="handleRight">
+					<img src="../../static/right2.png">
+				</view>
+				<!-- 右箭头区域 -->
+				<view class="double" @click="handleDoubleRight">
+					<img src="../../static/double_right.png">
+				</view>
+			</view>
+
+			<view class="e_list">
+				<view class="e_box" v-for="item in errList" :key="item.id">
+					<view class="e_img">
+						<img :src="item.peopleImg">
+					</view>
+					<view class="e_name">
+						{{item.name}}
+					</view>
+					<view class="e_msg">
+						未打卡{{item.num}}次
+					</view>
+				</view>
 
 			</view>
 
 		</view>
+
 	</view>
 </template>
 
@@ -96,29 +159,128 @@
 						time: "19:25:25"
 					},
 				],
-				month: null
+				month: null,
+				items: ['团队统计', '我的统计'],
+				current: 0,
+				year: null,
+				month: null,
+				errList: [{
+						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: "程佳欢",
+						num: 20
+					},
+					{
+						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: "程欢",
+						num: 10
+					},
+					{
+						id: 3,
+						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
+					},
+					{
+						id: 4,
+						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
+					},
+				],
 			};
 		},
 		onLoad() {
-			this.getMonth()
+			this.getTime()
+		},
+		computed: {
+			comMonth() {
+				if (this.month) {
+					let month = this.month < 10 ? '0' + this.month : this.month
+					console.log(month);
+					return month
+				}
+			}
 		},
 		methods: {
-			// 获取当前时间月份
-			getMonth() {
+			// 获取当前年份
+			getTime() {
 				let date = new Date()
+				let year = date.getFullYear()
 				let month = date.getMonth() + 1
+				this.year = year
 				this.month = month
 			},
 			// 点击日历日期回调
 			change(e) {
 				console.log('change 返回:', e)
 			},
+			onClickItem(e) {
+				console.log(e.currentIndex);
+				// if (e.currentIndex == 0) {
+				// 	this.list = this.list2
+				// } else {
+				// 	this.list = this.list3
+				// }
+			},
 			// 跳转统计详情页面
 			goToDetail() {
 				uni.navigateTo({
 					url: `/pages/statDetail/statDetail?month=${this.month}`
 				})
-			}
+			},
+			handleDoubleLeft() {
+				if (this.year <= 2000) {
+					uni.showToast({
+						title: "不能选择2000年之前",
+						icon: 'none'
+					})
+				} else {
+					this.year -= 1
+				}
+			},
+			handleLeft() {
+				if (this.month <= 1) {
+					if (this.year <= 2000) {
+						uni.showToast({
+							title: "不能选择2000年之前",
+							icon: 'none'
+						})
+					} else {
+						this.year -= 1
+						this.month = 12
+					}
+				} else {
+					this.month -= 1
+				}
+			},
+
+			handleRight() {
+				if (this.month >= 12) {
+					if (this.year >= 2025) {
+						uni.showToast({
+							title: "不能选择2025年之后",
+							icon: 'none'
+						})
+					} else {
+						this.year += 1
+						this.month = 1
+					}
+				} else {
+					this.month += 1
+				}
+			},
+			handleDoubleRight() {
+				if (this.year >= 2025) {
+					uni.showToast({
+						title: "不能选择2025年之后",
+						icon: 'none'
+					})
+				} else {
+					this.year += 1
+				}
+			},
 		}
 	}
 </script>
@@ -127,6 +289,13 @@
 	.container {
 		padding-top: 20rpx;
 
+		.control {
+			margin-bottom: 20rpx;
+			width: 750rpx;
+			height: 90rpx;
+			background-color: #fff;
+		}
+
 		.header {
 			margin: 0 auto;
 			width: 690rpx;
@@ -225,7 +394,7 @@
 
 			.calendar_foot {
 				padding: 0 30rpx;
-				margin-bottom: 80rpx;
+				// margin-bottom: 80rpx;
 
 				.foot_item {
 					box-sizing: border-box;
@@ -260,6 +429,140 @@
 				}
 			}
 		}
+
+		.errPeople {
+			margin: 0 auto;
+			margin-top: 32rpx;
+			width: 690rpx;
+			border-radius: 7rpx;
+			background-color: #fff;
+
+			.e_header {
+				display: flex;
+				align-items: center;
+				width: 690rpx;
+				height: 121rpx;
+
+				.left {
+					flex: 1;
+					margin-left: 30rpx;
+					font-size: 32rpx;
+					font-weight: 500;
+				}
+
+				.right {
+					flex: 1;
+					display: flex;
+					justify-content: flex-end;
+					align-items: center;
+					margin-right: 32rpx;
+
+					.icon {
+						margin-right: 10rpx;
+						width: 26rpx;
+						height: 26rpx;
+						line-height: 26rpx;
+
+						img {
+							width: 100%;
+							height: 100%;
+						}
+					}
+
+					.info {
+						width: 56rpx;
+						height: 41rpx;
+						font-size: 28rpx;
+						color: #2A82E4;
+					}
+				}
+			}
+
+			.e_calendar {
+				display: flex;
+				justify-content: flex-end;
+				align-items: center;
+
+				.double {
+					margin-right: 30rpx;
+					width: 40rpx;
+					height: 40rpx;
+
+					img {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.single {
+					width: 40rpx;
+					height: 40rpx;
+
+					img {
+						width: 80%;
+						height: 70%;
+					}
+				}
+
+				.single2 {
+					margin-right: 30rpx;
+					width: 40rpx;
+					height: 40rpx;
+
+					img {
+						width: 100%;
+						height: 70%;
+					}
+				}
+
+				.time {
+					width: 180rpx;
+					height: 44rpx;
+					font-size: 32rpx;
+					text-align: center;
+				}
+			}
+
+			.e_list {
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-evenly;
+				align-items: center;
+				margin-top: 20rpx;
+				padding: 30rpx;
+				width: 630rpx;
+
+				.e_box {
+					display: flex;
+					flex-direction: column;
+					justify-content: space-evenly;
+					align-items: center;
+					margin-bottom: 20rpx;
+					width: 180rpx;
+					height: 190rpx;
+
+					.e_img {
+						width: 100rpx;
+						height: 100rpx;
+
+						img {
+							width: 100%;
+							height: 100%;
+							border-radius: 50%;
+						}
+					}
+
+					.e_name {
+						font-size: 28rpx;
+					}
+
+					.e_msg {
+						font-size: 24rpx;
+						color: #808080;
+					}
+				}
+			}
+		}
 	}
 
 	// 修改选中日期盒子圆角

pages/statDetail/statDetail.vue

@@ -6,11 +6,11 @@
 			<view class="calendar">
 				<!-- 双左箭头区域 -->
 				<view class="double" @click="handleDoubleLeft">
-					<img src="./imgs/double_left.png">
+					<img src="../../static/double_left.png">
 				</view>
 				<!-- 左箭头区域区域 -->
 				<view class="single" @click="handleLeft">
-					<img src="./imgs/left.png">
+					<img src="../../static/left.png">
 				</view>
 				<!-- 时间区域 -->
 				<view class="time">
@@ -18,11 +18,11 @@
 				</view>
 				<!-- 双右箭头区域 -->
 				<view class="single2" @click="handleRight">
-					<img src="./imgs/right.png">
+					<img src="../../static/right2.png">
 				</view>
 				<!-- 右箭头区域 -->
 				<view class="double" @click="handleDoubleRight">
-					<img src="./imgs/double_right.png">
+					<img src="../../static/double_right.png">
 				</view>
 
 			</view>

unpackage/dist/dev/mp-weixin/app.json

@@ -1,19 +1,19 @@
 {
   "pages": [
-    "pages/setPunchTime/setPunchTime",
+    "pages/stat/stat",
+    "pages/home/home",
+    "pages/my/my",
+    "pages/ruleSet/ruleSet",
     "pages/punchTime/punchTime",
+    "pages/setPunchTime/setPunchTime",
     "pages/rulesDetail/rulesDetail",
     "pages/particulars/particulars",
-    "pages/home/home",
     "pages/punchLocation/punchLocation",
     "pages/addLocation/addLocation",
     "pages/group/group",
     "pages/statDetail/statDetail",
-    "pages/stat/stat",
     "pages/authentication/authentication",
     "pages/index/index",
-    "pages/my/my",
-    "pages/ruleSet/ruleSet",
     "pages/powerSet/powerSet",
     "pages/cardRecord/cardRecord",
     "pages/addRules/addRules",
@@ -53,6 +53,7 @@
       }
     ]
   },
+  "lazyCodeLoading": "requiredComponents",
   "permission": {},
   "usingComponents": {
     "drop-down": "/uni_modules/zwx-dropDown/components/zwx-dropDown/zwx-dropDown"

unpackage/dist/dev/mp-weixin/components/kx-time-picker/kx-time-picker.js

@@ -1 +0,0 @@
-Component({})

unpackage/dist/dev/mp-weixin/components/kx-time-picker/kx-time-picker.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true
-}

unpackage/dist/dev/mp-weixin/components/kx-time-picker/kx-time-picker.wxss

@@ -1,5 +0,0 @@
-
-.default.data-v-01053584{
-	color: #8f8f94;
-}
-

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

@@ -1,5 +1,7 @@
 {
   "navigationBarTitleText": "打卡记录",
   "enablePullDownRefresh": false,
-  "usingComponents": {}
+  "usingComponents": {
+    "uni-segmented-control": "/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control"
+  }
 }

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

@@ -1,4 +1,129 @@
 @charset "UTF-8";
 /* 水平间距 */
 /* 水平间距 */
+.container.data-v-5abf34a6 {
+  padding-top: 20rpx;
+}
+.container .header.data-v-5abf34a6 {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-evenly;
+  margin: 0 auto;
+  width: 690rpx;
+  height: 192rpx;
+  background-color: #fff;
+}
+.container .header .calendar.data-v-5abf34a6 {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex: 1;
+}
+.container .header .calendar .double.data-v-5abf34a6 {
+  width: 40rpx;
+  height: 40rpx;
+}
+.container .header .calendar .double ._img.data-v-5abf34a6 {
+  width: 100%;
+  height: 100%;
+}
+.container .header .calendar .single.data-v-5abf34a6 {
+  margin-left: 30rpx;
+  width: 40rpx;
+  height: 40rpx;
+}
+.container .header .calendar .single ._img.data-v-5abf34a6 {
+  width: 80%;
+  height: 70%;
+}
+.container .header .calendar .single2.data-v-5abf34a6 {
+  margin-right: 30rpx;
+  width: 40rpx;
+  height: 40rpx;
+}
+.container .header .calendar .single2 ._img.data-v-5abf34a6 {
+  width: 100%;
+  height: 70%;
+}
+.container .header .calendar .time.data-v-5abf34a6 {
+  width: 180rpx;
+  height: 44rpx;
+  font-size: 32rpx;
+  text-align: center;
+}
+.container .header .state.data-v-5abf34a6 {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  flex: 1;
+}
+.container .list.data-v-5abf34a6 {
+  padding-bottom: 50rpx;
+}
+.container .list .box.data-v-5abf34a6 {
+  margin: 0 auto;
+  margin-top: 20rpx;
+  width: 690rpx;
+  background-color: #fff;
+}
+.container .list .box .person.data-v-5abf34a6 {
+  display: flex;
+  align-items: center;
+  height: 134rpx;
+}
+.container .list .box .person .img.data-v-5abf34a6 {
+  margin: 0 20rpx 0 30rpx;
+  width: 70rpx;
+  height: 70rpx;
+}
+.container .list .box .person .img ._img.data-v-5abf34a6 {
+  width: 100%;
+  height: 100%;
+}
+.container .list .box .person .info.data-v-5abf34a6 {
+  width: 620rpx;
+  height: 70rpx;
+}
+.container .list .box .person .info .name.data-v-5abf34a6 {
+  font-size: 32rpx;
+}
+.container .list .box .person .info .college.data-v-5abf34a6 {
+  font-size: 24rpx;
+  color: #A6A6A6;
+}
+.container .list .box .imgs.data-v-5abf34a6 {
+  display: flex;
+  justify-content: space-evenly;
+  height: 201rpx;
+}
+.container .list .box .imgs .imgs_item.data-v-5abf34a6 {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  flex: 1;
+}
+.container .list .box .imgs .imgs_item .image.data-v-5abf34a6 {
+  width: 120rpx;
+  height: 120rpx;
+}
+.container .list .box .imgs .imgs_item .image ._img.data-v-5abf34a6 {
+  width: 100%;
+  height: 100%;
+}
+.container .list .box .imgs .imgs_item .title.data-v-5abf34a6 {
+  margin-top: 10rpx;
+  font-size: 28rpx;
+}
+.container .list .box .msg.data-v-5abf34a6 {
+  margin-left: 30rpx;
+}
+.container .list .box .msg .msg_item.data-v-5abf34a6 {
+  display: flex;
+  align-items: center;
+  height: 63rpx;
+  font-size: 28rpx;
+}
+.container .list .box .msg .msg_item .key.data-v-5abf34a6 {
+  color: #808080;
+}
 

unpackage/dist/dev/mp-weixin/pages/powerSet/powerSet.json

@@ -1,5 +1,7 @@
 {
   "navigationBarTitleText": "权限设置",
   "enablePullDownRefresh": false,
-  "usingComponents": {}
+  "usingComponents": {
+    "uni-segmented-control": "/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control"
+  }
 }

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

@@ -0,0 +1,62 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.container.data-v-51d37726 {
+  padding-top: 20rpx;
+}
+.container .control.data-v-51d37726 {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  width: 750rpx;
+  height: 86rpx;
+  background-color: #fff;
+}
+.container .choose.data-v-51d37726 {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-evenly;
+  align-items: center;
+  margin-top: 20rpx;
+  padding: 30rpx;
+  width: 690rpx;
+  border-bottom: 1rpx solid #E5E5E5;
+  background-color: #fff;
+}
+.container .choose .box.data-v-51d37726 {
+  display: flex;
+  align-items: center;
+  width: 150rpx;
+  height: 60rpx;
+}
+.container .choose .box .name.data-v-51d37726 {
+  flex: 2;
+  text-align: center;
+  font-size: 28rpx;
+}
+.container .choose .box .icon.data-v-51d37726 {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  height: 50rpx;
+}
+.container .choose .box .icon ._img.data-v-51d37726 {
+  width: 30rpx;
+  height: 30rpx;
+}
+.container .list.data-v-51d37726 {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-evenly;
+  padding-top: 22rpx;
+  width: 750rpx;
+  border-bottom: 1rpx solid #E5E5E5;
+  background-color: #fff;
+}
+.container .list .item.data-v-51d37726 {
+  margin-bottom: 22rpx;
+  margin-left: 65rpx;
+  height: 41rpx;
+  font-size: 28rpx;
+}
+

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

@@ -2,6 +2,8 @@
   "navigationBarTitleText": "添加打卡时间",
   "enablePullDownRefresh": false,
   "usingComponents": {
-    "jlk-week": "/uni_modules/jlk-week/components/jlk-week/jlk-week"
+    "jlk-week": "/uni_modules/jlk-week/components/jlk-week/jlk-week",
+    "uni-swipe-action": "/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action",
+    "uni-swipe-action-item": "/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item"
   }
 }

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

@@ -40,6 +40,7 @@
   margin: 0 auto;
   margin-top: 13rpx;
   padding-top: 20rpx;
+  padding-bottom: 20rpx;
   width: 690rpx;
   border-radius: 10rpx;
   background-color: #fff;
@@ -79,15 +80,6 @@
   width: 26rpx;
   height: 26rpx;
 }
-.container .list .edit.data-v-bb96deb4 {
-  margin-left: 20rpx;
-  padding-top: 10rpx;
-  width: 70rpx;
-  height: 60rpx;
-  color: #3396FB;
-  font-size: 24rpx;
-  font-weight: 500;
-}
 .container .switch.data-v-bb96deb4 {
   box-sizing: border-box;
   display: flex;
@@ -108,7 +100,22 @@
 .container .switch .switch_button.data-v-bb96deb4 {
   flex: 1;
 }
+.container .button.data-v-bb96deb4 {
+  margin: 0 auto;
+  margin-top: 50rpx;
+  width: 690rpx;
+  height: 80rpx;
+  line-height: 80rpx;
+  text-align: center;
+  color: #fff;
+  font-size: 32rpx;
+  border-radius: 16rpx;
+  background-color: #3396FB;
+}
 .data-v-bb96deb4 .weeks-outer {
   border-radius: 10rpx;
 }
+.data-v-bb96deb4 .uni-swipe_button-group {
+  margin-bottom: 20rpx;
+}