From 335e18645a0eeaaf673a8f7799cf9dff664018de Mon Sep 17 00:00:00 2001
From: lfs3 <liangfengsi@0085.com>
Date: Thu, 19 Jul 2018 20:44:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=A1=B5=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/loding/loding.js   | 141 +++++++++++++++------------------------
 pages/loding/loding.wxml |   2 +-
 project.config.json      |   4 ++
 3 files changed, 57 insertions(+), 90 deletions(-)

diff --git a/pages/loding/loding.js b/pages/loding/loding.js
index 24ed458..8e8ad96 100644
--- a/pages/loding/loding.js
+++ b/pages/loding/loding.js
@@ -10,13 +10,9 @@ Page({
     hiddenLoading: false,
     resData: []
   },
-  onLoad: function (options) {
+  onShow: function (options) {
     // 实例化腾讯地图API核心类
     let that = this;
-    // qqmapsdk = new QQMapWX({
-    //   key: "C5KBZ-RISKD-INW4P-PWYQJ-QC6C7-BQBGC"
-    //   //正式版  key: ' JN7BZ-MJBK5-52SIH-QOKGH-FJE5F-IWFGG'
-    // });
     wx.getStorage({
       key: "merchantNo",
       success: function (res) {
@@ -39,89 +35,56 @@ Page({
     });
   },
   queryCartList: function () {
-    wx.getSetting({
-      success: function (res) {
-        if (res.authSetting["scope.userInfo"]) {
-          //授权了
-          wx.navigateTo({
-            url: "../at_present/at_present"
-          });
-        } else {
-          //未授权
-          wx.switchTab({
-            url: "../city/city"
-          });
-        }
+    wx.getLocation({
+      type: 'wgs84',
+      success: function(res) {
+        //授权了
+        wx.navigateTo({
+          url: "../at_present/at_present"
+        });
+      },
+      fail:function(error){
+        console.log(error);
+        wx.navigateTo({
+            url: '../city/city',
+          })
       }
-    });
-  }
-});
-
-// // pages/demo/demo.js
-// var QQMapWX = require('../../libs/qqmap-wx-jssdk.js');
-
-// var util = require("../../utils/util.js");
-
-// var qqmapsdk;
-// /**
-//  * 页面的初始数据
-//  */
-// Page({
-//   data: {
-//     hiddenLoading: false,
-//     resData: []
-//   },
-//   onLoad: function (options) {　　 // 实例化腾讯地图API核心类
-//  let that = this;
-//     qqmapsdk = new QQMapWX({
-//       key: 'C5KBZ-RISKD-INW4P-PWYQJ-QC6C7-BQBGC'
-//       //正式版  key: ' JN7BZ-MJBK5-52SIH-QOKGH-FJE5F-IWFGG'
-//     });
-//     // wx.getStorage({
-//     //   key: 'merchantNo',
-//     //   success: function (res) {
-//     //     console.log(res.data)
-//     //     if (res.data == '') {
-//     //      console.log('第一次进来的时候')
-//     //     } else {
-//     //       wx.switchTab({
-//     //         url: '../index/index'
-//     //       })
-//     //     }
-//     //     that.setData({
-//     //       merchantNo: res.data
-//     //     })
-//     //     // that.setData({ userName: res.data });
-//     //   }
-//     // });
-//   },
-//   onReady: function () {
-//     // 页面渲染完成 
-//     var t = this;
-//     setTimeout(function () {
-//       t.setData({
-//         hiddenLoading: true
-//       });
-//       t.update();
-//     }, 3000);
-//     wx.getSetting({
-//       success: function (res) {
-//         if (res.authSetting['scope.userInfo']) {
-//           //授权了
-//           wx.navigateTo({
-//             url: '../at_present/at_present',
-//           })
-//         } else {
-//           //未授权
-
-//           wx.navigateTo({
-//             url: '../city/city',
-//           })
-//         }
-//       }
-      
-//     });
+    })
+  },
+  handler: function (e) {
+    var that = this;
+    if (!e.detail.authSetting['scope.userLocation']) {
+      that.setData({
+        ldata: false
+      })
+    } else {
+      that.setData({
+        ldata: true,
+      })
+      wx.getLocation({
+        type: 'gcj02',
+        success: function (res) {
+          var latitude = res.latitude
+          var longitude = res.longitude
 
-//   }
-// })
-//       // });
\ No newline at end of file
+          that.setData({
+            latitude: latitude,
+            longitude: longitude
+          })
+          wx.openLocation({
+            latitude: latitude,
+            longitude: longitude,
+            scale: 28
+          })
+        }
+      })
+    }
+  },
+  btnTap(e) {
+    wx.openLocation({
+      latitude: this.data.latitude,
+      longitude: this.data.longitude,
+      scale: 28
+    })
+  },
+});
diff --git a/pages/loding/loding.wxml b/pages/loding/loding.wxml
index 0277891..24ef887 100644
--- a/pages/loding/loding.wxml
+++ b/pages/loding/loding.wxml
@@ -1 +1 @@
-<loading hidden="{{hiddenLoading}}" bindtap='groupTaps'>正在加载</loading> 
\ No newline at end of file
+<!-- <loading hidden="{{hiddenLoading}}" bindtap='groupTaps'>正在加载</loading>  -->
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index e0dfff3..1797105 100644
--- a/project.config.json
+++ b/project.config.json
@@ -20,6 +20,10 @@
 			"current": -1,
 			"list": []
 		},
+		"plugin": {
+			"current": -1,
+			"list": []
+		},
 		"game": {
 			"currentL": -1,
 			"list": []