From d48a0b4897176fd527942e9a305ea301d1165de4 Mon Sep 17 00:00:00 2001
From: wally <18603454788@163.com>
Date: Wed, 8 Apr 2020 21:23:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=9C=B0=E5=9B=BE=E7=BC=A9=E6=94=BE?=
 =?UTF-8?q?=E7=AD=89=E7=BA=A7=E4=BF=AE=E6=94=B9\n=E6=89=93=E5=8D=A1?=
 =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/history-map/history-map.vue |  2 +-
 pages.json                             | 14 +++++++-------
 pages/sign/sign.vue                    | 26 +++++++++++++++++++-------
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/components/history-map/history-map.vue b/components/history-map/history-map.vue
index fcbf9f5..d39935b 100644
--- a/components/history-map/history-map.vue
+++ b/components/history-map/history-map.vue
@@ -7,7 +7,7 @@
     :polyline="polyline"
     id="map"
     ref="map"
-    scale="12"
+    scale="17"
     show-location="true"
     style="width: 100%; min-height: 1000rpx;height:100%"
   />
diff --git a/pages.json b/pages.json
index d95f957..c531b05 100644
--- a/pages.json
+++ b/pages.json
@@ -3,7 +3,13 @@
     {
       "path": "pages/index/index",
       "style": {
-        "navigationBarTitleText": "山大健康码"
+        "navigationBarTitleText": "山大健康码"
+      }
+    },
+    {
+      "path": "pages/sign/sign",
+      "style": {
+        "navigationBarTitleText": "打卡"
       }
     },
     {
@@ -19,12 +25,6 @@
       "path": "pages/my-signs/my-signs",
       "style": { "navigationBarTitleText": "我的校园打卡" }
     },
-    {
-      "path": "pages/sign/sign",
-      "style": {
-        "navigationBarTitleText": "打卡"
-      }
-    },
 
     {
       "path": "pages/get-code/get-code",
diff --git a/pages/sign/sign.vue b/pages/sign/sign.vue
index 1f59b8e..0a654b4 100644
--- a/pages/sign/sign.vue
+++ b/pages/sign/sign.vue
@@ -17,6 +17,7 @@
 <script>
 import { mapState, mapActions } from 'vuex';
 import { formatQuery } from 'utils/util';
+import { showToast, showLoading, hideLoading, showModal } from 'utils/ui';
 import { SCAN_SIGN } from 'api/api';
 
 export default {
@@ -27,9 +28,9 @@ export default {
       siteName: '',
       success: false,
       type: 0, // 0进 / 1出
-      timer: null, 
-      latitude: 37.80079,
-      longitude: 112.58679,
+      timer: null,
+      latitude: '',
+      longitude: '',
     };
   },
 
@@ -42,8 +43,8 @@ export default {
   },
 
   onLoad(options) {
-    this.init(options);
     this.getLocation();
+    this.init(options);
   },
 
   methods: {
@@ -82,18 +83,24 @@ export default {
         this.getSiteByQrId(params);
       }
     },
-    
+
     // 获取当前的地址位置
     // 注意用国测局的数据 map只支持gcj02
     getLocation() {
+      showLoading();
       uni.getLocation({
-        type: 'gcj02',
+        // type: 'gcj02',
         success: res => {
           this.longitude = res.longitude;
           this.latitude = res.latitude;
+          hideLoading();
           console.log('当前位置的经度：' + res.longitude);
           console.log('当前位置的纬度：' + res.latitude);
         },
+        fail: err => {
+          showModal('获取定位失败, 请打开GPS后重试');
+          console.error(err);
+        },
       });
     },
 
@@ -103,7 +110,12 @@ export default {
      */
     async handleSign(siteId) {
       try {
-        const params = { param: { siteId, locationLatitude: this.latitude, locationLongitude: this.longitude } };
+        if (!this.latitude || !this.longitude) {
+          showToast('位置信息有误, 请打开定位后重试');
+        }
+        const params = {
+          param: { siteId, locationLatitude: this.latitude, locationLongitude: this.longitude },
+        };
         await this.sign(params);
         this.success = true;
       } catch (error) {