| @@ -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 | |||
| @@ -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(){ | |||
| @@ -33,6 +33,26 @@ | |||
| </view> | |||
| </view> | |||
| </navigator> | |||
| <!-- 我的砍价 --> | |||
| <navigator url="/pages/bargain/bargain?from=myhtml" open-type="navigate"> | |||
| <view class="user-btn app-border-bottom"> | |||
| <view> | |||
| <image class='icons' src="{{cheUrl}}" mode='widthFix'></image>我的砍价</view> | |||
| <view> | |||
| <text class="iconfont icon-right"></text> | |||
| </view> | |||
| </view> | |||
| </navigator> | |||
| <!-- 我的拼团 --> | |||
| <navigator url="/pages/spellGroup/spellGroup?from=myhtml" open-type="navigate"> | |||
| <view class="user-btn app-border-bottom"> | |||
| <view> | |||
| <image class='icons' src="{{cheUrl}}" mode='widthFix'></image>我的拼团</view> | |||
| <view> | |||
| <text class="iconfont icon-right"></text> | |||
| </view> | |||
| </view> | |||
| </navigator> | |||
| <navigator url="/pages/couponorder/index/index"> | |||
| <view class="user-btn app-border-bottom"> | |||
| <view> | |||
| @@ -72,6 +92,7 @@ | |||
| </view> | |||
| </view> | |||
| </navigator> | |||
| </view> | |||
| <view class="margin"></view> | |||
| <view bindlongtap='showVersion' class='version'> | |||
| @@ -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; | |||
| } | |||