Merge branch 'master' of lvjian/kmall-pt into master

wx-mall/app.json

@@ -62,7 +62,7 @@
     "pages/ucenter/crossBoundaryQuotaQuery/crossBoundaryQuotaQuery"
   ],
   "requiredPrivateInfos": [
-    "getLocation",
+    "getFuzzyLocation",
     "chooseAddress",
     "chooseLocation"
   ],
@@ -111,7 +111,7 @@
   },
   "debug": true,
   "permission": {
-    "scope.userLocation": {
+    "scope.userFuzzyLocation": {
       "desc": "您的位置信息将用于小程序位置接口的效果展示"
     }
   },

wx-mall/lib/qqmap/qqmap-wx-jssdk.js

@@ -52,7 +52,7 @@ var Utils = {
      * 使用微信接口进行定位
      */
     getWXLocation(success, fail, complete) {
-        wx.getLocation({
+        wx.getFuzzyLocation({
             type: 'gcj02',
             success: success,
             fail: fail,

wx-mall/pages/index/index.js

@@ -142,7 +142,7 @@ Page({
     console.log('isDirectEntry-0：', wx.getStorageSync('isDirectEntry'))
     let storeId = wx.getStorageSync('storeId');
     
-    wx.getLocation({
+    wx.getFuzzyLocation({
       success: function(location) {
         // do nothing
         console.log('获取用户位置成功，获取附近门店');
@@ -348,7 +348,7 @@ Page({
     let that = this;
     // console.log(wx.getStorageSync('merchSn'));
     //获取附件门店信息
-    wx.getLocation({
+    wx.getFuzzyLocation({
       success: function(location) {
         // console.log(location)
         that.loadNearbyStore(location);

wx-mall/pages/shopping/addressAdd/addressAdd.js

@@ -349,7 +349,7 @@ Page({
     let that = this;
     if (null == that.data.addressId || that.data.addressId == 0) {
 
-      wx.getLocation({
+      wx.getFuzzyLocation({
         success: function (res) {
           console.log(res)
           // 调用接口

wx-mall/pages/ucenter/addressAdd/addressAdd.js

@@ -347,7 +347,7 @@ Page({
     let that = this;
     if (null == that.data.addressId || that.data.addressId == 0) {
 
-      wx.getLocation({
+      wx.getFuzzyLocation({
         success: function (res) {
           console.log(res)
           // 调用接口

wx-mall/pages/ucenter/userLogin/userLogin.js

@@ -244,6 +244,7 @@ Page({
     util.request(api.smscodeSend, {
       phone: that.data.phone
     }, 'POST').then(function (res) {
+      console.log("发送验证码 => ", res);
       let n = 59;
       var timer = setInterval(function () {
         if (n == 0) {

wx-mall/utils/util.js

@@ -203,7 +203,7 @@ function dateformat(micro_second) {
 }
 
 function getLocation(callback) {
-  wx.getLocation({
+  wx.getFuzzyLocation({
     type: 'gcj02', //返回可以用于wx.openLocation的经纬度
     success: function (res) {
       var latitude = res.latitude;