打卡项目优化

manifest.json

@@ -1,99 +1,101 @@
 {
-	"name": "智慧校园水电",
-	"appid": "__UNI__D7AE6E0",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"usingComponents": true,
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		/* 模块配置 */
-		"modules": {},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"permissions": [
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
-					"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.INTERNET\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
-					"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
-				]
-			},
-			/* ios打包配置 */
-			"ios": {},
-			/* SDK配置 */
-			"sdkConfigs": {
-				"payment": {}
-			}
-		},
-		// ====================支持分包==================
-		"optimization": {
-			"subPackages": true
-		},
-		"runmode": "liberate" // 开启分包优化后，必须配置资源释放模式
-		// ====================支持分包==================
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "wxd6f090391d410534",
-		"setting": {
-			"urlCheck": false
-		},
-		"usingComponents": true,
-		"plugins": {
-			"myPlugin": {
-				"provider": "wx1549b963bbae9931",
-				"version": "4.0.0"
-			}
-		},
-		"permission": {
-			"scope.userLocation": {
-				"desc": "您的位置信息将用于连接热水表蓝牙"
-			}
-		},
-		"lazyCodeLoading": "requiredComponents",
-		"requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"uniStatistics": {
-		"enable": false
-	}
+    "name" : "智慧校园水电",
+    "appid" : "__UNI__D7AE6E0",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {},
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {},
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "payment" : {}
+            }
+        },
+        // ====================支持分包==================
+        "optimization" : {
+            "subPackages" : true
+        },
+        "runmode" : "liberate" // 开启分包优化后，必须配置资源释放模式
+    },
+    // ====================支持分包==================
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wxd6f090391d410534",
+        "setting" : {
+            "urlCheck" : false,
+            "es6" : true,
+            "minified" : true
+        },
+        "usingComponents" : true,
+        "plugins" : {
+            "myPlugin" : {
+                "provider" : "wx1549b963bbae9931",
+                "version" : "4.0.0"
+            }
+        },
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "您的位置信息将用于连接热水表蓝牙"
+            }
+        },
+        "lazyCodeLoading" : "requiredComponents",
+        "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    }
 }

pagesClockIn/home/home.vue

@@ -145,7 +145,7 @@
 				// 当前页面的路由地址
 				pageUrl: "",
 				// 是否显示底部 我的 导航栏
-				showTab: true
+				showTab: false
 			};
 		},
 		onLoad() {
@@ -219,9 +219,10 @@
 			},
 			// 获取用户详细信息
 			async getUserInfo() {
-				let userId = uni.getStorageSync("userInfo").id
+				// let userId = uni.getStorageSync("userInfo").id
 				let res = await this.$myRequest_clockIn({
-					url: `/attendance/api/system/user/detail/${userId}`,
+					// url: `/attendance/api/system/user/detail/${userId}`,
+					url: `/attendance/api/system/user/detail`,
 				})
 				// console.log(res);
 				if (res.code == 200) {

pagesClockIn/index/index.vue

@@ -105,7 +105,7 @@
 				})
 				// console.log(res);
 				if (res.code == 200) {
-					uni.setStorageSync("userInfo", res.data)
+					// uni.setStorageSync("userInfo", res.data)
 					uni.setStorageSync("token", res.data.token)
 					uni.reLaunch({
 						url: "/pagesClockIn/home/home"

pagesClockIn/stat/stat.vue

@@ -50,15 +50,18 @@
 			<view class="calendar_foot" v-if="current==1">
 
 				<!-- 每一条记录区域 -->
-				<view class="foot_item" v-for="item in list2" :key="item.id">
+				<view class="foot_item" v-for="(item,index) in list2" :key="index">
 					<view>
 						规则：{{item.ruleName}} {{item.timeRange}}
 					</view>
 					<view class="box">
-						<view class="circular" v-if="item.finish"></view>
+						<view class="circular" v-if="item.status==4"></view>
 						<view class="circular color" v-else></view>
-						{{item.finish?"已打卡":"未打卡"}}
-						<span v-if="item.finish">{{format_time(item.updateTime)}}</span>
+						<view v-if="item.status==1">未开始</view>
+						<view v-if="item.status==2">已开始</view>
+						<view v-if="item.status==3">已超时</view>
+						<view v-if="item.status==4">已打卡</view>
+						<span v-if="item.status==4">{{format_time(item.updateTime)}}</span>
 					</view>
 				</view>
 			</view>
@@ -237,9 +240,9 @@
 				// 异常人员名单总条数
 				total: 0,
 				// 个人考勤规则列表当前页
-				page_my: 1,
+				// page_my: 1,
 				// 个人考勤规则列表总条数
-				total_my: 0,
+				// total_my: 0,
 				// 环形图显示隐藏控制
 				showBar: false,
 				// 当前页面的路由地址
@@ -303,17 +306,18 @@
 						icon: 'none'
 					})
 				}
-			} else {
-				if (this.list2.length < this.total_my) {
-					this.page_my++
-					this.getRulesList()
-				} else {
-					uni.showToast({
-						title: "没有更多数据了",
-						icon: 'none'
-					})
-				}
-			}
+			} 
+			// else {
+			// 	if (this.list2.length < this.total_my) {
+			// 		this.page_my++
+			// 		this.getRulesList()
+			// 	} else {
+			// 		uni.showToast({
+			// 			title: "没有更多数据了",
+			// 			icon: 'none'
+			// 		})
+			// 	}
+			// }
 		},
 		methods: {
 			getPageUrl() {
@@ -404,19 +408,19 @@
 
 			// 获取打卡规则列表
 			async getRulesList() {
-				let name = uni.getStorageSync("userInfo").username
+				// let name = uni.getStorageSync("userInfo").username
 				let res = await this.$myRequest_clockIn({
-					url: "/attendance/api/sign/check/in/list",
+					url: "/attendance/api/sign/check/in/list/day",
 					data: {
-						name,
-						page: this.page_my,
-						updateTimeBegin: this.nowTime
+						// page: this.page_my,
+						time: this.nowTime
 					}
 				})
 				// console.log(res);
 				if (res.code == 200) {
-					this.list2 = [...this.list2, ...res.data.list]
-					this.total_my = res.data.total
+					// this.list2 = [...this.list2, ...res.data]
+					this.list2 = res.data
+					// this.total_my = res.data.total
 				}
 			},
 
@@ -427,8 +431,8 @@
 				if (this.current == 0) {
 					this.getProportion()
 				} else {
-					this.list2 = []
-					this.page_my = 1
+					// this.list2 = []
+					// this.page_my = 1
 					this.getRulesList()
 				}
 			},
@@ -436,7 +440,7 @@
 			onClickItem(e) {
 				this.fail_count = ""
 				this.success_count = ""
-				this.list2 = []
+				// this.list2 = []
 				this.errList = []
 				// console.log(e.currentIndex);
 				this.current = e.currentIndex

pagesClockIn/util/api.js

@@ -31,6 +31,7 @@ export const myRequest_clockIn = (options) => {
 								if (res.data.code == 200) {
 									uni.removeStorageSync("manager")
 									uni.removeStorageSync("sub-administrator")
+									uni.removeStorageSync("userInfo")
 									uni.showModal({
 										title: "提示",
 										content: "用户权限变更，请重新授权",
@@ -38,7 +39,7 @@ export const myRequest_clockIn = (options) => {
 										success: function(res) {
 											if (res.confirm) {
 												uni.reLaunch({
-													url: "/pagesClockIn/home/home",
+													url: "/pagesClockIn/index/index",
 												});
 											}
 										},