@@ -53,7 +53,8 @@ Component({ | |||||
if(val=='1'){ | if(val=='1'){ | ||||
that.setData({ | that.setData({ | ||||
kData: res.data, | kData: res.data, | ||||
couponId: res.data.couponId | |||||
couponId: res.data.couponId, | |||||
// title:res.data. | |||||
}); | }); | ||||
}else{ | }else{ | ||||
that.setData({ | that.setData({ | ||||
@@ -76,10 +77,11 @@ Component({ | |||||
}, | }, | ||||
// 换一换 | // 换一换 | ||||
getChange(){ | getChange(){ | ||||
if (this.data.couponId){ | |||||
let that = this; | |||||
if (that.data.couponId){ | |||||
this.getList(1) | this.getList(1) | ||||
} | } | ||||
if (this.data.couponId1) { | |||||
if (that.data.couponId1) { | |||||
this.getList(2) | this.getList(2) | ||||
} | } | ||||
}, | }, | ||||
@@ -111,8 +113,8 @@ Component({ | |||||
ready() { | ready() { | ||||
app.couponChannelListCallback = (token,val) => { | app.couponChannelListCallback = (token,val) => { | ||||
Http.setToken(token); | Http.setToken(token); | ||||
this.getList('1'); | |||||
this.getList('2'); | |||||
this.getList(1); | |||||
this.getList(2); | |||||
}; | }; | ||||
if (app.globalData.token && app.globalData.token != null) { | if (app.globalData.token && app.globalData.token != null) { | ||||
app.couponChannelListCallback(app.globalData.token); | app.couponChannelListCallback(app.globalData.token); | ||||
@@ -5,7 +5,7 @@ | |||||
<view class='sql' style='background:{{sql}}'></view> | <view class='sql' style='background:{{sql}}'></view> | ||||
<text>爆款专区</text> | <text>爆款专区</text> | ||||
</view> | </view> | ||||
<view class='titleR' bindtap='getChange' > | |||||
<view class='titleR' bindtap='getChange' wx:if='{{kData.id || pData.id}}' > | |||||
<text style='color:{{txt}}'>换一换</text> | <text style='color:{{txt}}'>换一换</text> | ||||
<view> | <view> | ||||
<image src='{{change}}' bindtap='' mode='aspectFill'></image> | <image src='{{change}}' bindtap='' mode='aspectFill'></image> | ||||
@@ -3,7 +3,7 @@ | |||||
.hotBox{ | .hotBox{ | ||||
width:710rpx; | width:710rpx; | ||||
height: 220rpx; | height: 220rpx; | ||||
margin: 0 auto 20rpx; | |||||
margin: 20rpx auto 0; | |||||
} | } | ||||
.hotTitle{ | .hotTitle{ | ||||
width: 100%; | width: 100%; | ||||
@@ -29,7 +29,7 @@ | |||||
</view> | </view> | ||||
<!-- 一个商铺 --> | <!-- 一个商铺 --> | ||||
<!-- 多个商铺 --> | <!-- 多个商铺 --> | ||||
<view class='merchant-shop'> | |||||
<view class='merchant-shop shopHr'> | |||||
<view class='clearfix' style='width:100%;'> | <view class='clearfix' style='width:100%;'> | ||||
<view class='fl'> | <view class='fl'> | ||||
<text>商户位置:</text> | <text>商户位置:</text> | ||||
@@ -42,7 +42,7 @@ | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<!-- 联系方式 --> | <!-- 联系方式 --> | ||||
<view class='merchant-shop' wx:if="{{data.linkLinePhone}}"> | |||||
<view class='merchant-shop shopHr' wx:if="{{data.linkLinePhone}}"> | |||||
<view class='clearfix' style='width:100%;'> | <view class='clearfix' style='width:100%;'> | ||||
<view class='fl'> | <view class='fl'> | ||||
<text>客服电话:</text> | <text>客服电话:</text> | ||||
@@ -57,7 +57,7 @@ | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<!-- 商户活动 --> | <!-- 商户活动 --> | ||||
<view class='merchant-shop' wx:if="{{data.actionDesc}}" > | |||||
<view class='merchant-shop shopHr' wx:if="{{data.actionDesc}}" > | |||||
<view class='notes'> | <view class='notes'> | ||||
<view> | <view> | ||||
<text>商户活动</text> | <text>商户活动</text> | ||||
@@ -97,10 +97,10 @@ | |||||
<view class='loadingtext' wx:if="{{loadingtext}}">{{loadingtext}}</view> | <view class='loadingtext' wx:if="{{loadingtext}}">{{loadingtext}}</view> | ||||
</view> | </view> | ||||
<!-- 商户简介 --> | <!-- 商户简介 --> | ||||
<view wx:elif="{{currentTab==1}}"> | |||||
<image src="{{noMerchant}}" mode="widthFix"></image> | |||||
<view wx:elif="{{currentTab==1}}" > | |||||
<image src="{{noMerchant}}" wx:if="{{!data.introduction}}" mode="widthFix"></image> | |||||
<text wx:if="{{data.introduction}}">{{data.introduction}}</text> | <text wx:if="{{data.introduction}}">{{data.introduction}}</text> | ||||
<text wx:else>信息完善中,敬请期待~</text> | |||||
<text wx:if="{{!data.introduction}}">信息完善中,敬请期待~</text> | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<view class='merchant-info'> | <view class='merchant-info'> | ||||
@@ -75,6 +75,7 @@ page{ | |||||
font-family:PingFangSC-Regular; | font-family:PingFangSC-Regular; | ||||
font-weight:400; | font-weight:400; | ||||
color:rgba(60,60,60,1); | color:rgba(60,60,60,1); | ||||
margin-top: 20rpx; | |||||
} | } | ||||
/* .merchant-brand view:nth-child(1) image { | /* .merchant-brand view:nth-child(1) image { | ||||
display: block; | display: block; | ||||
@@ -221,6 +222,9 @@ page{ | |||||
width: 92%; | width: 92%; | ||||
margin: 0 auto; | margin: 0 auto; | ||||
} | } | ||||
.shopHr{ | |||||
margin-bottom: 20rpx; | |||||
} | |||||
.tabs-item.selected { | .tabs-item.selected { | ||||
color: rgba(171, 149, 109, 0.8); | color: rgba(171, 149, 109, 0.8); | ||||
border-bottom: 2px solid rgba(171, 149, 109, 0.8); | border-bottom: 2px solid rgba(171, 149, 109, 0.8); | ||||
@@ -3,7 +3,7 @@ | |||||
<view style="padding-top:{{navigationBarHeight}}"> | <view style="padding-top:{{navigationBarHeight}}"> | ||||
<view class='under_line'></view> | <view class='under_line'></view> | ||||
<view style='float: left' class='left'> | <view style='float: left' class='left'> | ||||
<scroll-view scroll-y scroll-with-animation scroll-left="{{scrollLength}}" class='scrollY' style='height: {{windowHeight}}px'> | |||||
<scroll-view scroll-y scroll-with-animation scroll-left="{{scrollLength}}" class='scrollY' style='height: {{windowHeight}}px;padding-top:{{navigationBarHeight}}'> | |||||
<view class='all clear'> | <view class='all clear'> | ||||
<block wx:for="{{lists}}" wx:key="{{index}}"> | <block wx:for="{{lists}}" wx:key="{{index}}"> | ||||
<view bindtap='jumpIndex' data-menuindex='{{item.id}}'> | <view bindtap='jumpIndex' data-menuindex='{{item.id}}'> | ||||
@@ -58,6 +58,7 @@ Page({ | |||||
scrollTop: 0, | scrollTop: 0, | ||||
showGame: false, | showGame: false, | ||||
showTopic: false, | showTopic: false, | ||||
showQg:false, | |||||
gamedata: {}, | gamedata: {}, | ||||
couponId: '', //游戏返回时传回的字段 | couponId: '', //游戏返回时传回的字段 | ||||
played: false, //从游戏页面跳回首页返回true | played: false, //从游戏页面跳回首页返回true | ||||
@@ -464,7 +465,12 @@ Page({ | |||||
if (res && res.data) { | if (res && res.data) { | ||||
that.setData({ | that.setData({ | ||||
xslist: res.data.list, | xslist: res.data.list, | ||||
showQg:true | |||||
}); | }); | ||||
}else{ | |||||
that.setData({ | |||||
showQg:false | |||||
}) | |||||
} | } | ||||
}) | }) | ||||
.catch(err => { | .catch(err => { | ||||
@@ -617,11 +623,12 @@ Page({ | |||||
wx.stopPullDownRefresh(); | wx.stopPullDownRefresh(); | ||||
}; | }; | ||||
// 砍价下拉刷新 | // 砍价下拉刷新 | ||||
that.selectComponent("#hot").getList(); | |||||
// that.selectComponent("#bargain").getList(); | // that.selectComponent("#bargain").getList(); | ||||
// that.selectComponent("#spellGroup").getList(); | // that.selectComponent("#spellGroup").getList(); | ||||
// that.selectComponent("#rushtobyCard").getList(); | // that.selectComponent("#rushtobyCard").getList(); | ||||
wx.stopPullDownRefresh(); | wx.stopPullDownRefresh(); | ||||
//砍价,拼团下拉刷新 | |||||
that.selectComponent("#hot").getList(); | |||||
}, | }, | ||||
//加载更多 | //加载更多 | ||||
onReachBottom: function() { | onReachBottom: function() { | ||||
@@ -59,7 +59,7 @@ | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<!-- 每日头条 限时抢购 --> | <!-- 每日头条 限时抢购 --> | ||||
<view class='toutiao' bindtap='gotoRushBuy'> | |||||
<view class='toutiao' bindtap='gotoRushBuy' wx:if="{{showQg}}"> | |||||
<view class='imgBox'> | <view class='imgBox'> | ||||
<image src='{{toutiao}}' mode='aspectFill'></image> | <image src='{{toutiao}}' mode='aspectFill'></image> | ||||
</view> | </view> | ||||
@@ -9,6 +9,7 @@ const imgurl = require("../../utils/imgurl"); | |||||
Page({ | Page({ | ||||
data: { | data: { | ||||
navigationBarHeight, | navigationBarHeight, | ||||
jianUrl: imgurl.jian.url, | |||||
parkUrl: imgurl.park.url, | parkUrl: imgurl.park.url, | ||||
guanliHr: imgurl.guanliHr.url, | guanliHr: imgurl.guanliHr.url, | ||||
qidaiUrl: imgurl.qidai.url, | qidaiUrl: imgurl.qidai.url, | ||||