diff --git a/pages/bargain/bargain.js b/pages/bargain/bargain.js index 30cd546..cacce2a 100644 --- a/pages/bargain/bargain.js +++ b/pages/bargain/bargain.js @@ -24,19 +24,27 @@ Page({ loadingUrl: imgurl.loading.url, flag: 'bargaingoods', }, - onLoad: function () { + onLoad: function (options) { + console.log(options) let that = this; + // options.from =='myhtml' + // 来自我的列表 + if (options && options.from =='myhtml'){ + that.mybargain(); + }else{ + that.getList(1, "bargaingoods"); + that.setData({ + flag: "bargaingoods", + bargaingoods: true, + mybargain: false + }) + } that.getBannerlist(); var todayDate=new Date().getTime(); that.setData({ todayDate:todayDate }) - that.getList(1, "bargaingoods"); - that.setData({ - flag: "bargaingoods", - bargaingoods:true, - mybargain:false - }) + }, /** * banner diff --git a/pages/spellGroup/spellGroup.js b/pages/spellGroup/spellGroup.js index 8dee4b7..896d7b6 100644 --- a/pages/spellGroup/spellGroup.js +++ b/pages/spellGroup/spellGroup.js @@ -25,21 +25,26 @@ Page({ content:'数据正在加载中', flag: 'spellList', }, - onLoad: function () { + onLoad: function (options) { let that = this; that.getBannerlist(); var todayDate = new Date().getTime(); that.setData({ todayDate: todayDate }) - that.getList(1, "spellList"); + if(options&&options.from=='myhtml'){ + that.getmyList(); + } + else{ + that.getList(1, "spellList"); + that.setData({ + flag: "spellList", + spellList: true, + myspellList: false, + lists: null + }) + } that.getUserInfo(); - that.setData({ - flag: "spellList", - spellList: true, - myspellList: false, - lists: null - }) }, //切换拼团列表 getSpellList(){ diff --git a/pages/user/index.wxml b/pages/user/index.wxml index eeec8e1..560cef2 100644 --- a/pages/user/index.wxml +++ b/pages/user/index.wxml @@ -33,6 +33,26 @@ + + + + + 我的砍价 + + + + + + + + + + 我的拼团 + + + + + @@ -72,6 +92,7 @@ + diff --git a/pages/user/index.wxss b/pages/user/index.wxss index 3a82c6c..7ba95e4 100644 --- a/pages/user/index.wxss +++ b/pages/user/index.wxss @@ -1,6 +1,6 @@ page{ - height: 100%; - overflow: hidden; + overflow-y:visible!important; + height: auto!important; } .icons { width: 40rpx; @@ -10,7 +10,6 @@ page{ .user { background: #fff; - min-height: 100vh; } .navigator-hover { @@ -141,7 +140,7 @@ page{ .user-btns { background: #fff; - margin-top: 65rpx; + margin-top: 20rpx; padding: 0 30rpx; } @@ -211,7 +210,7 @@ page{ .gzh { /* display: none; */ position: absolute; - bottom: 16%; + bottom: 70rpx; width: 90%; left: 0; right: 0; @@ -229,7 +228,7 @@ page{ .of { display: block; - margin-top: 40rpx; + /* margin-top: 40rpx; */ height: 170rpx; }