From 559461d34a3b6095f79257d6714450e822b675d9 Mon Sep 17 00:00:00 2001
From: lfs3 <liangfengsi@0085.com>
Date: Thu, 19 Jul 2018 21:01:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=8A=A0=E8=BD=BD=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.js   | 79 ++++++++++++++++++++++--------------------
 pages/loding/loding.js | 70 ++++++++++++++++++-------------------
 2 files changed, 76 insertions(+), 73 deletions(-)

diff --git a/pages/index/index.js b/pages/index/index.js
index 6afb29d..b00f73a 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -45,7 +45,7 @@ Page({
    * 生命周期函数--监听页面加载 
    */
   onLoad: function (options) {
-    let that = this;
+    var that = this;
     //获取本地数据
     // 获取地址
     wx.getStorage({
@@ -62,54 +62,57 @@ Page({
       success: function (res) {
         that.setData({
           merchantNo: res.data
+        }),
+          that.getActivityList(res.data);
+        wx.request({
+          url: app.gw.hostUrl + '/mall/wxa/activity/banner',
+          method: 'get',
+          data: {
+            merchantNo: res.data
+          },
+          header: {
+            'Content-Type': 'application/x-www-form-urlencoded'
+          },
+          success: function (res) {
+            var data = res.data;
+            var status = data.code;
+            if (status == 0) {
+              var data = res.data;
+              var status = data.code;
+              // console.log(res);
+              that.setData({
+                imgUrls: data.response
+              })
+            } else {
+              wx.showToast({
+                title: data.msg,
+                icon: 'none',
+                duration: 3000
+              });
+              return;
+            }
+          },
+          fail: function (res) {
+            wx.showToast({
+              title: '加载数据失败',
+            });
+          },
         })
       }
     });
-    wx.request({
-      url: app.gw.hostUrl + '/mall/wxa/activity/banner',
-      method: 'get',
-      data: {
-        merchantNo: that.merchantNo
-      },
-      header: {
-        'Content-Type': 'application/x-www-form-urlencoded'
-      },
-      success: function (res) {
-        var data = res.data;
-        var status = data.code;
-        if (status == 0) {
-          var data = res.data;
-          var status = data.code;
-          // console.log(res);
-          that.setData({
-            imgUrls: data.response
-          })
-        } else {
-          wx.showToast({
-            title: data.msg,
-            icon: 'none',
-            duration: 3000
-          });
-          return;
-        }
-      },
-      fail: function (res) {
-        wx.showToast({
-          title: '加载数据失败',
-        });
-      },
-    }),
-      this.getActivityList();
+    
+    
+      
   },
 
-  getActivityList: function () {
+  getActivityList: function ( merchantNo) {
     let that = this;
     wx.showNavigationBarLoading() //在标题栏中显示加载
     wx.request({
       url: app.gw.hostUrl + '/mall/wxa/activity/list',
       method: 'get',
       data: {
-        merchantNo: that.merchantNo,
+        merchantNo: merchantNo,
         // selectedCityId: that.data.addrArray.id[that.data.addrIndex] == undefined ? 0 : that.data.addrArray.id[that.data.addrIndex],
         pageNum: that.data.pageNum,
         pageSize: that.data.pageSize
diff --git a/pages/loding/loding.js b/pages/loding/loding.js
index 8e8ad96..d04b0b4 100644
--- a/pages/loding/loding.js
+++ b/pages/loding/loding.js
@@ -51,40 +51,40 @@ Page({
       }
     })
   },
-  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
+  // 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
 
-          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
-    })
-  },
+  //         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
+  //   })
+  // },
 });