|
@@ -9,26 +9,29 @@ Page({
|
|
* 页面的初始数据
|
|
* 页面的初始数据
|
|
*/
|
|
*/
|
|
data: {
|
|
data: {
|
|
- shopList: []
|
|
|
|
|
|
+ shopList: [],
|
|
|
|
+ pageNo: 1,
|
|
|
|
+ pageSum: 0,
|
|
|
|
+ loadingEnd: false
|
|
},
|
|
},
|
|
|
|
|
|
/**
|
|
/**
|
|
* 生命周期函数--监听页面加载
|
|
* 生命周期函数--监听页面加载
|
|
*/
|
|
*/
|
|
onLoad: async function (options) {
|
|
onLoad: async function (options) {
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+
|
|
wx.getSetting({
|
|
wx.getSetting({
|
|
success: async (res) => {
|
|
success: async (res) => {
|
|
let authSetting = res.authSetting
|
|
let authSetting = res.authSetting
|
|
if (authSetting['scope.userLocation']) {
|
|
if (authSetting['scope.userLocation']) {
|
|
console.log('已授权地理位置')
|
|
console.log('已授权地理位置')
|
|
let lon = wx.getStorageSync('lon')
|
|
let lon = wx.getStorageSync('lon')
|
|
- let lat = wx.getStorageSync('lat')
|
|
|
|
- let rs = await storeApi.getStoreList(1, 5,`&lon=${lon}&lat=${lat}`);
|
|
|
|
|
|
+ let lat = wx.getStorageSync('lat')
|
|
|
|
+ let rs = await storeApi.getStoreList(1, 10, `&lon=${lon}&lat=${lat}`);
|
|
this.setData({
|
|
this.setData({
|
|
shopList: rs.list,
|
|
shopList: rs.list,
|
|
-
|
|
|
|
|
|
+ pageSum: rs.pageCount
|
|
})
|
|
})
|
|
// 已授权
|
|
// 已授权
|
|
} else {
|
|
} else {
|
|
@@ -48,10 +51,11 @@ Page({
|
|
locationFlag: true,
|
|
locationFlag: true,
|
|
storeInfo: rs.info
|
|
storeInfo: rs.info
|
|
})
|
|
})
|
|
- let shopList = await storeApi.getStoreList(1, 5,`&lon=${longitude}&lat=${latitude}`);
|
|
|
|
|
|
+ let shopList = await storeApi.getStoreList(1, 10, `&lon=${longitude}&lat=${latitude}`);
|
|
this.setData({
|
|
this.setData({
|
|
- shopList: shopList.shopList,
|
|
|
|
-
|
|
|
|
|
|
+ shopList: shopList.list,
|
|
|
|
+ pageSum: shopList.pageCount
|
|
|
|
+
|
|
})
|
|
})
|
|
}
|
|
}
|
|
})
|
|
})
|
|
@@ -59,7 +63,22 @@ Page({
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
-
|
|
|
|
|
|
+ getShopList: async function () {
|
|
|
|
+ let longitude = wx.getStorageSync('lon')
|
|
|
|
+ let latitude = wx.getStorageSync('lat')
|
|
|
|
+ let pageNo = this.data.pageNo;
|
|
|
|
+ let shopList = this.data.shopList;
|
|
|
|
+ let sList = await storeApi.getStoreList(pageNo, 10, `&lon=${longitude}&lat=${latitude}`);
|
|
|
|
+ let list = sList.list;
|
|
|
|
+ list.forEach((item)=>{
|
|
|
|
+ shopList.push(item)
|
|
|
|
+ })
|
|
|
|
+ this.setData({
|
|
|
|
+ shopList,
|
|
|
|
+ pageSum: shopList.pageCount
|
|
|
|
+ })
|
|
|
|
+ },
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 生命周期函数--监听页面初次渲染完成
|
|
* 生命周期函数--监听页面初次渲染完成
|
|
*/
|
|
*/
|
|
@@ -99,7 +118,18 @@ Page({
|
|
* 页面上拉触底事件的处理函数
|
|
* 页面上拉触底事件的处理函数
|
|
*/
|
|
*/
|
|
onReachBottom: function () {
|
|
onReachBottom: function () {
|
|
-
|
|
|
|
|
|
+ let pageNo = this.data.pageNo;
|
|
|
|
+ pageNo++;
|
|
|
|
+ this.setData({
|
|
|
|
+ pageNo
|
|
|
|
+ })
|
|
|
|
+ if (this.data.pageNo <= this.data.pageSum) {
|
|
|
|
+ this.getShopList()
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ this.setData({
|
|
|
|
+ loadingEnd: true
|
|
|
|
+ })
|
|
},
|
|
},
|
|
|
|
|
|
/**
|
|
/**
|