diff --git a/components/hot/index.js b/components/hot/index.js
index c8029ec..2416774 100644
--- a/components/hot/index.js
+++ b/components/hot/index.js
@@ -80,13 +80,11 @@ Component({
},
// 换一换
getChange(){
- let that = this;
-
- if (that.pSize != 1 && that.pSize != 0){
- this.getList(1)
+ if (this.kSize != 1 && that.kSize != 0){
+ that.getList(1)
}
- if (that.pSize != 1 && that.pSize != 0) {
- this.getList(2)
+ if (this.pSize != 1 && that.pSize != 0) {
+ that.getList(2)
}
},
//跳转砍价详情
diff --git a/components/hot/index.wxml b/components/hot/index.wxml
index c200620..a5f72a2 100644
--- a/components/hot/index.wxml
+++ b/components/hot/index.wxml
@@ -5,7 +5,7 @@
爆款专区
-
+
换一换
diff --git a/pages/bargain/bargainDatail/bargainDatail.js b/pages/bargain/bargainDatail/bargainDatail.js
index bd06a29..02e4185 100644
--- a/pages/bargain/bargainDatail/bargainDatail.js
+++ b/pages/bargain/bargainDatail/bargainDatail.js
@@ -14,7 +14,7 @@ Page({
bannerUrl: imgurl.banner.url,
wmhome: imgurl.wmhome.url,
wmhelp: imgurl.wmhelp.url,
- wmsuccess01: imgurl.wmsuccess01.url,
+ chenggong: imgurl.chenggong.url,
fail: imgurl.fail.url,
data: null,
from: null,
diff --git a/pages/bargain/bargainDatail/bargainDatail.wxml b/pages/bargain/bargainDatail/bargainDatail.wxml
index dff4d92..fc9fd03 100644
--- a/pages/bargain/bargainDatail/bargainDatail.wxml
+++ b/pages/bargain/bargainDatail/bargainDatail.wxml
@@ -34,7 +34,7 @@
还需邀请{{data.pressLimitNum-data.orderPressList.length}}位好友,帮忙砍至底价
-
+
已砍至底价
diff --git a/pages/bargain/bargainDatail/bargainDatail.wxss b/pages/bargain/bargainDatail/bargainDatail.wxss
index b879fdc..1427b0a 100644
--- a/pages/bargain/bargainDatail/bargainDatail.wxss
+++ b/pages/bargain/bargainDatail/bargainDatail.wxss
@@ -322,23 +322,23 @@ page{
display: flex;
justify-content: space-around;
width: 520rpx;
- margin: 40rpx auto 0;
+ margin-top: 40rpx;
}
-.status button{
+.status button{
display: block;
- width: 250rpx;
+ width: 240rpx;
height: 75rpx;
line-height: 75rpx;
text-align: center;
border: none;
font-size: 32rpx;
+ margin: 0 auto;
}
button::after{ border: none; }
.status button:nth-of-type(1){
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
/* border:1px solid rgba(236,59,45,1); */
border-radius:48rpx;
- margin-top: 20rpx;
margin-bottom: 20rpx;
color: #fff;
}
diff --git a/pages/integralmall/payIntegcouponStatus/index.wxml b/pages/integralmall/payIntegcouponStatus/index.wxml
index 53559f8..8a4a17a 100644
--- a/pages/integralmall/payIntegcouponStatus/index.wxml
+++ b/pages/integralmall/payIntegcouponStatus/index.wxml
@@ -1,4 +1,4 @@
-
+
兑换成功
diff --git a/pages/integralmall/payIntegcoupondetail/index.wxml b/pages/integralmall/payIntegcoupondetail/index.wxml
index fc59747..b0dc613 100644
--- a/pages/integralmall/payIntegcoupondetail/index.wxml
+++ b/pages/integralmall/payIntegcoupondetail/index.wxml
@@ -3,9 +3,6 @@
-
-
-
diff --git a/pages/main/index.js b/pages/main/index.js
index f907466..c719858 100644
--- a/pages/main/index.js
+++ b/pages/main/index.js
@@ -72,7 +72,7 @@ Page({
credit: 0,
score: '0',
page: 1 ,// 刷新进入页面时已经加载了第一页数据,onReachBottom时 page++,从第2页开始加载
-
+ topicTitle:'',
},
close: function() {
this.setData({
@@ -516,11 +516,10 @@ Page({
}
}).then(res => {
if (res && res.data) {
- console.log(res.data.title)
that.setData({
name: res.data.name,
cover: res.data.cover,
- title: res.data.title,
+ topicTitle: res.data.title,
id: res.data.id,
showTopic: true
})
@@ -627,7 +626,7 @@ Page({
// that.selectComponent("#spellGroup").getList();
// that.selectComponent("#rushtobyCard").getList();
wx.stopPullDownRefresh();
- //砍价,拼团下拉刷新
+ //爆款专区下拉刷新
that.selectComponent("#hot").getList();
},
//加载更多
diff --git a/pages/main/index.wxml b/pages/main/index.wxml
index 443def1..abb821a 100644
--- a/pages/main/index.wxml
+++ b/pages/main/index.wxml
@@ -77,7 +77,7 @@
{{name}}
- {{title}}
+ {{topicTitle}}
diff --git a/utils/imgurl.js b/utils/imgurl.js
index 5d96230..9d4cad3 100644
--- a/utils/imgurl.js
+++ b/utils/imgurl.js
@@ -705,5 +705,9 @@ module.exports = {
'url': baseUrl + "jiaofei.png",
'name': ''
},
+ 'chenggong': {
+ 'url': baseUrl + "chenggong.png",
+ 'name': ''
+ },
}
\ No newline at end of file