Merge branch 'master' of http://git.ds-bay.com/project/kmall-pt

wx-mall/app.json

@@ -61,6 +61,11 @@
     "pages/checkoutIdCard/checkoutIdCard",
     "pages/ucenter/crossBoundaryQuotaQuery/crossBoundaryQuotaQuery"
   ],
+  "requiredPrivateInfos": [
+    "getLocation",
+    "chooseAddress",
+    "chooseLocation"
+  ],
   "window": {
     "backgroundTextStyle": "dark",
     "navigationBarBackgroundColor": "#fff",

wx-mall/config/api.js

@@ -2,14 +2,14 @@
 //var NewApiRootUrl = 'http://localhost:8080/api/';
 //var NewApiRootUrl = 'http://192.168.1.138:8080/api/';
 //var NewApiRootUrl = 'http://3f352e8584.qicp.vip:9001/api/';//hyq
-var NewApiRootUrl = 'http://3f352e8584.qicp.vip:9001/api/';//csk
+// var NewApiRootUrl = 'http://3f352e8584.qicp.vip:9001/api/';//csk
 // var NewApiRootUrl = 'http://qhdswl.f3322.net:9003/api/';
 
 //测试环境
 // var NewApiRootUrl = 'https://mp-test.k1net.cn/api/';
 
 //生产环境
-// var NewApiRootUrl = 'https://mp.k1net.cn/api/';
+ var NewApiRootUrl = 'https://mp.k1net.cn/api/';
 
 module.exports = {
 

wx-mall/pages/index/index.js

@@ -145,7 +145,7 @@ Page({
     wx.getLocation({
       success: function(location) {
         // do nothing
-        // console.log('获取用户位置成功，获取附近门店');
+        console.log('获取用户位置成功，获取附近门店');
       },
       fail: function() {
         // console.log('获取用户位置失败');
@@ -353,7 +353,8 @@ Page({
         // console.log(location)
         that.loadNearbyStore(location);
       },
-      fail: function() {
+      fail: function(res) {
+        console.log("获取位置 => ", res);
         wx.hideLoading();
         wx.getSetting({
           success: function(res) {