no message

manifest.json

@@ -1,81 +1,81 @@
 {
-	"name": "校园考勤打卡",
-	"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": "wxd6f090391d410534",
-		"lazyCodeLoading": "requiredComponents",
-		"setting": {
-			"urlCheck": false,
-			"postcss": false,
-			"minified": false,
-			"es6": false
-		},
-		"usingComponents": true,
-		"plugins": {
-			"myPlugin": {
-				"provider": "wx1549b963bbae9931",
-				"version": "4.0.1"
-			}
-		},
-		"permission": {
-			"scope.userLocation": {
-				"desc": "您的位置信息将用于记录打卡"
-			}
-		},
-		"requiredPrivateInfos": ["getLocation", "chooseLocation"]
-	},
-	"vueVersion": "2",
-	"h5": {
-		"sdkConfigs": {
-			"maps": {}
-		}
-	}
+    "name" : "校园考勤打卡",
+    "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" : "wxd6f090391d410534",
+        "lazyCodeLoading" : "requiredComponents",
+        "setting" : {
+            "urlCheck" : false,
+            "postcss" : false,
+            "minified" : false,
+            "es6" : true
+        },
+        "usingComponents" : true,
+        "plugins" : {
+            "myPlugin" : {
+                "provider" : "wx1549b963bbae9931",
+                "version" : "4.0.1"
+            }
+        },
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "您的位置信息将用于记录打卡"
+            }
+        },
+        "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
+    },
+    "vueVersion" : "2",
+    "h5" : {
+        "sdkConfigs" : {
+            "maps" : {}
+        }
+    }
 }

pages.json

@@ -1,15 +1,15 @@
 {
 	"pages": [{
-			"path": "pages/home/home",
+			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "智慧校园打卡",
-				// "navigationStyle": "custom",
+				"navigationBarTitleText": "授权中",
 				"enablePullDownRefresh": false
 			}
 		}, {
-			"path": "pages/index/index",
+			"path": "pages/home/home",
 			"style": {
-				"navigationBarTitleText": "授权中",
+				"navigationBarTitleText": "智慧校园打卡",
+				// "navigationStyle": "custom",
 				"enablePullDownRefresh": false
 			}
 		}, {

pages/group/group.vue

@@ -3,18 +3,21 @@
 		<!-- 头部搜索栏区域 -->
 		<view class="search">
 			<uni-search-bar bgColor="#fff" placeholder="请输入搜索内容" cancelButton="none" v-model="searchValue"
-				@input="input" @clear="clear" @blur="blur">
+				@clear="clear" @blur="getGroupData">
 			</uni-search-bar>
 		</view>
 
 		<!-- 新增考勤组区域 -->
 		<view class="add">
-			<view class="icon" @click="handleAdd">
+			<view v-if="flag==1" class="icon" @click="handleAdd">
 				<img src="../../static/add.png">
 			</view>
 			<view v-if="flag==1" class="title" @click="handleAdd">
 				新增考勤组
 			</view>
+			<view v-if="flag==2" class="icon" @click="handleRelevancy">
+				<img src="../../static/add.png">
+			</view>
 			<view v-if="flag==2" class="title" @click="handleRelevancy">
 				关联考勤组
 			</view>
@@ -36,14 +39,14 @@
 										<checkbox class="collapse_check" :disabled="checkStatus" color="#0082FC"
 											:checked="item.checked" @click.stop="handleChange(item)" />
 										<view class="collapse_info">
-											{{item.title}}
+											{{item.name}}
 										</view>
 									</view>
 								</template>
 								<!-- 折叠内容区域 -->
 								<view class="content">
 									<view class="num">
-										随机人数：{{item.num}}人
+										随机人数：{{item.peopleCount}}人
 									</view>
 									<!-- 树状结构区域 -->
 									<view class="tree">
@@ -89,7 +92,7 @@
 								<img src="./imgs/people.png">
 							</view>
 							<view class="info">
-								680人
+								{{group_total}}人
 							</view>
 						</view>
 						<view class="input">
@@ -123,11 +126,20 @@
 		},
 		data() {
 			return {
+				// 新增考勤组名称
 				group_name: "",
+				// 新增考勤组范围
 				group_scope: "",
-				group_num: "",
+				// 新增考勤组需要打卡人数
+				group_num: null,
+				// 新增考勤组总人数
+				group_total: 0,
+				// 新增考勤组ID数组
+				userOrgList: [],
 				flag: null,
+				// 考勤组勾选框禁用标识
 				checkStatus: false,
+				// 搜索框绑定的值
 				searchValue: "",
 				options: [{
 					text: '删除',
@@ -135,285 +147,9 @@
 						backgroundColor: '#D43030'
 					}
 				}],
-				list: [{
-						id: 1,
-						title: "全体学生",
-						num: 56,
-						checked: false,
-						textArr: [{
-							"name": "墨轩湖校区",
-							"id": "1",
-							"open": false,
-							"children": [{
-									"name": "学生",
-									"id": "1-1",
-									"open": false,
-									"children": [{
-											"name": "计算机专业",
-											"id": "1-1-1",
-											"open": false,
-											"children": [{
-													"name": "陈志斌",
-													"id": "1-1-1-1",
-													"open": false,
-													"children": [],
-												},
-												{
-													"name": "华志杰",
-													"id": "1-1-1-2",
-													"open": false,
-													"children": [],
-												},
-												{
-													"name": "刘子麟",
-													"id": "1-1-1-3",
-													"open": false,
-													"children": [],
-												},
-											],
-										},
-										{
-											"name": "文法分院",
-											"id": "1-1-2",
-											"open": false,
-											"children": [],
-										},
-									]
-								},
-								{
-									"name": "老师",
-									"id": "1-2",
-									"open": false,
-									"children": [{
-										"name": "辅导员",
-										"id": "1-2-1",
-										"open": false,
-										"children": [],
-									}]
-								}
-							]
-						}, ],
-					},
-
-					{
-						id: 2,
-						title: "后勤人员",
-						num: 36,
-						checked: false,
-						textArr: [{
-							"name": "黄家湖校区",
-							"id": "1",
-							"open": false,
-							"children": [{
-									"name": "商户",
-									"id": "1-1",
-									"open": false,
-									"children": [{
-											"name": "食堂",
-											"id": "1-1-1",
-											"open": false,
-											"children": [{
-													"name": "饭",
-													"id": "1-1-1-1",
-													"open": false,
-													"children": [],
-												},
-												{
-													"name": "水",
-													"id": "1-1-1-2",
-													"open": false,
-													"children": [],
-												},
-												{
-													"name": "零食",
-													"id": "1-1-1-3",
-													"open": false,
-													"children": [],
-												},
-											],
-										},
-										{
-											"name": "商业街",
-											"id": "1-1-2",
-											"open": false,
-											"children": [],
-										},
-									]
-								},
-								{
-									"name": "清洁工",
-									"id": "1-2",
-									"open": false,
-									"children": [{
-										"name": "园丁",
-										"id": "1-2-1",
-										"open": false,
-										"children": [],
-									}]
-								}
-							]
-						}, ],
-					},
-				],
-				range: [{
-						id: 1,
-						name: '北京市',
-						children: [{
-							id: 11,
-							name: '市辖区',
-							children: [{
-									id: 111,
-									name: '西城区',
-									children: [{
-										id: 1111,
-										name: '南河沿大街',
-										children: [{
-											id: 11111,
-											name: '紫金宫饭店',
-											// checked: true
-										}, ]
-									}, ]
-								},
-								{
-									id: 112,
-									name: '东城区',
-								},
-								{
-									id: 113,
-									name: '朝阳区',
-								},
-								{
-									id: 114,
-									name: '丰台区',
-								}
-							]
-						}, ]
-					},
-					{
-						id: 2,
-						name: '河北省',
-						children: [{
-								id: 21,
-								name: '石家庄市',
-							},
-							{
-								id: 22,
-								name: '唐山市',
-							},
-							{
-								id: 23,
-								name: '秦皇岛市',
-							},
-						]
-					},
-					{
-						id: 3,
-						name: '山东省',
-						children: [{
-								id: 31,
-								name: '济南市',
-								children: [{
-										id: 311,
-										name: '历下区',
-										children: [{
-											id: 3131,
-											name: '解放路街道办事处',
-										}, ]
-									},
-									{
-										id: 312,
-										name: '槐荫区',
-									},
-									{
-										id: 313,
-										name: '天桥区',
-									},
-									{
-										id: 314,
-										name: '历城区',
-									},
-									{
-										id: 315,
-										name: '长清区',
-									}
-								]
-							},
-							{
-								id: 32,
-								name: '青岛市',
-							},
-							{
-								id: 33,
-								name: '临沂市',
-								children: [{
-										id: 331,
-										name: '兰山区',
-										children: [{
-											id: 3331,
-											name: '金雀山街道',
-										}, ]
-									},
-									{
-										id: 332,
-										name: '河东区',
-									},
-									{
-										id: 333,
-										name: '罗庄区',
-										children: [{
-											id: 3331,
-											name: '盛庄街道',
-										}, ]
-									}
-								]
-							},
-							{
-								id: 34,
-								name: '日照市',
-							},
-							{
-								id: 35,
-								name: '淄博市',
-							},
-							{
-								id: 36,
-								name: '枣庄市',
-							},
-							{
-								id: 37,
-								name: '东营市',
-							},
-							{
-								id: 38,
-								name: '潍坊市',
-							},
-							{
-								id: 39,
-								name: '烟台市',
-							},
-							{
-								id: 40,
-								name: '济宁市',
-							},
-							{
-								id: 41,
-								name: '泰安市',
-							},
-							{
-								id: 42,
-								name: '威海市',
-							},
-							{
-								id: 43,
-								name: '滨州市',
-							},
-							{
-								id: 44,
-								name: '菏泽市',
-							},
-						]
-					}
-				]
+				// 考勤组列表数据
+				list: [],
+				range: []
 			};
 		},
 		onLoad(options) {
@@ -421,16 +157,49 @@
 			if (this.flag == 1) {
 				this.checkStatus = true
 			}
+			this.getGroupData()
 		},
 		methods: {
+			// 获取考勤组列表数据
+			async getGroupData() {
+				let res = await this.$myRequest({
+					url: "/attendance/api/settings/group/list",
+					data: {
+						name: this.searchValue,
+						size: 999
+					}
+				})
+				// console.log(res);
+				if (res.code == 200) {
+					res.data.list.forEach((ele) => {
+						ele.checked = false
+						ele.textArr = []
+						ele.names.forEach((element) => {
+							ele.textArr.push({
+								name: element
+							})
+						})
+					})
+					this.list = res.data.list
+				}
+			},
 			// 考勤组选择框确定回调事件
 			treeConfirm(e) {
 				// console.log(e)
+				let count = 0
 				let temList = []
+				let userOrgList = []
 				e.forEach((ele) => {
 					temList.push(ele.name)
+					userOrgList.push({
+						orgId: ele.id,
+						type: 2
+					})
+					count += ele.number
 				})
 				this.group_scope = temList.join(",")
+				this.group_total = count
+				this.userOrgList = userOrgList
 			},
 			// 考勤组选择框取消回调事件
 			treeCancel(e) {
@@ -438,15 +207,22 @@
 				console.log("取消");
 			},
 			// 点击选择考勤组选择框回调
-			handleChoose() {
+			async handleChoose() {
 				this.$refs.tkitree._show()
+				let res = await this.$myRequest({
+					url: "/attendance/api/settings/org/tree"
+				})
+				// console.log(res);
+				if (res.code == 200) {
+					this.range = res.data
+				}
 			},
 			handleChange(item) {
 				console.log(item);
 				item.checked = !item.checked
 			},
 			// 点击弹窗保存按钮回调
-			handleSave() {
+			async handleSave() {
 				if (!this.group_name) {
 					uni.showToast({
 						title: "请输入考勤组名称",
@@ -468,6 +244,22 @@
 					})
 					return
 				}
+				let res = await this.$myRequest({
+					url: "/attendance/api/settings/group/add",
+					method: "post",
+					header: {
+						'content-type': 'application/json',
+						'Authorization': uni.getStorageSync("token") ||
+							'eyJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjo1MDQ2LCJ1c2VyX3V1aWQiOjEzNDc3NzE0NzM1NTY5NzE1MiwibmJmIjoxNjcxMTU1ODQzfQ.u4-N762Ijfb9RkuuFOFkeMiJQI9uCi0IaheJlGwi5Ms'
+					},
+					data: {
+						name: this.group_name,
+						peopleCount: this.group_num,
+						peopleTotal: this.group_total,
+						userOrgList: this.userOrgList
+					}
+				})
+				console.log(res);
 				this.$refs.popup.close()
 			},
 			// 点击弹窗取消按钮回调
@@ -476,6 +268,10 @@
 			},
 			// 点击新增考勤组按钮回调
 			handleAdd() {
+				this.group_name = ""
+				this.group_num = null
+				this.group_total = 0
+				this.userOrgList = []
 				this.$refs.popup.open()
 			},
 			// 点击关联考勤组按钮回调
@@ -509,23 +305,10 @@
 					}
 				});
 			},
-			// 搜索框失焦回调
-			blur(res) {
-				uni.showToast({
-					title: '搜索：' + res.value,
-					icon: 'none'
-				})
-			},
-			// 搜索框输入时的回调
-			input(res) {
-				console.log('----input:', res)
-			},
 			// 清除搜索框内容时的回调
-			clear(res) {
-				uni.showToast({
-					title: 'clear事件，清除值为：' + res.value,
-					icon: 'none'
-				})
+			clear() {
+				this.searchValue = ""
+				this.getGroupData()
 			},
 		}
 	}
@@ -663,7 +446,7 @@
 						font-size: 28rpx;
 						color: #808080;
 					}
-					
+
 					.notes2 {
 						padding-left: 24rpx;
 						flex: 5;

pages/home/home.vue

@@ -4,14 +4,14 @@
 		<view class="header">
 			<view class="img">
 				<img
-					src="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">
+					:src="userInfo.headImage||'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Finews.gtimg.com%2Fnewsapp_bt%2F0%2F7974778847%2F1000&refer=http%3A%2F%2Finews.gtimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1673765601&t=e38144720930d00c5bf59536379da218'">
 			</view>
 			<view class="msg">
 				<view class="name">
-					程佳欢
+					{{userInfo.name}}
 				</view>
 				<view class="major">
-					文法学院
+					{{userInfo.college||"南昌交通学院"}}
 				</view>
 			</view>
 		</view>
@@ -24,15 +24,15 @@
 				<view class="item" v-for="item in list" :key="item.id">
 					<view class="item_box">
 						<view class="title">
-							{{item.title}}
+							{{item.ruleName}}
 						</view>
 						<view class="time">
-							{{item.time}}
+							{{item.timeRange}}
 						</view>
 						<view class="type">
-							<img v-if="item.type=='已打卡'" src="./imgs/success.png">
-							<span v-if="item.type=='已打卡'">09:00</span>
-							{{item.type}}
+							<img v-if="item.finish" src="./imgs/success.png">
+							<span v-if="item.finish">{{item.updateTime}}</span>
+							{{item.finish?"已打卡":"未打卡"}}
 						</view>
 					</view>
 				</view>
@@ -124,7 +124,7 @@
 			this.getNowTime()
 			this.getUserInfo()
 			this.getLocationData()
-			// this.getRulesList()
+			this.getRulesList()
 		},
 		onUnload() {
 			if (this.timer) {
@@ -147,15 +147,15 @@
 					}, 1000)
 				}
 			},
-			// 从缓存中获取用户信息
-			getUserInfo() {
-				try {
-					const value = uni.getStorageSync('userInfo')
-					if (value) {
-						this.userInfo = value
-					}
-				} catch (e) {
-					console.log(e);
+			// 获取用户详细信息
+			async getUserInfo() {
+				let userId = uni.getStorageSync("userInfo").id || 5046
+				let res = await this.$myRequest({
+					url: `/attendance/api/system/user/detail/${userId}`,
+				})
+				// console.log(res);
+				if (res.code == 200) {
+					this.userInfo = res.data
 				}
 			},
 			// 获取当前定位位置信息
@@ -177,11 +177,18 @@
 			},
 			// 获取打卡规则列表
 			async getRulesList() {
+				let name = uni.getStorageSync("userInfo").username
 				let res = await this.$myRequest({
 					url: "/attendance/api/sign/check/in/list",
-					name: this.userInfo.username
+					data: {
+						name: name ? name : "",
+						size: 999
+					}
 				})
-				console.log(res);
+				// console.log(res);
+				if (res.code == 200) {
+					this.list = res.data.list
+				}
 			},
 			// 点击打卡按钮回调
 			handlePunch() {

pages/index/index.vue

@@ -14,7 +14,6 @@
 				// 获取用户信息
 				ocode: '1015730314',
 				// 商户appkey
-				// appkey: '3183DC96A6DABA8D',
 				appkey: '9D6ACFE8CF9AFD07',
 				// 是否授权可见
 				visible: false,
@@ -33,6 +32,7 @@
 				let userInfo = uni.getStorageSync('userInfo');
 				console.log(userInfo);
 				if (userInfo) {
+					// this.showLogin = false
 					uni.navigateTo({
 						url: "/pages/home/home"
 					})
@@ -45,7 +45,6 @@
 
 			// 授权成功回调
 			loginSuccess(res) {
-				console.log(res);
 				console.log("成功");
 				let wxcode = res.detail.wxcode
 				// 获取wxcode后请求登录
@@ -93,16 +92,28 @@
 			},
 
 			async login(wxcode) {
-				console.log(123);
 				let res = await this.$myRequest({
 					url: "/attendance/api/system/user/login/app",
 					method: "post",
 					data: {
 						redirect_uri: `mnp://${this.appid}`,
-						wxcode
+						wxcode,
 					}
 				})
-				console.log(res);
+				// console.log(res);
+				if (res.code == 200) {
+					uni.setStorageSync("userInfo", res.data)
+					uni.setStorageSync("token", res.data.token)
+					// uni.setStorageSync("userId", res.data.id)
+					uni.navigateTo({
+						url: "/pages/home/home"
+					})
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
 			}
 		}
 	}

pages/stat/stat.vue

@@ -40,7 +40,7 @@
 		<view class="calendar">
 			<view class="calendar_title">
 				每日记录
-				<span>（5月）</span>
+				<span>（{{month}}月）</span>
 			</view>
 
 			<view class="calendar_body">
@@ -52,13 +52,13 @@
 				<!-- 每一条记录区域 -->
 				<view class="foot_item" v-for="item in list2" :key="item.id">
 					<view>
-						{{item.msg}}
+						规则：{{item.ruleName}} {{item.timeRange}}
 					</view>
 					<view class="box">
-						<view class="circular" v-if="item.status==1"></view>
+						<view class="circular" v-if="item.finish"></view>
 						<view class="circular color" v-else></view>
-						{{item.status==0?"未打卡":"已打卡"}}
-						<span>{{item.time}}</span>
+						{{item.finish?"已打卡":"未打卡"}}
+						<span v-if="item.finish">{{item.updateTime}}</span>
 					</view>
 				</view>
 			</view>
@@ -148,12 +148,13 @@
 		data() {
 			return {
 				flag: false,
+				// 有标记点的数组日期
 				list: [{
-						date: "2022-11-20",
+						date: "2022-12-20",
 						info: ''
 					},
 					{
-						date: "2022-11-21",
+						date: "2022-12-21",
 						info: '',
 						data: {
 							custom: '自定义信息',
@@ -161,10 +162,11 @@
 						}
 					},
 					{
-						date: "2022-11-22",
+						date: "2022-12-22",
 						info: ''
 					}
 				],
+				// 考勤规则列表
 				list2: [{
 						id: 1,
 						msg: "规则：课间操考勤打卡09:00 - 09:15",
@@ -209,36 +211,59 @@
 					},
 				],
 				progress_txt: 50,
-				progress_total: 70
+				progress_total: 70,
+				nowTime: ""
 			};
 		},
 		onLoad() {
-			this.getTime()
 			if (this.flag) {
 				this.current = 0
 			}
+			this.getTime()
+			this.getRulesList()
 		},
 		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()
 				let month = date.getMonth() + 1
+				let day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+				this.nowTime = year + "-" + month + "-" + day + " " + "00:00:00"
 				this.year = year
 				this.month = month
 			},
+
+			// 获取打卡规则列表
+			async getRulesList() {
+				let name = uni.getStorageSync("userInfo").username
+				let res = await this.$myRequest({
+					url: "/attendance/api/sign/check/in/list",
+					data: {
+						name: name ? name : "",
+						size: 999,
+						beginTimeBegin: this.nowTime
+					}
+				})
+				console.log(res);
+				if (res.code == 200) {
+					this.list2 = res.data.list
+				}
+			},
+
 			// 点击日历日期回调
 			change(e) {
-				console.log('change 返回:', e)
+				console.log('change 返回:', e.fulldate)
+				this.nowTime = e.fulldate+ " " + "00:00:00"
+				this.getRulesList()
 			},
 			onClickItem(e) {
 				console.log(e.currentIndex);

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

@@ -1,7 +1,7 @@
 {
   "pages": [
-    "pages/home/home",
     "pages/index/index",
+    "pages/home/home",
     "pages/404/404",
     "pages/qr_code/qr_code",
     "pages/group/group",

unpackage/dist/dev/mp-weixin/common/main.js

@@ -21,8 +21,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 var dropDown = function dropDown() {
-  __webpack_require__.e(/*! require.ensure | uni_modules/zwx-dropDown/components/zwx-dropDown/zwx-dropDown */ "uni_modules/zwx-dropDown/components/zwx-dropDown/zwx-dropDown").then((function () {
-    return resolve(__webpack_require__(/*! @/uni_modules/zwx-dropDown/components/zwx-dropDown/zwx-dropDown */ 227));
+  Promise.all(/*! require.ensure | uni_modules/zwx-dropDown/components/zwx-dropDown/zwx-dropDown */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/zwx-dropDown/components/zwx-dropDown/zwx-dropDown")]).then((function () {
+    return resolve(__webpack_require__(/*! @/uni_modules/zwx-dropDown/components/zwx-dropDown/zwx-dropDown */ 230));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 _vue.default.component("dropDown", dropDown);

unpackage/dist/dev/mp-weixin/components/chocolate-progress-bar/chocolate-progress-bar.json

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

unpackage/dist/dev/mp-weixin/components/tki-tree/tki-tree.json

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

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

@@ -15,11 +15,10 @@
             "ignore": [],
             "disablePlugins": [],
             "outputPath": ""
-        },
-        "enhance": true
+        }
     },
     "compileType": "miniprogram",
-    "libVersion": "2.28.1",
+    "libVersion": "2.29.0",
     "appid": "wxd6f090391d410534",
     "projectname": "校园考勤打卡",
     "condition": {

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

@@ -27,6 +27,20 @@
                     "query": "",
                     "launchMode": "default",
                     "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/stat/stat",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/group/group",
+                    "query": "flag=1",
+                    "launchMode": "default",
+                    "scene": null
                 }
             ]
         }

util/api.js

@@ -12,24 +12,26 @@ export const myRequest = (options) => {
 			url: BASE_URL + options.url,
 			method: options.method || "GET",
 			data: options.data || {},
-			header: options.header || {
-				'Authorization': 'token'
+			header: options.header||{
+				'content-type': 'application/x-www-form-urlencoded',
+				'Authorization': uni.getStorageSync("token") ||
+					'eyJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjo1MDQ2LCJ1c2VyX3V1aWQiOjEzNDc3NzE0NzM1NTY5NzE1MiwibmJmIjoxNjcxMTU1ODQzfQ.u4-N762Ijfb9RkuuFOFkeMiJQI9uCi0IaheJlGwi5Ms'
 			},
 			success: (res) => {
 				uni.hideLoading();
 				resolve(res.data)
-				if (!res.data.success) {
-					if (res.data.code == 10028 || res.data.code == 10029) {
+				if (res.data.code != 200) {
+					if (res.data.code == 401) {
 						uni.showModal({
 							title: "提示",
 							content: res.data.message,
 							showCancel: false,
 							success: function(res) {
-								// if (res.confirm) {
-								// 	uni.reLaunch({
-								// 		url: "/pages/home/home",
-								// 	});
-								// }
+								if (res.confirm) {
+									uni.reLaunch({
+										url: "/pages/index/index",
+									});
+								}
 							},
 						});
 					} else {