提交

8 months ago · bcf19e9941
10 changed files with 21 additions and 20 deletions
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -189,7 +189,7 @@
 					lon: this.myLonLat.lng,
 					lat: this.myLonLat.lat
 				}, '/api/Merchants/guideClockLocate').then(res => {
-					if(res.code == 200) {
+					if(res.code == 1) {
 						this.punchSuccess = true
 						clearInterval(this.timeInterval); // 打卡成功后清除时间定时器
 						let timer = setInterval(() => {
@ -223,13 +223,12 @@
 								lng: gcj02Lng,
 								lat: gcj02Lat
 							}
-							console.log(gcj02Lat, gcj02Lng)
 							// 初始化是否可打卡为 false
 							this.isCanPunch = false;
 							// 遍历每个打卡点
 							for (let i = 0; i < this.userPunch.clock_address.length; i++) {
 								const item = this.userPunch.clock_address[i];
-								const distance = this.calculateDistance(item.latitude, item.longitude, gcj02Lat, gcj02Lng);
+								const distance = this.calculateDistance(item.lat, item.lon, gcj02Lat, gcj02Lng);
 								console.log(`与打卡点 ${item.title} 的距离:`, distance);
 								if (distance <= item.range) {
 									this.isCanPunch = true;
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@ -67,6 +67,7 @@
 			},
 			login() {
 				this.Post(this.form,'/api/Merchants/login_member').then(res => {
+					if(res.code == 1) {
 						this.$store.commit('changeUserInfo', res.data)
 						if (this.$store.state.user.toPath.includes('user/user')) {
 							uni.switchTab({
@ -79,6 +80,9 @@
 								url: '/pages/index/index'
 							})
 						}
+					}else {
+						this.getCodeImg()
+					}
 				})
 			},
 			
--- a/static/js/CommonFunction.js
+++ b/static/js/CommonFunction.js
@ -173,7 +173,6 @@ Vue.prototype.encryptPhone = (phone) => {

 // 计算两个经纬度间的距离
 Vue.prototype.calculateDistance = (lat1, lon1, lat2, lon2) => {
-	console.log(lat1, lon1, lat2, lon2)
 	const R = 6371e3; // 地球半径，单位：米
 	const φ1 = lat1 * (Math.PI / 180);
 	const φ2 = lat2 * (Math.PI / 180);
--- a/unpackage/dist/build/web/index.html
+++ b/unpackage/dist/build/web/index.html
@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>daoyou</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.4dfe5456.js></script><script src=/static/js/index.de0f6813.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.4dfe5456.js></script><script src=/static/js/index.b7448120.js></script></body></html>
--- a/unpackage/dist/build/web/static/js/CommonFunction.js
+++ b/unpackage/dist/build/web/static/js/CommonFunction.js
@ -173,7 +173,6 @@ Vue.prototype.encryptPhone = (phone) => {

 // 计算两个经纬度间的距离
 Vue.prototype.calculateDistance = (lat1, lon1, lat2, lon2) => {
-	console.log(lat1, lon1, lat2, lon2)
 	const R = 6371e3; // 地球半径，单位：米
 	const φ1 = lat1 * (Math.PI / 180);
 	const φ2 = lat2 * (Math.PI / 180);
--- a/unpackage/dist/build/web/static/js/index.b7448120.js
+++ b/unpackage/dist/build/web/static/js/index.b7448120.js
--- a/unpackage/dist/build/web/static/js/pages-index-index.214affef.js
+++ b/unpackage/dist/build/web/static/js/pages-index-index.214affef.js
--- a/unpackage/dist/build/web/static/js/pages-index-index.c7c523df.js
+++ b/unpackage/dist/build/web/static/js/pages-index-index.c7c523df.js
--- a/unpackage/dist/build/web/static/js/pages-login-login.0d80a50d.js
+++ b/unpackage/dist/build/web/static/js/pages-login-login.0d80a50d.js
--- a/unpackage/dist/build/web/static/js/pages-login-login.6eddb80c.js
+++ b/unpackage/dist/build/web/static/js/pages-login-login.6eddb80c.js