no message

pages.json

@@ -11,7 +11,7 @@
 			"style": {
 				"navigationBarTitleText": "智慧校园打卡",
 				// "navigationStyle": "custom",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}
 		},  {
 			"path": "pages/404/404",

pages/authentication/authentication.vue

@@ -4,7 +4,7 @@
 			拍摄您本人人脸，确保对准手机，光线充足
 		</view>
 		<view class="msg">
-			罗东 265656862656521
+			{{name}} {{cardNumber}}
 		</view>
 		<view class="info">
 			<span v-if="tipsText">{{tipsText}}</span>
@@ -45,18 +45,41 @@
 			return {
 				// 错误文案提示
 				tipsText: '',
-				// 本地图片路径
+				// 当前时间
+				nowTime: "",
+				// 本地图片路径 被匹对照片
 				tempImg: '',
+				// 场景照片
+				sceneImage: "",
+				// 经纬度
+				lat: "",
+				lng: "",
+				// 地址
+				location: "",
+				// 规则id
+				id: "",
 				// 相机引擎
 				cameraEngine: null,
 				// 是否拥有相机权限
 				isAuthCamera: true,
-				// 当前时间
-				nowTime: "",
+				// 姓名
+				name: "",
+				// 身份证号
+				cardNumber: ""
 			};
 		},
 		onLoad(options) {
+			this.id = options.id
+			this.lat = options.latitude
+			this.lng = options.longitude
+			this.location = options.address
+			this.sceneImage = options.imgUrl
 			this.initData()
+			let userInfo = uni.getStorageSync("userInfo")
+			if (userInfo) {
+				this.name = userInfo.name
+				this.cardNumber = userInfo.cardNumber
+			}
 		},
 		methods: {
 			// 初始化相机引擎
@@ -155,19 +178,35 @@
 			// 上传
 			handleOkClick() {
 				//  这里的 this.tempImg 是经过人脸检测后  拍照拿到的路径  
-				this.upLoadOne(this.tempImg)
+				this.upLoadOne()
 			},
-			upLoadOne(imgPath) {
+			upLoadOne() {
 				uni.showLoading({
 					title: "检测中，请稍后...",
 				});
-				setTimeout(() => {
-					uni.hideLoading();
-					this.getNowTime()
-					this.$refs.popup.open()
+				setTimeout(async () => {
+					let res = await this.$myRequest({
+						url: "/attendance/api/sign/check/in/update",
+						method: "put",
+						header: {
+							'Authorization': uni.getStorageSync("token") ||
+								'eyJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjo1MDQ2LCJ1c2VyX3V1aWQiOjEzNDc3NzE0NzM1NTY5NzE1MiwibmJmIjoxNjcxMTU1ODQzfQ.u4-N762Ijfb9RkuuFOFkeMiJQI9uCi0IaheJlGwi5Ms'
+						},
+						data: {
+							id: this.id,
+							lat: this.lat,
+							lng: this.lng,
+							location: this.location,
+							matchFaceImage: this.tempImg,
+							sceneImage: this.sceneImage,
+						}
+					})
+					// console.log(res);
+					if (res.code == 200) {
+						this.getNowTime()
+						this.$refs.popup.open()
+					}
 				}, 2000)
-				//  然后这里imgPath 传过来的是 要上传的临时本地图片的路径
-				//  具体上传方法根据自己的请求方式   请求自己的接口
 			},
 			// 点击 我知道了按钮 跳回首页
 			handleGoHome() {
@@ -183,7 +222,6 @@
 				let minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
 				let seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
 				this.nowTime = hours + ':' + minutes + ':' + seconds
-				// console.log(this.nowTime);
 			}
 		},
 	}

pages/home/home.vue

@@ -20,7 +20,8 @@
 			<!-- 卡片区域 -->
 			<view class="card" v-if="list.length">
 				<!-- 每一个卡片区域 -->
-				<view class="item" v-for="item in list" :key="item.id">
+				<view :class="activeid ==item.id?'active_box':'item'" v-for="item in list" :key="item.id"
+					@click="handleClick(item)">
 					<view class="item_box">
 						<view class="title">
 							{{item.ruleName}}
@@ -29,9 +30,9 @@
 							{{item.timeRange}}
 						</view>
 						<view class="type">
-							<img v-if="item.updateTime" src="./imgs/success.png">
-							<span v-if="item.updateTime">{{item.updateTime}}</span>
-							{{item.updateTime?"已打卡":"未打卡"}}
+							<img v-if="item.status==4" src="./imgs/success.png">
+							<span v-if="item.status==4">{{item.updateTime}}</span>
+							{{item.status==4?"已打卡":"未打卡"}}
 						</view>
 					</view>
 				</view>
@@ -41,7 +42,7 @@
 			<view class="card" v-else></view>
 
 			<!-- 打卡区域 -->
-			<view :class="{clock:flags,active:!flags}" @click="handlePunch">
+			<view :class="{clock:flags,active:!flags}" @click="handlePunch(contrastObj)">
 				<view class="info" v-if="flags">
 					打卡
 				</view>
@@ -52,31 +53,15 @@
 					{{nowTime}}
 				</view>
 			</view>
-			
+
 			<!-- 提示信息位置 -->
 			<view class="address" v-if="flags">
-				{{notes}}
+				{{address}}
 			</view>
 
-			<view class="address" v-if="!flags">
-				无打卡任务无需打卡
-			</view>
-
-			<!-- <view class="address" v-if="addressFlags&&!flags">
-				不在管理员设定范围打卡
-			</view>
-			<view class="address" v-if="timeFlags&&!flags">
-				未到打卡时间无法打卡
-			</view>
-			
-			<view class="address" v-if="!list.length">
-				今日休息无需打卡
+			<view class="address" v-else>
+				{{notes}}
 			</view>
-
-			<view class="address" v-if="!list.length">
-				下一次打卡时间段为18:00-19:00
-			</view> -->
-
 		</view>
 	</view>
 </template>
@@ -91,25 +76,36 @@
 				userInfo: {},
 				// 打卡规则列表
 				list: [],
-				// 是否在打卡范围内标识
-				addressFlags: false,
-				// 是否在打卡时间内标识
-				timeFlags: false,
 				// 当前时间
 				nowTime: "",
 				// 当前定位位置信息
 				address: "",
 				// 定时器标识
 				timer: null,
-				notes:""
+				// 提示信息
+				notes: "",
+				// 当前显示的是哪个规则id
+				activeid: null,
+				// 当前时间的时间戳
+				timestamp: null,
+				// 当前显示的规则具体信息
+				contrastObj: {},
+				// 当前用户定位经度
+				myLng: 0,
+				// 当前用户定位纬度
+				myLat: 0,
+				// 签到点中心经度
+				centerLng: 0,
+				// 签到点中心纬度
+				centerLat: 0,
+				// 签到半径
+				radius: 0,
+				// 距离签到点的距离
+				distance: 0,
+				// 是否可以打卡的标识
+				flags: true
 			};
 		},
-		computed: {
-			// 是否有打卡任务的标识
-			flags() {
-				return this.list.length ? true : false
-			}
-		},
 		onLoad() {
 			uni.removeStorageSync("manager")
 			uni.removeStorageSync("sub-administrator")
@@ -118,9 +114,15 @@
 				// 申请的key
 				key: 'R43BZ-2XROX-L7T45-T5OQI-IBDFT-GNBOI'
 			});
+			// 获取当前系统时间
 			this.getNowTime()
+			// 获取当前时间的时间戳
+			this.getTimestamp()
+			// 获取用户的个人信息数据
 			this.getUserInfo()
+			// 获取当前位置的详细信息
 			this.getLocationData()
+			// 获取当天的打卡列表数组
 			this.getRulesList()
 		},
 		onUnload() {
@@ -128,6 +130,23 @@
 				clearInterval(this.timer)
 			}
 		},
+		// 下拉刷新
+		onPullDownRefresh() {
+			uni.removeStorageSync("manager")
+			uni.removeStorageSync("sub-administrator")
+			qqmapsdk = new QQMapWX({
+				// 申请的key
+				key: 'R43BZ-2XROX-L7T45-T5OQI-IBDFT-GNBOI'
+			});
+			this.getNowTime()
+			this.getTimestamp()
+			this.getUserInfo()
+			this.getLocationData()
+			this.getRulesList()
+			setTimeout(() => {
+				uni.stopPullDownRefresh()
+			}, 1500)
+		},
 		methods: {
 			// 获取当前时间
 			getNowTime() {
@@ -140,10 +159,15 @@
 						let minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
 						let seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
 						this.nowTime = hours + ':' + minutes + ':' + seconds
-						// console.log(this.nowTime);
 					}, 1000)
 				}
 			},
+			// 获取当前时间的时间戳
+			getTimestamp() {
+				let dates = new Date()
+				let times = dates.getTime()
+				this.timestamp = times
+			},
 			// 获取用户详细信息
 			async getUserInfo() {
 				let userId = uni.getStorageSync("userInfo").id || 5046
@@ -153,7 +177,7 @@
 				// console.log(res);
 				if (res.code == 200) {
 					this.userInfo = res.data
-
+					uni.setStorageSync("userInfo", this.userInfo)
 					if (this.userInfo.roles) {
 						let temList = []
 						this.userInfo.roles.forEach((ele) => {
@@ -176,8 +200,10 @@
 					success: (res) => {
 						// console.log(res);
 						if (res.status == 0) {
-							// 获取详细地址信息
-							this.notes = res.result.address
+							// 获取详细地址信息 经纬度
+							this.address = res.result.address
+							this.myLat = res.result.location.lat
+							this.myLng = res.result.location.lng
 						} else {
 							uni.showToast({
 								title: "请求定位失败",
@@ -189,28 +215,90 @@
 			},
 			// 获取打卡规则列表
 			async getRulesList() {
-				// let name = uni.getStorageSync("userInfo").username
 				let res = await this.$myRequest({
 					url: "/attendance/api/sign/check/in/list/today",
-					// data: {
-					// 	name: name ? name : "",
-					// 	size: 999
-					// }
 				})
 				// console.log(res);
 				if (res.code == 200) {
-					this.list = res.data.reverse()
+					if (res.data.length == 0) {
+						this.flags = false
+						this.notes = "无打卡任务无需打卡"
+					} else {
+						this.list = res.data.reverse()
+						this.activeid = this.list[0].id
+						this.contrastObj = this.list[0]
+						// console.log(this.contrastObj);
+						this.changeType()
+					}
 				}
 			},
+			// 对比信息改变打卡的状态显示
+			changeType() {
+				// 没有到打卡时间 或者 超过打卡时间 的状态
+				if (this.timestamp < this.contrastObj.beginTime || this.timestamp > this.contrastObj.endTime) {
+					console.log(1);
+					this.flags = false
+					this.notes = "未到打卡时间无法打卡"
+				}
+				// 到了打卡时间,判断是否在打卡范围内
+				else {
+					console.log(2);
+					if (this.contrastObj.locations.length) {
+						let temList = []
+						temList = this.contrastObj.locations.map((ele) => {
+							this.centerLat = ele.lat
+							this.centerLng = ele.lng
+							this.radius = ele.radius
+
+							let red1 = this.myLat * Math.PI / 180.0;
+							let red2 = this.centerLat * Math.PI / 180.0;
+							let a = red1 - red2;
+							let b = this.myLng * Math.PI / 180.0 - this.centerLng * Math.PI / 180.0;
+							let R = 6378137;
+							let distance = R * 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(
+									red1) *
+								Math.cos(red2) *
+								Math.pow(Math.sin(b / 2), 2)));
+							this.distance = distance.toFixed(2) * 1;
+
+							if (this.distance <= this.radius) {
+								return true
+							} else {
+								return false
+							}
+						})
+						let temFlag
+						temFlag = temList.some((item) => {
+							item = true
+						})
+						if (!temFlag) {
+							this.flags = false
+							this.notes = "不在管理员设定范围内，无法打卡"
+						} else {
+							this.flags = true
+						}
+					}
+				}
+			},
+			// 点击每一个打卡规则回调
+			handleClick(item) {
+				// console.log(item);
+				this.getTimestamp()
+				this.contrastObj = item
+				this.activeid = item.id
+				this.changeType()
+			},
 			// 点击打卡按钮回调
-			handlePunch() {
+			handlePunch(info) {
 				if (this.flags) {
+					let obj = JSON.stringify(info)
+
 					// 获取用户位置权限
 					uni.authorize({
 						scope: 'scope.userLocation',
 						success() {
 							uni.navigateTo({
-								url: "/pages/location/location"
+								url: `/pages/location/location?obj=${obj}`
 							})
 						},
 						fail() {
@@ -224,7 +312,7 @@
 										uni.openSetting({
 											success(res) {}
 										})
-									} else if (res.cancel) {}
+									}
 								}
 							});
 						}
@@ -287,6 +375,45 @@
 				height: 160rpx;
 				overflow-x: auto;
 
+				.active_box {
+					display: inline-block;
+					margin: 0 15rpx;
+					width: 300rpx;
+					height: 130rpx;
+					line-height: 12rpx;
+					border-radius: 8rpx;
+					font-weight: 400;
+					background-color: #E6E6E6;
+					border: 1rpx solid #0094FC;
+
+					.item_box {
+						display: flex;
+						flex-direction: column;
+						justify-content: space-evenly;
+						height: 130rpx;
+						padding-left: 30rpx;
+
+						.title {
+							font-size: 28rpx;
+						}
+
+						.time {
+							font-size: 24rpx;
+						}
+
+						.type {
+							font-size: 24rpx;
+							color: #808080;
+
+							img {
+								margin-right: 10rpx;
+								width: 20rpx;
+								height: 20rpx;
+							}
+						}
+					}
+				}
+
 				.item {
 					display: inline-block;
 					margin: 0 15rpx;
@@ -297,6 +424,7 @@
 					font-weight: 400;
 					background-color: #E6E6E6;
 
+
 					.item_box {
 						display: flex;
 						flex-direction: column;

pages/location/location.vue

@@ -34,7 +34,7 @@
 			<!-- 提示倒计时区域 -->
 			<view class="bottom">
 				<view class="button">
-					请在08:00-09:00时间段之内提交打卡
+					请在{{timeRange}}时间段之内提交打卡
 				</view>
 			</view>
 		</view>
@@ -62,10 +62,17 @@
 				// 照片信息
 				imgUrl: "",
 				// 定位位置信息
-				address: ""
+				address: "",
+				// 时间段信息
+				timeRange: "",
+				// 规则id
+				id: ""
 			};
 		},
-		onLoad() {
+		onLoad(options) {
+			let obj = JSON.parse(options.obj)
+			this.timeRange = obj.timeRange
+			this.id = obj.id
 			// 实例化API核心类
 			qqmapsdk = new QQMapWX({
 				// 申请的key
@@ -79,7 +86,6 @@
 				qqmapsdk.reverseGeocoder({
 					success: (res) => {
 						// console.log(res);
-						// console.log(res.result);
 						if (res.status == 0) {
 							// 获取详细地址信息
 							this.address = res.result.address
@@ -114,18 +120,17 @@
 				// 获取用户摄像头权限
 				uni.authorize({
 					scope: 'scope.camera',
-					success() {
+					success: () => {
 						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);
+								// console.log(res);
+								// console.log(res.tempFilePaths[0]);
+								// console.log(JSON.stringify(res.tempFilePaths));
+								let imgUrl = res.tempFilePaths[0]
 								uni.navigateTo({
-									url: "/pages/authentication/authentication"
+									url: `/pages/authentication/authentication?imgUrl=${imgUrl}&id=${this.id}&address=${this.address}&latitude=${this.latitude}&longitude=${this.longitude}`
 								})
 							}
 						});
@@ -141,7 +146,7 @@
 									uni.openSetting({
 										success(res) {}
 									})
-								} else if (res.cancel) {}
+								}
 							}
 						});
 					}

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

@@ -732,8 +732,8 @@ function populateParameters(result) {
     appVersion: "1.0.0",
     appVersionCode: "100",
     appLanguage: getAppLanguage(hostLanguage),
-    uniCompileVersion: "3.6.14",
-    uniRuntimeVersion: "3.6.14",
+    uniCompileVersion: "3.6.15",
+    uniRuntimeVersion: "3.6.15",
     uniPlatform: undefined || "mp-weixin",
     deviceBrand: deviceBrand,
     deviceModel: model,
@@ -14316,29 +14316,17 @@ function createAnimation(option, _this) {
 /***/ }),
 
 /***/ 39:
-/*!**********************************************************!*\
-  !*** ./node_modules/@babel/runtime/regenerator/index.js ***!
-  \**********************************************************/
+/*!************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/@babel/runtime/regenerator/index.js ***!
+  \************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-var _typeof = __webpack_require__(/*! @babel/runtime/helpers/typeof */ 12);
 // TODO(Babel 8): Remove this file.
 
-var runtime = __webpack_require__(/*! ../helpers/regeneratorRuntime */ 40)();
+var runtime = __webpack_require__(/*! @babel/runtime/helpers/regeneratorRuntime */ 40)();
 module.exports = runtime;
 
-// Copied from https://github.com/facebook/regenerator/blob/main/packages/runtime/runtime.js#L736=
-try {
-  regeneratorRuntime = runtime;
-} catch (accidentalStrictMode) {
-  if ((typeof globalThis === "undefined" ? "undefined" : _typeof(globalThis)) === "object") {
-    globalThis.regeneratorRuntime = runtime;
-  } else {
-    Function("r", "regeneratorRuntime = r")(runtime);
-  }
-}
-
 /***/ }),
 
 /***/ 4:

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

@@ -169,10 +169,13 @@ __webpack_require__.r(__webpack_exports__);
 "use strict";
 /* WEBPACK VAR INJECTION */(function(uni) {
 
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 3);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 39));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 41));
 //
 //
 //
@@ -219,18 +222,41 @@ var _default = {
     return {
       // 错误文案提示
       tipsText: '',
-      // 本地图片路径
+      // 当前时间
+      nowTime: "",
+      // 本地图片路径 被匹对照片
       tempImg: '',
+      // 场景照片
+      sceneImage: "",
+      // 经纬度
+      lat: "",
+      lng: "",
+      // 地址
+      location: "",
+      // 规则id
+      id: "",
       // 相机引擎
       cameraEngine: null,
       // 是否拥有相机权限
       isAuthCamera: true,
-      // 当前时间
-      nowTime: ""
+      // 姓名
+      name: "",
+      // 身份证号
+      cardNumber: ""
     };
   },
   onLoad: function onLoad(options) {
+    this.id = options.id;
+    this.lat = options.latitude;
+    this.lng = options.longitude;
+    this.location = options.address;
+    this.sceneImage = options.imgUrl;
     this.initData();
+    var userInfo = uni.getStorageSync("userInfo");
+    if (userInfo) {
+      this.name = userInfo.name;
+      this.cardNumber = userInfo.cardNumber;
+    }
   },
   methods: {
     // 初始化相机引擎
@@ -324,20 +350,49 @@ var _default = {
     // 上传
     handleOkClick: function handleOkClick() {
       //  这里的 this.tempImg 是经过人脸检测后  拍照拿到的路径  
-      this.upLoadOne(this.tempImg);
+      this.upLoadOne();
     },
-    upLoadOne: function upLoadOne(imgPath) {
+    upLoadOne: function upLoadOne() {
       var _this3 = this;
       uni.showLoading({
         title: "检测中，请稍后..."
       });
-      setTimeout(function () {
-        uni.hideLoading();
-        _this3.getNowTime();
-        _this3.$refs.popup.open();
-      }, 2000);
-      //  然后这里imgPath 传过来的是 要上传的临时本地图片的路径
-      //  具体上传方法根据自己的请求方式   请求自己的接口
+      setTimeout( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var res;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return _this3.$myRequest({
+                  url: "/attendance/api/sign/check/in/update",
+                  method: "put",
+                  header: {
+                    'Authorization': uni.getStorageSync("token") || 'eyJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjo1MDQ2LCJ1c2VyX3V1aWQiOjEzNDc3NzE0NzM1NTY5NzE1MiwibmJmIjoxNjcxMTU1ODQzfQ.u4-N762Ijfb9RkuuFOFkeMiJQI9uCi0IaheJlGwi5Ms'
+                  },
+                  data: {
+                    id: _this3.id,
+                    lat: _this3.lat,
+                    lng: _this3.lng,
+                    location: _this3.location,
+                    matchFaceImage: _this3.tempImg,
+                    sceneImage: _this3.sceneImage
+                  }
+                });
+              case 2:
+                res = _context.sent;
+                // console.log(res);
+                if (res.code == 200) {
+                  _this3.getNowTime();
+                  _this3.$refs.popup.open();
+                }
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      })), 2000);
     },
     // 点击 我知道了按钮 跳回首页
     handleGoHome: function handleGoHome() {
@@ -353,7 +408,6 @@ var _default = {
       var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();
       var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds();
       this.nowTime = hours + ':' + minutes + ':' + seconds;
-      // console.log(this.nowTime);
     }
   }
 };

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

@@ -105,7 +105,7 @@ var render = function () {
   var l0 = _vm.list.length
     ? _vm.__map(_vm.list, function (item, __i0__) {
         var $orig = _vm.__get_orig(item)
-        var m0 = item.updateTime ? __webpack_require__(/*! ./imgs/success.png */ 46) : null
+        var m0 = item.status == 4 ? __webpack_require__(/*! ./imgs/success.png */ 46) : null
         return {
           $orig: $orig,
           m0: m0,
@@ -230,21 +230,6 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
 
 var QQMapWX = __webpack_require__(/*! ../../util/qqmap-wx-jssdk1.1/qqmap-wx-jssdk */ 49);
 var qqmapsdk;
@@ -255,25 +240,36 @@ var _default = {
       userInfo: {},
       // 打卡规则列表
       list: [],
-      // 是否在打卡范围内标识
-      addressFlags: false,
-      // 是否在打卡时间内标识
-      timeFlags: false,
       // 当前时间
       nowTime: "",
       // 当前定位位置信息
       address: "",
       // 定时器标识
       timer: null,
-      notes: ""
+      // 提示信息
+      notes: "",
+      // 当前显示的是哪个规则id
+      activeid: null,
+      // 当前时间的时间戳
+      timestamp: null,
+      // 当前显示的规则具体信息
+      contrastObj: {},
+      // 当前用户定位经度
+      myLng: 0,
+      // 当前用户定位纬度
+      myLat: 0,
+      // 签到点中心经度
+      centerLng: 0,
+      // 签到点中心纬度
+      centerLat: 0,
+      // 签到半径
+      radius: 0,
+      // 距离签到点的距离
+      distance: 0,
+      // 是否可以打卡的标识
+      flags: true
     };
   },
-  computed: {
-    // 是否有打卡任务的标识
-    flags: function flags() {
-      return this.list.length ? true : false;
-    }
-  },
   onLoad: function onLoad() {
     uni.removeStorageSync("manager");
     uni.removeStorageSync("sub-administrator");
@@ -282,9 +278,15 @@ var _default = {
       // 申请的key
       key: 'R43BZ-2XROX-L7T45-T5OQI-IBDFT-GNBOI'
     });
+    // 获取当前系统时间
     this.getNowTime();
+    // 获取当前时间的时间戳
+    this.getTimestamp();
+    // 获取用户的个人信息数据
     this.getUserInfo();
+    // 获取当前位置的详细信息
     this.getLocationData();
+    // 获取当天的打卡列表数组
     this.getRulesList();
   },
   onUnload: function onUnload() {
@@ -292,6 +294,23 @@ var _default = {
       clearInterval(this.timer);
     }
   },
+  // 下拉刷新
+  onPullDownRefresh: function onPullDownRefresh() {
+    uni.removeStorageSync("manager");
+    uni.removeStorageSync("sub-administrator");
+    qqmapsdk = new QQMapWX({
+      // 申请的key
+      key: 'R43BZ-2XROX-L7T45-T5OQI-IBDFT-GNBOI'
+    });
+    this.getNowTime();
+    this.getTimestamp();
+    this.getUserInfo();
+    this.getLocationData();
+    this.getRulesList();
+    setTimeout(function () {
+      uni.stopPullDownRefresh();
+    }, 1500);
+  },
   methods: {
     // 获取当前时间
     getNowTime: function getNowTime() {
@@ -305,10 +324,15 @@ var _default = {
           var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();
           var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds();
           _this.nowTime = hours + ':' + minutes + ':' + seconds;
-          // console.log(this.nowTime);
         }, 1000);
       }
     },
+    // 获取当前时间的时间戳
+    getTimestamp: function getTimestamp() {
+      var dates = new Date();
+      var times = dates.getTime();
+      this.timestamp = times;
+    },
     // 获取用户详细信息
     getUserInfo: function getUserInfo() {
       var _this2 = this;
@@ -328,6 +352,7 @@ var _default = {
                 // console.log(res);
                 if (res.code == 200) {
                   _this2.userInfo = res.data;
+                  uni.setStorageSync("userInfo", _this2.userInfo);
                   if (_this2.userInfo.roles) {
                     temList = [];
                     _this2.userInfo.roles.forEach(function (ele) {
@@ -358,8 +383,10 @@ var _default = {
         success: function success(res) {
           // console.log(res);
           if (res.status == 0) {
-            // 获取详细地址信息
-            _this3.notes = res.result.address;
+            // 获取详细地址信息 经纬度
+            _this3.address = res.result.address;
+            _this3.myLat = res.result.location.lat;
+            _this3.myLng = res.result.location.lng;
           } else {
             uni.showToast({
               title: "请求定位失败",
@@ -381,16 +408,21 @@ var _default = {
                 _context2.next = 2;
                 return _this4.$myRequest({
                   url: "/attendance/api/sign/check/in/list/today"
-                  // data: {
-                  // 	name: name ? name : "",
-                  // 	size: 999
-                  // }
                 });
               case 2:
                 res = _context2.sent;
                 // console.log(res);
                 if (res.code == 200) {
-                  _this4.list = res.data.reverse();
+                  if (res.data.length == 0) {
+                    _this4.flags = false;
+                    _this4.notes = "无打卡任务无需打卡";
+                  } else {
+                    _this4.list = res.data.reverse();
+                    _this4.activeid = _this4.list[0].id;
+                    _this4.contrastObj = _this4.list[0];
+                    // console.log(this.contrastObj);
+                    _this4.changeType();
+                  }
                 }
               case 4:
               case "end":
@@ -400,15 +432,69 @@ var _default = {
         }, _callee2);
       }))();
     },
+    // 对比信息改变打卡的状态显示
+    changeType: function changeType() {
+      var _this5 = this;
+      // 没有到打卡时间 或者 超过打卡时间 的状态
+      if (this.timestamp < this.contrastObj.beginTime || this.timestamp > this.contrastObj.endTime) {
+        console.log(1);
+        this.flags = false;
+        this.notes = "未到打卡时间无法打卡";
+      }
+      // 到了打卡时间,判断是否在打卡范围内
+      else {
+        console.log(2);
+        if (this.contrastObj.locations.length) {
+          var temList = [];
+          temList = this.contrastObj.locations.map(function (ele) {
+            _this5.centerLat = ele.lat;
+            _this5.centerLng = ele.lng;
+            _this5.radius = ele.radius;
+            var red1 = _this5.myLat * Math.PI / 180.0;
+            var red2 = _this5.centerLat * Math.PI / 180.0;
+            var a = red1 - red2;
+            var b = _this5.myLng * Math.PI / 180.0 - _this5.centerLng * Math.PI / 180.0;
+            var R = 6378137;
+            var distance = R * 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(red1) * Math.cos(red2) * Math.pow(Math.sin(b / 2), 2)));
+            _this5.distance = distance.toFixed(2) * 1;
+            if (_this5.distance <= _this5.radius) {
+              return true;
+            } else {
+              return false;
+            }
+          });
+          var temFlag;
+          temFlag = temList.some(function (item) {
+            item = true;
+          });
+          if (!temFlag) {
+            this.flags = false;
+            this.notes = "不在管理员设定范围内，无法打卡";
+          } else {
+            this.flags = true;
+          }
+        }
+      }
+    },
+    // 点击每一个打卡规则回调
+    handleClick: function handleClick(item) {
+      // console.log(item);
+      this.getTimestamp();
+      this.contrastObj = item;
+      this.activeid = item.id;
+      this.changeType();
+    },
     // 点击打卡按钮回调
-    handlePunch: function handlePunch() {
+    handlePunch: function handlePunch(info) {
       if (this.flags) {
+        var obj = JSON.stringify(info);
+
         // 获取用户位置权限
         uni.authorize({
           scope: 'scope.userLocation',
           success: function success() {
             uni.navigateTo({
-              url: "/pages/location/location"
+              url: "/pages/location/location?obj=".concat(obj)
             });
           },
           fail: function fail() {
@@ -422,7 +508,7 @@ var _default = {
                   uni.openSetting({
                     success: function success(res) {}
                   });
-                } else if (res.cancel) {}
+                }
               }
             });
           }

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

@@ -1,5 +1,5 @@
 {
   "navigationBarTitleText": "智慧校园打卡",
-  "enablePullDownRefresh": false,
+  "enablePullDownRefresh": true,
   "usingComponents": {}
 }

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

@@ -46,6 +46,39 @@
   height: 160rpx;
   overflow-x: auto;
 }
+.container .body .card .active_box.data-v-92bb8f34 {
+  display: inline-block;
+  margin: 0 15rpx;
+  width: 300rpx;
+  height: 130rpx;
+  line-height: 12rpx;
+  border-radius: 8rpx;
+  font-weight: 400;
+  background-color: #E6E6E6;
+  border: 1rpx solid #0094FC;
+}
+.container .body .card .active_box .item_box.data-v-92bb8f34 {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-evenly;
+  height: 130rpx;
+  padding-left: 30rpx;
+}
+.container .body .card .active_box .item_box .title.data-v-92bb8f34 {
+  font-size: 28rpx;
+}
+.container .body .card .active_box .item_box .time.data-v-92bb8f34 {
+  font-size: 24rpx;
+}
+.container .body .card .active_box .item_box .type.data-v-92bb8f34 {
+  font-size: 24rpx;
+  color: #808080;
+}
+.container .body .card .active_box .item_box .type ._img.data-v-92bb8f34 {
+  margin-right: 10rpx;
+  width: 20rpx;
+  height: 20rpx;
+}
 .container .body .card .item.data-v-92bb8f34 {
   display: inline-block;
   margin: 0 15rpx;

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

@@ -216,10 +216,17 @@ var _default = {
       // 照片信息
       imgUrl: "",
       // 定位位置信息
-      address: ""
+      address: "",
+      // 时间段信息
+      timeRange: "",
+      // 规则id
+      id: ""
     };
   },
-  onLoad: function onLoad() {
+  onLoad: function onLoad(options) {
+    var obj = JSON.parse(options.obj);
+    this.timeRange = obj.timeRange;
+    this.id = obj.id;
     // 实例化API核心类
     qqmapsdk = new QQMapWX({
       // 申请的key
@@ -234,7 +241,6 @@ var _default = {
       qqmapsdk.reverseGeocoder({
         success: function success(res) {
           // console.log(res);
-          // console.log(res.result);
           if (res.status == 0) {
             // 获取详细地址信息
             _this.address = res.result.address;
@@ -266,6 +272,7 @@ var _default = {
     },
     // 点击拍照图标回调
     handlePhoto: function handlePhoto() {
+      var _this2 = this;
       // 获取用户摄像头权限
       uni.authorize({
         scope: 'scope.camera',
@@ -274,13 +281,12 @@ var _default = {
             count: 1,
             sourceType: ['camera'],
             success: function 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);
+              // console.log(res);
+              // console.log(res.tempFilePaths[0]);
+              // console.log(JSON.stringify(res.tempFilePaths));
+              var imgUrl = res.tempFilePaths[0];
               uni.navigateTo({
-                url: "/pages/authentication/authentication"
+                url: "/pages/authentication/authentication?imgUrl=".concat(imgUrl, "&id=").concat(_this2.id, "&address=").concat(_this2.address, "&latitude=").concat(_this2.latitude, "&longitude=").concat(_this2.longitude)
               });
             }
           });
@@ -296,7 +302,7 @@ var _default = {
                 uni.openSetting({
                   success: function success(res) {}
                 });
-              } else if (res.cancel) {}
+              }
             }
           });
         }

unpackage/dist/dev/mp-weixin/uni_modules/jlk-week/components/jlk-week/jlk-week.json

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