From 8342168d3300a2282bac78296831da21e2b63295 Mon Sep 17 00:00:00 2001 From: shuiqing Date: Fri, 20 Jul 2018 10:13:34 +0800 Subject: [PATCH] .. --- pages/at_present/at_present.js | 38 +--------------------------------- pages/city/city.js | 6 ------ pages/city/city.wxml | 2 +- pages/district/district.js | 3 +-- pages/index/index.js | 36 ++------------------------------ pages/index/index.wxml | 2 -- pages/index/index.wxss | 5 ----- pages/loding/loding.js | 36 -------------------------------- pages/order/order.wxml | 1 - 9 files changed, 5 insertions(+), 124 deletions(-) diff --git a/pages/at_present/at_present.js b/pages/at_present/at_present.js index b2ee2e0..dba4c79 100644 --- a/pages/at_present/at_present.js +++ b/pages/at_present/at_present.js @@ -24,33 +24,15 @@ Page({ // let that = this;　 qqmapsdk = new QQMapWX({ key: 'C5KBZ-RISKD-INW4P-PWYQJ-QC6C7-BQBGC' + //正式的上线 key: 'JN7BZ-MJBK5-52SIH-QOKGH-FJE5F-IWFGG' }); }, - // 　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; @@ -124,24 +106,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..0d6d39a 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', 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..aa99b5e 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({ diff --git a/pages/index/index.js b/pages/index/index.js index 63a56da..7a451cd 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -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(); }, 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 @@ {{districtName}} - - diff --git a/pages/index/index.wxss b/pages/index/index.wxss index d3520d1..6bb16c6 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -21,11 +21,6 @@ width: 20rpx; margin-right:10rpx; } - /* .top-right { - width: 28%; - display: inline-block; - vertical-align: super; -} */ .address { font-size: 30rpx; diff --git a/pages/loding/loding.js b/pages/loding/loding.js index d04b0b4..d3d99f4 100644 --- a/pages/loding/loding.js +++ b/pages/loding/loding.js @@ -51,40 +51,4 @@ 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 - - // 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 - // }) - // }, }); diff --git a/pages/order/order.wxml b/pages/order/order.wxml index f0d59dd..fdcdd53 100644 --- a/pages/order/order.wxml +++ b/pages/order/order.wxml @@ -10,7 +10,6 @@ {{item.goodsName}} -