diff --git a/pages/activity_detail/activity_detail.js b/pages/activity_detail/activity_detail.js
index 3d75621..3611708 100644
--- a/pages/activity_detail/activity_detail.js
+++ b/pages/activity_detail/activity_detail.js
@@ -46,7 +46,6 @@ Page({
}],
qrImageUrl: "",
},
-
/**
* 生命周期函数--监听页面加载
*/
@@ -61,7 +60,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
- //获取活动详情
+ //获取活动详情
this.getActivityDetail();
},
diff --git a/pages/at_present/at_present.js b/pages/at_present/at_present.js
index 0bdf0a3..33c7332 100644
--- a/pages/at_present/at_present.js
+++ b/pages/at_present/at_present.js
@@ -23,35 +23,21 @@ Page({
onLoad: function(options) {
// let that = this;
qqmapsdk = new QQMapWX({
+<<<<<<< HEAD
// key: 'C5KBZ-RISKD-INW4P-PWYQJ-QC6C7-BQBGC'//测试
key: 'JN7BZ-MJBK5-52SIH-QOKGH-FJE5F-IWFGG'//正式
+=======
+ key: 'C5KBZ-RISKD-INW4P-PWYQJ-QC6C7-BQBGC'
+ //正式的上线 key: 'JN7BZ-MJBK5-52SIH-QOKGH-FJE5F-IWFGG'
+>>>>>>> 9ce9c0372f32b633e4de2d07306aae87a8c62664
});
},
- // onShow: function () {
- // var that = this;
- // // 腾讯地图调用接口
- // qqmapsdk.search({
- // success: function (res) {
- //
- // },
- // fail: function (res) {
- // console.log(res);
- // },
- // complete: function (res) {
- // console.log(res);
- // }
- // })
- // },
-
-
-
onReady: function() {
var that = this;
wx.getLocation({
type: 'wgs84',
success: function(res) {
qqmapsdk.reverseGeocoder({
- // qqmapsdk.search({
success: function(res) {
let district = res.result.address_component.district;
let city = res.result.address_component.city;
@@ -71,7 +57,6 @@ Page({
},
success: function(res) {
// 打印对应想得到的数据
- console.log(res)
var cityId = res.data.response[0].cityId;
var cityName = res.data.response[0].cityName;
var districtId = res.data.response[0].districtId;
@@ -125,24 +110,6 @@ Page({
},
groupTaps: function(e) {
var that = this;
- //获取本地数据
- // wx.getStorage({
- // key: 'merchantNo',
- // success: function (res) {
- // if (res.data ==''){
- // console.log(1111);
- // }else{
- // console.log(888);
- // }
- // // console.log(1111);
- // // console.log(res.data);
- // // that.setData({ merchantNo: res.data });
-
- // // console.log(2222);
- // // showOrhide:false;
-
- // }
- // });
wx.switchTab({
url: '../index/index'
})
diff --git a/pages/city/city.js b/pages/city/city.js
index 9401aaf..a1d4c22 100644
--- a/pages/city/city.js
+++ b/pages/city/city.js
@@ -21,12 +21,6 @@ Page({
})
}
});
- // console.log(2)
- // console.log(options.titles)
- // console.log(1)
- // this.setData({
- // titles: options.titles
- // });
var that = this
wx.request({
url: app.gw.hostUrl + '/mall/wxa/index/opencitylist',
@@ -36,9 +30,7 @@ Page({
'Content-Type': 'application/x-www-form-urlencoded'
},
success: function (res) {
- console.log(res.data)
var citys = res.data;
- console.log(citys);
that.setData({
citys
});
diff --git a/pages/city/city.wxml b/pages/city/city.wxml
index 53715a4..71a47e5 100644
--- a/pages/city/city.wxml
+++ b/pages/city/city.wxml
@@ -1,5 +1,5 @@
-定位区域 {{cityName}}{{districtName}}
+已选区域 {{cityName}}{{districtName}}
已开通城市
diff --git a/pages/district/district.js b/pages/district/district.js
index 7226308..74f922c 100644
--- a/pages/district/district.js
+++ b/pages/district/district.js
@@ -9,12 +9,11 @@ Page({
let that = this;
// wx.getStorage({
// key: 'merchantNo',
+
// success: function (res) {
// that.setData({
// merchantNo: res.data
// })
- // console.log(222);
-
// }
// });
wx.getStorage({
@@ -26,8 +25,6 @@ Page({
}
});
cityId = options.cityId;
-
- console.log(cityId);
wx.request({
url: app.gw.hostUrl + '/mall/wxa/index/opendistictlist',
method: 'get',
@@ -39,7 +36,6 @@ Page({
},
success: function (res) {
var districts = res.data;
- console.log(districts)
that.setData({
districts
});
diff --git a/pages/index/index.js b/pages/index/index.js
index 7adb1d7..b25374c 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -11,7 +11,9 @@ Page({
interval: 5000,
duration: 1000,
imgUrls: [],
+ // merchantNo: '',
// bannerImage: '/images/activity_banner.png',
+
menu_list: [
{ name: '拼团', disabled: false, className: 'green_button' },
{ name: '秒杀', disabled: true, className: 'gray_button' },
@@ -24,10 +26,6 @@ Page({
pageSize: 20,
hasMoreData: true,
img1: '/images/u40.png',
-
- // cityId: 440100000,
- // typeNum: 10,
- // addrArray: { id: [440100000, 430426000], name: ['长沙', '深圳', '上海', '长沙', '武汉', '杭州', '北京'] },
addrIndex: 0,
districtName: '',
},
@@ -62,10 +60,11 @@ Page({
wx.getStorage({
key: 'merchantNo',
success: function (res) {
- // that.setData({
+ that.setData({
+ merchantNo: res.data
+ }),
+ that.getActivityList(res.data);
merchantNo = res.data
- // })
- console.log("merchantNo:" +merchantNo);
that.getActivityList();
wx.request({
url: app.gw.hostUrl + '/mall/wxa/activity/banner',
@@ -82,7 +81,6 @@ Page({
if (status == 0) {
var data = res.data;
var status = data.code;
- // console.log(res);
that.setData({
imgUrls: data.response
})
@@ -116,8 +114,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 +188,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 +207,7 @@ Page({
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
+ let that = this;
this.data.pageNum = 1;
this.getActivityList();
},
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index c758aad..d35c557 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -3,8 +3,6 @@