From d177d85f5c04210e54ad741088802ed2f08cf39f Mon Sep 17 00:00:00 2001
From: rui <1593038819@qq.com>
Date: Fri, 2 Aug 2019 00:02:40 +0800
Subject: [PATCH] =?UTF-8?q?[=E9=99=90=E6=97=B6=E6=8A=A2=E8=B4=AD][?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=B1=95=E7=A4=BA=E9=80=BB=E8=BE=91]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/hot/index.js | 12 +++++++-----
components/hot/index.wxml | 2 +-
components/hot/index.wxss | 2 +-
pages/index/searchbar/detail/index.wxml | 12 ++++++------
pages/index/searchbar/detail/index.wxss | 4 ++++
pages/index/searchbar/index.wxml | 2 +-
pages/main/index.js | 9 ++++++++-
pages/main/index.wxml | 2 +-
pages/passCar/passCar.js | 1 +
9 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/components/hot/index.js b/components/hot/index.js
index db7b134..62216a7 100644
--- a/components/hot/index.js
+++ b/components/hot/index.js
@@ -53,7 +53,8 @@ Component({
if(val=='1'){
that.setData({
kData: res.data,
- couponId: res.data.couponId
+ couponId: res.data.couponId,
+ // title:res.data.
});
}else{
that.setData({
@@ -76,10 +77,11 @@ Component({
},
// 换一换
getChange(){
- if (this.data.couponId){
+ let that = this;
+ if (that.data.couponId){
this.getList(1)
}
- if (this.data.couponId1) {
+ if (that.data.couponId1) {
this.getList(2)
}
},
@@ -111,8 +113,8 @@ Component({
ready() {
app.couponChannelListCallback = (token,val) => {
Http.setToken(token);
- this.getList('1');
- this.getList('2');
+ this.getList(1);
+ this.getList(2);
};
if (app.globalData.token && app.globalData.token != null) {
app.couponChannelListCallback(app.globalData.token);
diff --git a/components/hot/index.wxml b/components/hot/index.wxml
index b7f1b8f..6c4ef0f 100644
--- a/components/hot/index.wxml
+++ b/components/hot/index.wxml
@@ -5,7 +5,7 @@
爆款专区
-
+
换一换
diff --git a/components/hot/index.wxss b/components/hot/index.wxss
index ac8d216..a5b3a27 100644
--- a/components/hot/index.wxss
+++ b/components/hot/index.wxss
@@ -3,7 +3,7 @@
.hotBox{
width:710rpx;
height: 220rpx;
- margin: 0 auto 20rpx;
+ margin: 20rpx auto 0;
}
.hotTitle{
width: 100%;
diff --git a/pages/index/searchbar/detail/index.wxml b/pages/index/searchbar/detail/index.wxml
index 0e300e9..b536682 100644
--- a/pages/index/searchbar/detail/index.wxml
+++ b/pages/index/searchbar/detail/index.wxml
@@ -29,7 +29,7 @@
-
+
商户位置:
@@ -42,7 +42,7 @@
-
+
客服电话:
@@ -57,7 +57,7 @@
-
+
商户活动
@@ -97,10 +97,10 @@
{{loadingtext}}
-
-
+
+
{{data.introduction}}
- 信息完善中,敬请期待~
+ 信息完善中,敬请期待~
diff --git a/pages/index/searchbar/detail/index.wxss b/pages/index/searchbar/detail/index.wxss
index 2b0d238..07587b2 100644
--- a/pages/index/searchbar/detail/index.wxss
+++ b/pages/index/searchbar/detail/index.wxss
@@ -75,6 +75,7 @@ page{
font-family:PingFangSC-Regular;
font-weight:400;
color:rgba(60,60,60,1);
+ margin-top: 20rpx;
}
/* .merchant-brand view:nth-child(1) image {
display: block;
@@ -221,6 +222,9 @@ page{
width: 92%;
margin: 0 auto;
}
+.shopHr{
+ margin-bottom: 20rpx;
+}
.tabs-item.selected {
color: rgba(171, 149, 109, 0.8);
border-bottom: 2px solid rgba(171, 149, 109, 0.8);
diff --git a/pages/index/searchbar/index.wxml b/pages/index/searchbar/index.wxml
index 6c3c540..962055b 100644
--- a/pages/index/searchbar/index.wxml
+++ b/pages/index/searchbar/index.wxml
@@ -3,7 +3,7 @@
-
+
diff --git a/pages/main/index.js b/pages/main/index.js
index f0a692d..6c9884a 100644
--- a/pages/main/index.js
+++ b/pages/main/index.js
@@ -58,6 +58,7 @@ Page({
scrollTop: 0,
showGame: false,
showTopic: false,
+ showQg:false,
gamedata: {},
couponId: '', //游戏返回时传回的字段
played: false, //从游戏页面跳回首页返回true
@@ -464,7 +465,12 @@ Page({
if (res && res.data) {
that.setData({
xslist: res.data.list,
+ showQg:true
});
+ }else{
+ that.setData({
+ showQg:false
+ })
}
})
.catch(err => {
@@ -617,11 +623,12 @@ Page({
wx.stopPullDownRefresh();
};
// 砍价下拉刷新
- that.selectComponent("#hot").getList();
// that.selectComponent("#bargain").getList();
// that.selectComponent("#spellGroup").getList();
// that.selectComponent("#rushtobyCard").getList();
wx.stopPullDownRefresh();
+ //砍价,拼团下拉刷新
+ that.selectComponent("#hot").getList();
},
//加载更多
onReachBottom: function() {
diff --git a/pages/main/index.wxml b/pages/main/index.wxml
index 2193924..d0856cc 100644
--- a/pages/main/index.wxml
+++ b/pages/main/index.wxml
@@ -59,7 +59,7 @@
-
+
diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js
index 4435b53..0a0b81b 100644
--- a/pages/passCar/passCar.js
+++ b/pages/passCar/passCar.js
@@ -9,6 +9,7 @@ const imgurl = require("../../utils/imgurl");
Page({
data: {
navigationBarHeight,
+ jianUrl: imgurl.jian.url,
parkUrl: imgurl.park.url,
guanliHr: imgurl.guanliHr.url,
qidaiUrl: imgurl.qidai.url,