diff --git a/app.wxss b/app.wxss index adb84a6..2ab9d45 100644 --- a/app.wxss +++ b/app.wxss @@ -1,4 +1,4 @@ -@import "weui.wxss"; +/* @import "weui.wxss"; */ @font-face { font-family: "iconfont"; /* project id 777313 */ diff --git a/pages/acSignIn/index.js b/pages/acSignIn/index.js index 3b290f3..4f2e65d 100644 --- a/pages/acSignIn/index.js +++ b/pages/acSignIn/index.js @@ -23,7 +23,6 @@ Page({ }) } }, - // pages/index/searchbar/index signIn(id){ let that = this; Http.post({ @@ -55,11 +54,10 @@ Page({ title: '此活动报名已结束', }) } - }, goback: function () { wx.switchTab({ url: '/pages/main/index', }) - }, + } }) \ No newline at end of file diff --git a/pages/main/index.js b/pages/main/index.js index 11f9a9d..47671ee 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -69,15 +69,7 @@ Page({ display: 'none', display1: 'none', optionsData: null, - credit: 0, - score: '0', - page: 1 ,// 刷新进入页面时已经加载了第一页数据,onReachBottom时 page++,从第2页开始加载 - topicTitle:'', - }, - close: function() { - this.setData({ - showIf: false - }) + page: 1 // 刷新进入页面时已经加载了第一页数据,onReachBottom时 page++,从第2页开始加载 }, alphaClick: function(even) { var animation = wx.createAnimation({}) @@ -272,13 +264,10 @@ Page({ levelName: res.data.levelName, upgradePercent: res.data.upgradePercent, upgradeScore: res.data.upgradeScore, - credit: res.data.credit ? res.data.credit : 0, - score: res.data.score }) if (res.data.nickName) { that.setData({ - ismember: true, memberId: res.data.id }) var initUrl = JSON.stringify({ @@ -528,7 +517,6 @@ Page({ that.setData({ name: res.data.name, cover: res.data.cover, - topicTitle: res.data.title, id: res.data.id, showTopic: true }) diff --git a/pages/main/index.wxml b/pages/main/index.wxml index 265548e..62d8b26 100644 --- a/pages/main/index.wxml +++ b/pages/main/index.wxml @@ -16,19 +16,10 @@ - 还需{{upgradeScore}}成长值可升级 - - @@ -72,44 +63,11 @@ 抢购 - - - - - - - - - - -