|
|
|
@ -12,7 +12,6 @@ Page({ |
|
|
|
duration: 1000, |
|
|
|
imgUrls: [], |
|
|
|
merchantNo: '', |
|
|
|
// bannerImage: '/images/activity_banner.png',
|
|
|
|
menu_list: [ |
|
|
|
{ name: '拼团', disabled: false, className: 'green_button' }, |
|
|
|
{ name: '秒杀', disabled: true, className: 'gray_button' }, |
|
|
|
@ -25,10 +24,6 @@ Page({ |
|
|
|
pageSize: 20, |
|
|
|
hasMoreData: true, |
|
|
|
img1: '/images/u40.png', |
|
|
|
|
|
|
|
// cityId: 440100000,
|
|
|
|
// typeNum: 10,
|
|
|
|
// addrArray: { id: [440100000, 430426000], name: ['长沙', '深圳', '上海', '长沙', '武汉', '杭州', '北京'] },
|
|
|
|
addrIndex: 0, |
|
|
|
districtName: '', |
|
|
|
}, |
|
|
|
@ -61,9 +56,6 @@ Page({ |
|
|
|
wx.getStorage({ |
|
|
|
key: 'merchantNo', |
|
|
|
success: function (res) { |
|
|
|
console.log(1) |
|
|
|
console.log(res.data) |
|
|
|
console.log(1) |
|
|
|
that.setData({ |
|
|
|
merchantNo: res.data |
|
|
|
}), |
|
|
|
@ -83,7 +75,6 @@ Page({ |
|
|
|
if (status == 0) { |
|
|
|
var data = res.data; |
|
|
|
var status = data.code; |
|
|
|
// console.log(res);
|
|
|
|
that.setData({ |
|
|
|
imgUrls: data.response |
|
|
|
}) |
|
|
|
@ -116,8 +107,7 @@ Page({ |
|
|
|
url: app.gw.hostUrl + '/mall/wxa/activity/list', |
|
|
|
method: 'get', |
|
|
|
data: { |
|
|
|
merchantNo: merchantNo, |
|
|
|
// selectedCityId: that.data.addrArray.id[that.data.addrIndex] == undefined ? 0 : that.data.addrArray.id[that.data.addrIndex],
|
|
|
|
merchantNo:merchantNo, |
|
|
|
pageNum: that.data.pageNum, |
|
|
|
pageSize: that.data.pageSize |
|
|
|
}, |
|
|
|
@ -191,29 +181,6 @@ Page({ |
|
|
|
/** |
|
|
|
* 生命周期函数--监听页面显示 |
|
|
|
*/ |
|
|
|
// onShow: function () {
|
|
|
|
// let that = this;
|
|
|
|
// //获取本地数据
|
|
|
|
// // 获取地址
|
|
|
|
// wx.getStorage({
|
|
|
|
// key: 'districtName',
|
|
|
|
// success: function (res) {
|
|
|
|
// // console.log(res.data)
|
|
|
|
// that.setData({
|
|
|
|
// districtName: res.data
|
|
|
|
// })
|
|
|
|
// }
|
|
|
|
// });
|
|
|
|
// // 商家编号
|
|
|
|
// wx.getStorage({
|
|
|
|
// key: 'merchantNo',
|
|
|
|
// success: function (res) {
|
|
|
|
// that.setData({
|
|
|
|
// merchantNo: res.data
|
|
|
|
// })
|
|
|
|
// }
|
|
|
|
// });
|
|
|
|
// },
|
|
|
|
|
|
|
|
/** |
|
|
|
* 生命周期函数--监听页面隐藏 |
|
|
|
@ -233,6 +200,7 @@ Page({ |
|
|
|
* 页面相关事件处理函数--监听用户下拉动作 |
|
|
|
*/ |
|
|
|
onPullDownRefresh: function () { |
|
|
|
let that = this; |
|
|
|
this.data.pageNum = 1; |
|
|
|
this.getActivityList(); |
|
|
|
}, |
|
|
|
|