diff --git a/ext.json b/ext.json index 15f463a..79bc693 100644 --- a/ext.json +++ b/ext.json @@ -36,8 +36,8 @@ "ifHaveWebSocket": "0", "ifHaveCarModular": "1" }, - "name": "富茂链客生产版", - "weappId": "wx6a2524a8286d687f", + "name": "福州连江万星广场", + "weappId": "wxce917a9a151fc03c", "appVersion": "C.5.1.1" }, "debug": false, @@ -76,7 +76,7 @@ "navigationBarTitleText": "", "navigationBarBackgroundColor": "#FFFFFF" }, - "extAppid": "wx6a2524a8286d687f", + "extAppid": "wxce917a9a151fc03c", "extEnable": true, "permission": { "scope.userLocation": { diff --git a/index/index.js b/index/index.js index 3937e07..a2170a4 100644 --- a/index/index.js +++ b/index/index.js @@ -10,7 +10,7 @@ const bgColor = require("../utils/bgColor.js") let app = getApp(); Page({ data: { - showLocationIf:true, + showLocationIf: true, ifStoreApp: ifStoreApp, navigationBarTitle: '首页', navigationBarHeight, @@ -19,7 +19,7 @@ Page({ qg: bgColor.colorFirst.main.qg, newUrl: "", cover: "", - kanjia:imgurl.kanjia.url, + kanjia: imgurl.kanjia.url, pintuan: imgurl.pintuan.url, xiaofeika: imgurl.xiaofeika.url, xingyun: imgurl.xingyun.url, @@ -51,7 +51,7 @@ Page({ duihuan: imgurl.duihuan.url, market: app.globalData.market, list: [], - xslist:[], + xslist: [], loading: true, fistLogin: null, alphaData: null, @@ -64,24 +64,24 @@ Page({ scrollTop: 0, showGame: false, showTopic: false, - showQg:false, + showQg: false, gamedata: {}, couponId: '', //游戏返回时传回的字段 played: false, //从游戏页面跳回首页返回true havePlayEd: app.globalData.havePlayEd, - havePlayEd1:app.globalData.havePlayEd1, + havePlayEd1: app.globalData.havePlayEd1, staticGamedata: {}, showIf: false, showPages: false, display: 'none', display1: 'none', optionsData: null, - page: 1 ,// 刷新进入页面时已经加载了第一页数据,onReachBottom时 page++,从第2页开始加载 - openId:'', + page: 1, // 刷新进入页面时已经加载了第一页数据,onReachBottom时 page++,从第2页开始加载 + openId: '', showGg: false, - ggdata:{} + ggdata: {} }, - alphaClick1: function (even) { + alphaClick1: function(even) { var animation = wx.createAnimation({}) animation.opacity(0).step({ duration: 2000 @@ -138,17 +138,17 @@ Page({ }, gotogame: function() { let that = this; - if (!that.data.showIf){ + if (!that.data.showIf) { wx.showToast({ title: '暂无游戏频道', - icon:"none", - duration:3000 + icon: "none", + duration: 3000 }) - }else{ + } else { Http.get({ - url: config.api.checkPhoneStatus, - data: {} - }) + url: config.api.checkPhoneStatus, + data: {} + }) .then(res => { var data = { couponChannelId: "" + that.data.couponChannelId, @@ -188,7 +188,7 @@ Page({ } }) } - + }, mySpecial: function() { console.log("special"); @@ -204,12 +204,12 @@ Page({ let that = this; let optionss; let openId = wx.getStorageSync('openId') - if(openId){ + if (openId) { that.setData({ - openId:openId + openId: openId }) } - if (wx.getStorageSync('options')){ + if (wx.getStorageSync('options')) { optionss = JSON.parse(wx.getStorageSync('options')); } if (options.played == "true") { @@ -235,7 +235,7 @@ Page({ let that = this; wx.getLocation({ type: "wgs84", - success: function (res) { + success: function(res) { console.log(res, 9999) if (res && res.longitude && res.latitude) { Http.post({ @@ -245,7 +245,7 @@ Page({ longitude: res.longitude } }).then(res => { - console.log(res,9999) + console.log(res, 9999) }) } }, @@ -264,7 +264,7 @@ Page({ let that = this; that.setData({ havePlayEd: app.globalData.havePlayEd ? app.globalData.havePlayEd : false, - havePlayEd1:app.globalData.havePlayEd1?app.globalData.havePlayEd1 : false + havePlayEd1: app.globalData.havePlayEd1 ? app.globalData.havePlayEd1 : false }) /** @@ -294,14 +294,14 @@ Page({ that.alphaClick(); }, 8000) // 如果有广告 - setTimeout(function () { + setTimeout(function() { // debugger that.alphaClick1(); }, 8000) }, getmemberId: function(token) { - let that = this; - Http.get({ + let that = this; + Http.get({ url: config.api.getScore, data: { token: token @@ -327,17 +327,17 @@ Page({ url: '/pages/czdetail/czdetail', }) }, - gotoBargain: function () { + gotoBargain: function() { wx.navigateTo({ url: '/pages/bargain/bargain', }) }, - gotoSpellGroup: function () { + gotoSpellGroup: function() { wx.navigateTo({ url: '/pages/spellGroup/spellGroup', }) }, - gotoCard: function () { + gotoCard: function() { wx.navigateTo({ url: '/pages/discountCardList/discountCardList', }) @@ -347,12 +347,12 @@ Page({ // url: '/pages/game/index', // }) // }, - gotoJfsc: function () { + gotoJfsc: function() { wx.navigateTo({ url: '/pages/integralmall/index', }) }, - + /** * * @param {code,page} @@ -374,7 +374,7 @@ Page({ that.topicShow(); that.getxsList(); that.getMallInfo(app.globalData.token); - + if (app.couponChannelListCallback) { app.couponChannelListCallback(app.globalData.token); } @@ -493,36 +493,36 @@ Page({ }); }, //获取限时抢购列表 - getxsList(){ + getxsList() { let that = this; Http.get({ - url: config.api.couponChannelList, - data: { - pageNum: 1, - pageSize: 3, - targetAd: 2 - } - }).then(res => { - if (res && res.data.total>0) { - that.setData({ - xslist: res.data.list, - showQg:true + url: config.api.couponChannelList, + data: { + pageNum: 1, + pageSize: 3, + targetAd: 2 + } + }).then(res => { + if (res && res.data.total > 0) { + that.setData({ + xslist: res.data.list, + showQg: true + }); + } else { + that.setData({ + showQg: false + }) + } + }) + .catch(err => { + console.log(err) + wx.showToast({ + title: err.errMsg, + icon: 'none', + duration: 2000, + mask: false }); - }else{ - that.setData({ - showQg:false - }) - } - }) - .catch(err => { - console.log(err) - wx.showToast({ - title: err.errMsg, - icon: 'none', - duration: 2000, - mask: false - }); - }) + }) }, /** * banner @@ -641,48 +641,48 @@ Page({ }) }, //限时抢购的详情页面 - gotodetail: function (e) { + gotodetail: function(e) { wx.navigateTo({ url: `/pages/coupon/detail/index?couponChannelId=${ e.currentTarget.dataset.couponchannelid }&couponId=${e.currentTarget.dataset.couponid}` }); }, - //浮层广告 - getGg: function (token) { + //浮层广告 + getGg: function(token) { let that = this Http.get({ - url: config.api.getGg, - data: { - token: token, - appId: config.weapp.AppId, - openId: that.data.openId - } - }).then(res => { - console.log(res) - if (res.data.id) { + url: config.api.getGg, + data: { + token: token, + appId: config.weapp.AppId, + openId: that.data.openId + } + }).then(res => { + console.log(res) + if (res.data.id) { + that.setData({ + showGg: true, + }) + console.log(that.data.showGg, 1111111111111) + } else { + that.setData({ + showGg: false + }) + that.getGameOne(app.globalData.token) + console.log(that.data.showGg, 222222222222222222) + } that.setData({ - showGg: true, + ggdata: res.data }) - console.log(that.data.showGg,1111111111111) - } else { - that.setData({ + }) + .catch(err => { + this.setData({ showGg: false }) that.getGameOne(app.globalData.token) - console.log(that.data.showGg,222222222222222222) - } - that.setData({ - ggdata: res.data + that.alphaClick1(); }) - }) - .catch(err => { - this.setData({ - showGg: false - }) - that.getGameOne(app.globalData.token) - that.alphaClick1(); - }) }, /** * 刷新