no message

components/chocolate-progress-bar/chocolate-progress-bar.vue

@@ -0,0 +1,109 @@
+<template>
+	<view class="progress_box">
+		<canvas class="progress_bg" canvas-id="cpbg"></canvas>
+		<canvas class="progress_bar" canvas-id="cpbar"></canvas>
+		<view class="progress_txt">
+			<!-- <view class="progress_info">{{ progress_txt }}%</view> -->
+			<view class="progress_info">{{progress_txt}}/{{progress_total}}</view>
+			<text>每日完成占比</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			progress_txt: {
+				type: Number,
+				default: 0
+			},
+			progress_total: {
+				type: Number,
+				default: 100
+			}
+		},
+		onReady() {
+			this.drawProgressbg();
+			this.drawCircle(this.progress_txt/this.progress_total*100); //参数为1-100
+		},
+		methods: {
+			drawProgressbg() {
+				// 自定义组件实例 this ，表示在这个自定义组件下查找拥有 canvas-id 的 <canvas/>
+				var ctx = uni.createCanvasContext('cpbg', this);
+				ctx.setLineWidth(8); // 设置圆环的宽度
+				ctx.setStrokeStyle('#CCCCCC'); // 设置圆环的颜色
+				ctx.setLineCap('round'); // 设置圆环端点的形状
+				ctx.beginPath(); //开始一个新的路径
+				ctx.arc(80, 60, 55, 0.85 * Math.PI, 0.15 * Math.PI, false);
+				//设置一个原点(110,110)，半径为100的圆的路径到当前路径
+				ctx.stroke(); //对当前路径进行描边
+				ctx.draw();
+			},
+			drawCircle(step) {
+				var ctx = uni.createCanvasContext('cpbar', this);
+				// 进度条的渐变(中心x坐标-半径-边宽，中心Y坐标，中心x坐标+半径+边宽，中心Y坐标)
+				var gradient = ctx.createLinearGradient(28, 55, 192, 55);
+				gradient.addColorStop('0', '#2A82E4');
+				gradient.addColorStop('1.0', '#2A82E4');
+				ctx.setLineWidth(8);
+				ctx.setStrokeStyle(gradient);
+				ctx.setLineCap('round');
+				ctx.beginPath();
+				// 参数step 为绘制的百分比
+				step = 0.015 * step + 0.75;
+				if (step >= 2) {
+					step = step % 2;
+				}
+				ctx.arc(80, 60, 55, 0.85 * Math.PI, step * Math.PI, false);
+				ctx.stroke();
+				ctx.draw();
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.progress_box {
+		position: relative;
+		width: 100%;
+		height: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		text-align: center;
+
+		.progress_bg {
+			position: absolute;
+			width: 100%;
+			height: 100%;
+		}
+
+		.progress_bar {
+			position: absolute;
+			width: 100%;
+			height: 100%;
+		}
+
+		.progress_txt {
+			position: absolute;
+			padding-right: 20rpx;
+
+			.progress_info {
+				letter-spacing: 2rpx;
+				font-size: 36rpx;
+			}
+
+			text {
+				font-size: 22rpx;
+				color: #A6A6A6;
+			}
+		}
+	}
+
+	/* .progress_dot {
+		width: 16upx;
+		height: 16upx;
+		border-radius: 50%;
+		background-color: #fb9126;
+	} */
+</style>

manifest.json

@@ -1,69 +1,79 @@
 {
-	"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": {}
-		}
-	}
+    "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" : "wxb4d969974f931f62",
+        "lazyCodeLoading" : "requiredComponents",
+        "setting" : {
+            "urlCheck" : false,
+            "postcss" : false,
+            "minified" : false
+        },
+        "usingComponents" : true,
+        "plugins" : {
+            "myPlugin" : {
+                "provider" : "wx1549b963bbae9931",
+                "version" : "4.0.0"
+            }
+        },
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "您的位置信息将用于记录打卡"
+            }
+        }
+    },
+    "vueVersion" : "2",
+    "h5" : {
+        "sdkConfigs" : {
+            "maps" : {}
+        }
+    }
 }

pages.json

@@ -1,10 +1,8 @@
 {
 	"pages": [{
-			"path": "pages/stat/stat",
+			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "统计",
-				// "navigationStyle": "custom",
-				"enablePullDownRefresh": false
+				"navigationBarTitleText": "授权中"
 			}
 		}, {
 			"path": "pages/home/home",
@@ -14,6 +12,20 @@
 				"enablePullDownRefresh": false
 			}
 		}, {
+			"path": "pages/group/group",
+			"style": {
+				"navigationBarTitleText": "考勤组",
+				// "navigationStyle": "custom",
+				"enablePullDownRefresh": false
+			}
+		}, {
+			"path": "pages/stat/stat",
+			"style": {
+				"navigationBarTitleText": "统计",
+				// "navigationStyle": "custom",
+				"enablePullDownRefresh": false
+			}
+		}, {
 			"path": "pages/my/my",
 			"style": {
 				"navigationBarTitleText": "系统设置",
@@ -71,14 +83,7 @@
 				"enablePullDownRefresh": false
 			}
 		},
-		{
-			"path": "pages/group/group",
-			"style": {
-				"navigationBarTitleText": "考勤组",
-				// "navigationStyle": "custom",
-				"enablePullDownRefresh": false
-			}
-		},
+
 		{
 			"path": "pages/statDetail/statDetail",
 			"style": {
@@ -95,11 +100,6 @@
 			}
 		},
 		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "授权中"
-			}
-		}, {
 			"path": "pages/powerSet/powerSet",
 			"style": {
 				"navigationBarTitleText": "权限设置",

pages/addRules/addRules.vue

@@ -22,20 +22,17 @@
 			<view class="name">
 				考 勤 组：
 			</view>
-			<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 class="val" @click="goPageGroup">
+				<view class="ele" v-if="group=='未设置'">
+					{{group}}
 				</view>
-
-			</picker>
+				<view class="ele black" v-else>
+					{{group}}
+				</view>
+				<view class="right">
+					<img src="../../static/right.png">
+				</view>
+			</view>
 		</view>
 
 		<view class="box">
@@ -115,9 +112,7 @@
 				// 提前通知
 				value: "未设置",
 				array: ['5分钟', '10分钟', '15分钟', '20分钟'],
-				array_group: ['分组一分组一分组一分组一分组一分组一', '分组二', '分组三', '分组四'],
 				index: 0,
-				index_group: 0
 			};
 		},
 		onLoad() {
@@ -189,17 +184,18 @@
 				let index = e.detail.value
 				this.value = this.array[index]
 			},
-			// 考勤组选择框点击回调
-			changeSelect_group(e) {
-				let index = e.detail.value
-				this.group = this.array_group[index]
-			},
 			// 点击规则名称跳转回调
 			goPageRuleName() {
 				uni.navigateTo({
 					url: "/pages/ruleName/ruleName"
 				})
 			},
+			// 点击考勤组跳转回调
+			goPageGroup() {
+				uni.navigateTo({
+					url: `/pages/group/group?flag=2`
+				})
+			},
 			// 点击打卡时间跳转回调
 			goPagePunchTime() {
 				uni.navigateTo({

pages/editRules/editRules.vue

@@ -22,26 +22,25 @@
 			<view class="name">
 				考 勤 组：
 			</view>
-			<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 class="val" @click="goPageGroup">
+				<view class="ele" v-if="group=='未设置'">
+					{{group}}
 				</view>
-			</picker>
+				<view class="ele black" v-else>
+					{{group}}
+				</view>
+				<view class="right">
+					<img src="../../static/right.png">
+				</view>
+			</view>
+
 		</view>
 
 		<view class="box">
 			<view class="name">
 				打卡时间：
 			</view>
-			<view class="val"  @click="goPagePunchTime">
+			<view class="val" @click="goPagePunchTime">
 				<view class="ele" v-if="time=='未设置'">
 					{{time}}
 				</view>
@@ -110,7 +109,6 @@
 		data() {
 			return {
 				info: {},
-
 				// 规则名称
 				ruleName: "未设置",
 				// 考勤组
@@ -123,10 +121,7 @@
 				value: "未设置",
 				// 提前通知选项
 				array: ['5分钟', '10分钟', '15分钟', '20分钟'],
-				// 考勤组选项
-				array_group: ['分组一', '分组二', '分组三', '分组四'],
 				index: 0,
-				index_group: 0
 			};
 		},
 		onLoad(option) {
@@ -180,17 +175,18 @@
 				let index = e.detail.value
 				this.value = this.array[index]
 			},
-			// 考勤组选择框点击回调
-			changeSelect_group(e) {
-				let index = e.detail.value
-				this.group = this.array_group[index]
-			},
 			// 点击规则名称跳转回调
 			goPageRuleName() {
 				uni.navigateTo({
 					url: "/pages/ruleName/ruleName"
 				})
 			},
+			// 点击考勤组跳转回调
+			goPageGroup() {
+				uni.navigateTo({
+					url: `/pages/group/group?flag=2`
+				})
+			},
 			// 点击打卡时间跳转回调
 			goPagePunchTime() {
 				uni.navigateTo({
@@ -210,7 +206,7 @@
 <style lang="scss" scoped>
 	.container {
 		height: 100vh;
-		background-color: #F2F2F2;
+		background-color: #fff;
 
 		.box {
 			display: flex;

pages/group/group.vue

@@ -2,8 +2,8 @@
 	<view class="container">
 		<!-- 头部搜索栏区域 -->
 		<view class="search">
-			<uni-search-bar placeholder="请输入搜索内容" cancelButton="none" v-model="searchValue" @input="input"
-				@clear="clear" @blur="blur">
+			<uni-search-bar bgColor="#fff" placeholder="请输入搜索内容" cancelButton="none" v-model="searchValue"
+				@input="input" @clear="clear" @blur="blur">
 			</uni-search-bar>
 		</view>
 
@@ -12,9 +12,12 @@
 			<view class="icon" @click="handleAdd">
 				<img src="../../static/add.png">
 			</view>
-			<view class="title" @click="handleAdd">
+			<view v-if="flag==1" class="title" @click="handleAdd">
 				新增考勤组
 			</view>
+			<view v-if="flag==2" class="title" @click="handleRelevancy">
+				关联考勤组
+			</view>
 		</view>
 
 		<!--考勤组列表区域 -->
@@ -26,7 +29,18 @@
 
 					<view class="group_item">
 						<uni-collapse :ref="item.id+'collapse'">
-							<uni-collapse-item :title="item.title" open>
+							<uni-collapse-item open>
+								<!-- 自定义标题区域 -->
+								<template v-slot:title>
+									<view class="collapse_title">
+										<checkbox class="collapse_check" :disabled="checkStatus" color="#0082FC"
+											:checked="item.checked" @click.stop="handleChange(item)" />
+										<view class="collapse_info">
+											{{item.title}}
+										</view>
+									</view>
+								</template>
+								<!-- 折叠内容区域 -->
 								<view class="content">
 									<view class="num">
 										随机人数：{{item.num}}人
@@ -98,6 +112,8 @@
 	export default {
 		data() {
 			return {
+				flag: null,
+				checkStatus: false,
 				searchValue: "",
 				options: [{
 					text: '删除',
@@ -109,6 +125,7 @@
 						id: 1,
 						title: "全体学生",
 						num: 56,
+						checked: false,
 						textArr: [{
 							"name": "墨轩湖校区",
 							"id": "1",
@@ -168,6 +185,7 @@
 						id: 2,
 						title: "后勤人员",
 						num: 36,
+						checked: false,
 						textArr: [{
 							"name": "黄家湖校区",
 							"id": "1",
@@ -225,10 +243,17 @@
 				]
 			};
 		},
-		onLoad() {
-			// this.$refs.popup.open()
+		onLoad(options) {
+			this.flag = options.flag
+			if (this.flag == 1) {
+				this.checkStatus = true
+			}
 		},
 		methods: {
+			handleChange(item) {
+				console.log(item);
+				item.checked = !item.checked
+			},
 			// 点击弹窗保存按钮回调
 			handleSave() {
 				this.$refs.popup.close()
@@ -239,9 +264,12 @@
 			},
 			// 点击新增考勤组按钮回调
 			handleAdd() {
-				console.log(123);
 				this.$refs.popup.open()
 			},
+			// 点击关联考勤组按钮回调
+			handleRelevancy() {
+				console.log(456);
+			},
 			// 点击树状节点回调
 			nodechange(ref) {
 				this.$nextTick(() => {
@@ -338,6 +366,22 @@
 				width: 750rpx;
 				background-color: #fff;
 
+				.collapse_title {
+					display: flex;
+					align-items: center;
+					height: 79rpx;
+
+					.collapse_check {
+						margin-left: 30rpx;
+					}
+
+					.collapse_info {
+						margin-left: 10rpx;
+						font-size: 28rpx;
+						font-weight: 600;
+					}
+				}
+
 				.content {
 					padding-bottom: 50rpx;
 

pages/home/home.vue

@@ -105,7 +105,7 @@
 			};
 		},
 		onLoad() {
-			// this.getRulesList()
+			this.getRulesList()
 		},
 		methods: {
 			// 获取打卡规则列表
@@ -119,9 +119,9 @@
 			},
 			// 点击打卡按钮回调
 			handlePunch() {
-				// 获取用户摄像头权限
+				// 获取用户位置权限
 				uni.authorize({
-					scope: 'scope.camera',
+					scope: 'scope.userLocation',
 					success() {
 						uni.navigateTo({
 							url: "/pages/location/location"
@@ -130,7 +130,7 @@
 					fail() {
 						uni.showModal({
 							title: '提示',
-							content: '请先开启摄像头权限，否则将无法使用打卡功能',
+							content: '请先开启定位权限，否则将无法使用定位功能',
 							cancelText: '不授权',
 							confirmText: '授权',
 							success: function(res) {

pages/index/index.vue

@@ -1,5 +1,10 @@
 <template>
-	<view class="container">
+	<view>
+		123
+		<view v-if="showLogin">
+			<login :ocode="ocode" :appkey="appKey" scope="snsapi_userinfo" :visible="visible" @success="loginSuccess"
+				@fail="loginFail" @cancel="loginCancel" />
+		</view>
 	</view>
 </template>
 
@@ -7,15 +12,82 @@
 	export default {
 		data() {
 			return {
+				homeUrl: "https://www.web-server.top:443",
+				ocode: '1015730314', // 获取用户信息
+				appkey: '3183DC96A6DABA8D', // 商户appkey
+				visible: false, // 是否授权可见
 
+				showLogin: true, // 是否启动授权
+				appid: 'wxd6f090391d410534', // 获取用户信息
 			}
 		},
+		onLoad() {
+			this.hasUserInfo()
+		},
 		methods: {
+			// 检查是否存在用户信息
+			hasUserInfo() {
+				let userinfo = uni.getStorageSync('userinfo');
+				console.log(userinfo);
+				if (userinfo) {
+					uni.navigateTo({
+						url: "/pages/home/home"
+					})
+				} else {
+					console.log(4);
+					this.showLogin = true
+					this.visible = true
+				}
+			},
+
+			// 授权成功回调
+			loginSuccess(res) {
+				console.log(1);
+			},
+			// login_success_callback({detail}) {
+			// 	const {
+			// 		wxcode = ""
+			// 	} = detail
+
+			// 	this.validation_failed = false
+
+			// 	// 屏蔽用户操作
+			// 	uni.showLoading({
+			// 		title: '获取数据中…',
+			// 		mask: true
+			// 	})
 
+			// 	setTimeout(() => {
+			// 		uni.hideLoading()
+			// 	}, 1000)
+
+			// 	// 通过wxcode换取access_token
+			// 	this.get_access_token(wxcode)
+			// },
+			// 授权失败回调
+			loginFail() {
+				console.log(12);
+			},
+			// 授权取消回调
+			loginCancel() {
+				console.log(123);
+			},
+			async login() {
+				console.log(123);
+				let res = await this.$myRequest({
+					url: "/attendance/api/system/user/login/app",
+					method: "post",
+					data: {
+						redirect_uri: `${this.homeUrl}/attendance/api/system/user/login/app`,
+						wxcode: ""
+					}
+				})
+				console.log(res);
+			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.container {}
+
 </style>

pages/location/location.vue

@@ -58,23 +58,60 @@
 				imgUrl: ""
 			};
 		},
+		onLoad() {
+			// this.getLocationData()
+		},
 		methods: {
+			getLocationData() {
+				console.log(123);
+				uni.getLocation({
+					type: 'gcj02',
+					success: function(res) {
+						console.log('当前位置的经度：' + res.longitude);
+						console.log('当前位置的纬度：' + res.latitude);
+					}
+				});
+			},
 			// 点击拍照图标回调
 			handlePhoto() {
-				uni.chooseImage({
-					count: 1,
-					sourceType: ['camera'],
-					success: (res) => {
-						console.log(res);
-						console.log(res.tempFilePaths[0]);
-						console.log(JSON.stringify(res.tempFilePaths));
-						// this.imgUrl = JSON.stringify(res.tempFilePaths)
-						// console.log(this.imgUrl);
-						uni.navigateTo({
-							url: "/pages/authentication/authentication"
-						})
+				// 获取用户摄像头权限
+				uni.authorize({
+					scope: 'scope.camera',
+					success() {
+						// uni.navigateTo({
+						// 	url: "/pages/location/location"
+						// })
+						uni.chooseImage({
+							count: 1,
+							sourceType: ['camera'],
+							success: (res) => {
+								console.log(res);
+								console.log(res.tempFilePaths[0]);
+								console.log(JSON.stringify(res.tempFilePaths));
+								// this.imgUrl = JSON.stringify(res.tempFilePaths)
+								// console.log(this.imgUrl);
+								uni.navigateTo({
+									url: "/pages/authentication/authentication"
+								})
+							}
+						});
+					},
+					fail() {
+						uni.showModal({
+							title: '提示',
+							content: '请先开启摄像头权限，否则将无法使用打卡功能',
+							cancelText: '不授权',
+							confirmText: '授权',
+							success: function(res) {
+								if (res.confirm) {
+									uni.openSetting({
+										success(res) {}
+									})
+								} else if (res.cancel) {}
+							}
+						});
 					}
-				});
+				})
 			}
 		}
 	}

pages/my/my.vue

@@ -42,7 +42,7 @@
 						id: 4,
 						icon: "../../static/my4.png",
 						title: "考勤组",
-						url: "/pages/group/group"
+						url: "/pages/group/group?flag=1"
 					},
 				]
 			};

pages/particulars/particulars.vue

@@ -2,15 +2,15 @@
 	<view class="container">
 		<!-- 顶部搜索框区域 -->
 		<view class="search">
-			<uni-search-bar placeholder="请输入打卡规则名称" cancelButton="none" v-model="searchValue" @input="input"
-				@clear="clear" @blur="blur">
+			<uni-search-bar bgColor="#fff" placeholder="请输入打卡规则名称" cancelButton="none" v-model="searchValue"
+				@input="input" @clear="clear" @blur="blur">
 			</uni-search-bar>
 		</view>
 
 		<!-- 规则列表区域 -->
 		<view class="list">
 			<!-- 每一个规则区域 -->
-			<view class="box" v-for="item in list" :key="item.id">
+			<view class="box" v-for="item in list" :key="item.id" @click="handleLook">
 				<view class="icon">
 					<img src="./imgs/rule.png">
 				</view>
@@ -71,6 +71,11 @@
 			}
 		},
 		methods: {
+			handleLook() {
+				uni.navigateTo({
+					url: "/pages/rulesDetail/rulesDetail"
+				})
+			},
 			// 搜索框失焦回调
 			blur(res) {
 				uni.showToast({

pages/stat/stat.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 
 		<!-- 顶部分段器区域 -->
-		<view class="control">
+		<view class="control" v-if="flag">
 			<uni-segmented-control :current="current" :values="items" styleType="text" @clickItem="onClickItem"
 				activeColor="#0082FC"></uni-segmented-control>
 		</view>
@@ -47,7 +47,7 @@
 				<uni-calendar :showMonth="false" @change="change" :selected="list" />
 			</view>
 
-			<view class="calendar_foot">
+			<view class="calendar_foot" v-if="current==1">
 
 				<!-- 每一条记录区域 -->
 				<view class="foot_item" v-for="item in list2" :key="item.id">
@@ -62,10 +62,24 @@
 					</view>
 				</view>
 			</view>
+
+			<!-- 环形图区域 -->
+			<view class="progress" v-if="current==0">
+				<view class="chart">
+					<progressBar :progress_txt="progress_txt" :progress_total="progress_total" />
+				</view>
+
+				<view class="look">
+					<view class="info">
+						查看明细
+					</view>
+					<img src="../../static/right.png">
+				</view>
+			</view>
 		</view>
 
 		<!-- 异常人员名单区域 -->
-		<view class="errPeople">
+		<view class="errPeople" v-if="current==0">
 			<!-- 标题区域 -->
 			<view class="e_header">
 				<view class="left">
@@ -126,9 +140,14 @@
 </template>
 
 <script>
+	import progressBar from '../../components/chocolate-progress-bar/chocolate-progress-bar.vue'
 	export default {
+		components: {
+			progressBar
+		},
 		data() {
 			return {
+				flag: false,
 				list: [{
 						date: "2022-11-20",
 						info: ''
@@ -161,7 +180,7 @@
 				],
 				month: null,
 				items: ['团队统计', '我的统计'],
-				current: 0,
+				current: 1,
 				year: null,
 				month: null,
 				errList: [{
@@ -189,10 +208,15 @@
 						num: 30
 					},
 				],
+				progress_txt: 50,
+				progress_total: 70
 			};
 		},
 		onLoad() {
 			this.getTime()
+			if (this.flag) {
+				this.current = 0
+			}
 		},
 		computed: {
 			comMonth() {
@@ -218,6 +242,7 @@
 			},
 			onClickItem(e) {
 				console.log(e.currentIndex);
+				this.current = e.currentIndex
 				// if (e.currentIndex == 0) {
 				// 	this.list = this.list2
 				// } else {
@@ -226,9 +251,15 @@
 			},
 			// 跳转统计详情页面
 			goToDetail() {
-				uni.navigateTo({
-					url: `/pages/statDetail/statDetail?month=${this.month}`
-				})
+				if (this.current == 1) {
+					uni.navigateTo({
+						url: `/pages/statDetail/statDetail?month=${this.month}`
+					})
+				} else {
+					uni.navigateTo({
+						url: "/pages/particulars/particulars"
+					})
+				}
 			},
 			handleDoubleLeft() {
 				if (this.year <= 2000) {
@@ -394,7 +425,6 @@
 
 			.calendar_foot {
 				padding: 0 30rpx;
-				// margin-bottom: 80rpx;
 
 				.foot_item {
 					box-sizing: border-box;
@@ -428,6 +458,41 @@
 					}
 				}
 			}
+
+			.progress {
+				position: relative;
+				display: flex;
+				justify-content: center;
+				padding: 0 30rpx;
+				height: 121px;
+
+				.chart {
+					margin-top: 20rpx;
+					width: 170px;
+					height: 100%;
+				}
+
+				.look {
+					position: absolute;
+					top: 40rpx;
+					right: 36rpx;
+					display: flex;
+					align-items: center;
+					width: 150rpx;
+					height: 42rpx;
+
+					.info {
+						margin-right: 15rpx;
+						font-size: 28rpx;
+						color: #A6A6A6;
+					}
+
+					img {
+						width: 16rpx;
+						height: 24rpx;
+					}
+				}
+			}
 		}
 
 		.errPeople {

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

@@ -1,7 +1,9 @@
 {
   "pages": [
-    "pages/stat/stat",
+    "pages/index/index",
     "pages/home/home",
+    "pages/group/group",
+    "pages/stat/stat",
     "pages/my/my",
     "pages/ruleSet/ruleSet",
     "pages/punchTime/punchTime",
@@ -10,10 +12,8 @@
     "pages/particulars/particulars",
     "pages/punchLocation/punchLocation",
     "pages/addLocation/addLocation",
-    "pages/group/group",
     "pages/statDetail/statDetail",
     "pages/authentication/authentication",
-    "pages/index/index",
     "pages/powerSet/powerSet",
     "pages/cardRecord/cardRecord",
     "pages/addRules/addRules",
@@ -54,7 +54,17 @@
     ]
   },
   "lazyCodeLoading": "requiredComponents",
-  "permission": {},
+  "plugins": {
+    "myPlugin": {
+      "provider": "wx1549b963bbae9931",
+      "version": "4.0.0"
+    }
+  },
+  "permission": {
+    "scope.userLocation": {
+      "desc": "您的位置信息将用于记录打卡"
+    }
+  },
   "usingComponents": {
     "drop-down": "/uni_modules/zwx-dropDown/components/zwx-dropDown/zwx-dropDown"
   }

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

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

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

@@ -0,0 +1 @@
+<view class="progress_box data-v-29bc2478"><canvas class="progress_bg data-v-29bc2478" canvas-id="cpbg"></canvas><canvas class="progress_bar data-v-29bc2478" canvas-id="cpbar"></canvas><view class="progress_txt data-v-29bc2478"><view class="progress_info data-v-29bc2478">{{progress_txt+"/"+progress_total}}</view><text class="data-v-29bc2478">每日完成占比</text></view></view>

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

@@ -0,0 +1,41 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.progress_box.data-v-29bc2478 {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+}
+.progress_box .progress_bg.data-v-29bc2478 {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+}
+.progress_box .progress_bar.data-v-29bc2478 {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+}
+.progress_box .progress_txt.data-v-29bc2478 {
+  position: absolute;
+  padding-right: 20rpx;
+}
+.progress_box .progress_txt .progress_info.data-v-29bc2478 {
+  letter-spacing: 2rpx;
+  font-size: 36rpx;
+}
+.progress_box .progress_txt text.data-v-29bc2478 {
+  font-size: 22rpx;
+  color: #A6A6A6;
+}
+/* .progress_dot {
+	width: 16upx;
+	height: 16upx;
+	border-radius: 50%;
+	background-color: #fb9126;
+} */
+

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

@@ -3,7 +3,7 @@
 /* 水平间距 */
 .container.data-v-138ca3bc {
   height: 100vh;
-  background-color: #F2F2F2;
+  background-color: #fff;
 }
 .container .box.data-v-138ca3bc {
   display: flex;

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

@@ -42,6 +42,19 @@
   width: 750rpx;
   background-color: #fff;
 }
+.container .group .group_item .collapse_title.data-v-d900f0f4 {
+  display: flex;
+  align-items: center;
+  height: 79rpx;
+}
+.container .group .group_item .collapse_title .collapse_check.data-v-d900f0f4 {
+  margin-left: 30rpx;
+}
+.container .group .group_item .collapse_title .collapse_info.data-v-d900f0f4 {
+  margin-left: 10rpx;
+  font-size: 28rpx;
+  font-weight: 600;
+}
 .container .group .group_item .content.data-v-d900f0f4 {
   padding-bottom: 50rpx;
 }

unpackage/dist/dev/mp-weixin/pages/index/index.wxml

@@ -1 +1 @@
-<view class="container data-v-57280228"></view>
+<view class="data-v-57280228">123<block wx:if="{{showLogin}}"><view class="data-v-57280228"><login vue-id="8dd740cc-1" ocode="{{ocode}}" appkey="{{appKey}}" scope="snsapi_userinfo" visible="{{visible}}" data-event-opts="{{[['^success',[['loginSuccess']]],['^fail',[['loginFail']]],['^cancel',[['loginCancel']]]]}}" bind:success="__e" bind:fail="__e" bind:cancel="__e" class="data-v-57280228" bind:__l="__l"></login></view></block></view>

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

@@ -3,6 +3,7 @@
   "enablePullDownRefresh": false,
   "usingComponents": {
     "uni-segmented-control": "/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control",
-    "uni-calendar": "/uni_modules/uni-calendar/components/uni-calendar/uni-calendar"
+    "uni-calendar": "/uni_modules/uni-calendar/components/uni-calendar/uni-calendar",
+    "progress-bar": "/components/chocolate-progress-bar/chocolate-progress-bar"
   }
 }

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

@@ -121,6 +121,36 @@
 .container .calendar .calendar_foot .foot_item .box ._span.data-v-44536cf4 {
   margin-left: 18rpx;
 }
+.container .calendar .progress.data-v-44536cf4 {
+  position: relative;
+  display: flex;
+  justify-content: center;
+  padding: 0 30rpx;
+  height: 121px;
+}
+.container .calendar .progress .chart.data-v-44536cf4 {
+  margin-top: 20rpx;
+  width: 170px;
+  height: 100%;
+}
+.container .calendar .progress .look.data-v-44536cf4 {
+  position: absolute;
+  top: 40rpx;
+  right: 36rpx;
+  display: flex;
+  align-items: center;
+  width: 150rpx;
+  height: 42rpx;
+}
+.container .calendar .progress .look .info.data-v-44536cf4 {
+  margin-right: 15rpx;
+  font-size: 28rpx;
+  color: #A6A6A6;
+}
+.container .calendar .progress .look ._img.data-v-44536cf4 {
+  width: 16rpx;
+  height: 24rpx;
+}
 .container .errPeople.data-v-44536cf4 {
   margin: 0 auto;
   margin-top: 32rpx;

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

@@ -1,30 +1,29 @@
 {
-  "description": "项目配置文件。",
-  "packOptions": {
-    "ignore": [],
-    "include": []
-  },
-  "setting": {
-    "urlCheck": false,
-    "es6": false,
-    "postcss": false,
-    "minified": false,
-    "newFeature": true,
-    "bigPackageSizeSupport": true,
-    "ignoreUploadUnusedFiles": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
+    "description": "项目配置文件。",
+    "packOptions": {
+        "ignore": [],
+        "include": []
+    },
+    "setting": {
+        "urlCheck": false,
+        "es6": false,
+        "postcss": false,
+        "minified": false,
+        "newFeature": true,
+        "bigPackageSizeSupport": true,
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
+        }
+    },
+    "compileType": "miniprogram",
+    "libVersion": "2.28.0",
+    "appid": "wxb4d969974f931f62",
+    "projectname": "校园考勤打卡",
+    "condition": {},
+    "editorSetting": {
+        "tabIndent": "insertSpaces",
+        "tabSize": 4
     }
-  },
-  "compileType": "miniprogram",
-  "libVersion": "2.28.0",
-  "appid": "wxbf52cb973062d110",
-  "projectname": "clock-in",
-  "condition": {},
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
-  }
 }

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

@@ -1,7 +1,7 @@
 {
-  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "projectname": "mp-weixin",
-  "setting": {
-    "compileHotReLoad": true
-  }
+    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+    "projectname": "mp-weixin",
+    "setting": {
+        "compileHotReLoad": true
+    }
 }