diff --git a/components/hot/index.js b/components/hot/index.js
index 62216a7..c8029ec 100644
--- a/components/hot/index.js
+++ b/components/hot/index.js
@@ -22,6 +22,8 @@ Component({
barginicon: imgurl.barginicon.url,
wangmeimeibargin: imgurl.wangmeimeibargin.url,
kData:[],
+ kSize:'',
+ pSize: '',
pData:[],
couponId:'',
couponId1: '',
@@ -52,14 +54,15 @@ Component({
if(res.data){
if(val=='1'){
that.setData({
- kData: res.data,
- couponId: res.data.couponId,
- // title:res.data.
+ kData: res.data.data,
+ kSize: res.data.size,
+ couponId: res.data.data.couponId,
});
}else{
that.setData({
- pData: res.data,
- couponId1: res.data.couponId
+ pData: res.data.data,
+ pSize:res.data.size,
+ couponId1: res.data.data.couponId
});
}
}
@@ -78,10 +81,11 @@ Component({
// 换一换
getChange(){
let that = this;
- if (that.data.couponId){
+
+ if (that.pSize != 1 && that.pSize != 0){
this.getList(1)
}
- if (that.data.couponId1) {
+ if (that.pSize != 1 && that.pSize != 0) {
this.getList(2)
}
},
diff --git a/components/hot/index.wxml b/components/hot/index.wxml
index 6c4ef0f..c200620 100644
--- a/components/hot/index.wxml
+++ b/components/hot/index.wxml
@@ -5,7 +5,7 @@
爆款专区
-
+
换一换
diff --git a/pages/bargain/bargain.js b/pages/bargain/bargain.js
index cfa0ab4..7414e58 100644
--- a/pages/bargain/bargain.js
+++ b/pages/bargain/bargain.js
@@ -1,4 +1,4 @@
-const navigationBarHeight = (getApp().statusBarHeight + 50) + 'px'
+const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'
var config = require("../../config/config.js");
const Http = require("../../utils/HttpBasics");
const imgurl = require("../../utils/imgurl");
diff --git a/pages/bargain/bargainDatail/bargainDatail.js b/pages/bargain/bargainDatail/bargainDatail.js
index 26757ff..bd06a29 100644
--- a/pages/bargain/bargainDatail/bargainDatail.js
+++ b/pages/bargain/bargainDatail/bargainDatail.js
@@ -1,3 +1,4 @@
+const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'
var config = require("../../../config/config.js");
var app = getApp();
const Http = require("../../../utils/HttpBasics");
@@ -9,6 +10,7 @@ Page({
* 页面的初始数据
*/
data: {
+ navigationBarHeight,
bannerUrl: imgurl.banner.url,
wmhome: imgurl.wmhome.url,
wmhelp: imgurl.wmhelp.url,
diff --git a/pages/bargain/bargainDatail/bargainDatail.json b/pages/bargain/bargainDatail/bargainDatail.json
index b9200c1..3632767 100644
--- a/pages/bargain/bargainDatail/bargainDatail.json
+++ b/pages/bargain/bargainDatail/bargainDatail.json
@@ -2,5 +2,8 @@
"navigationBarTitleText": "砍价详情",
"navigationBarBackgroundColor":"#F4F5F9",
"navigationBarTextStyle": "black",
- "enablePullDownRefresh": true
+ "enablePullDownRefresh": true,
+ "usingComponents": {
+ "navbar": "../../../components/navbar/navbar"
+ }
}
diff --git a/pages/bargain/bargainDatail/bargainDatail.wxml b/pages/bargain/bargainDatail/bargainDatail.wxml
index 9921f7c..cde1c57 100644
--- a/pages/bargain/bargainDatail/bargainDatail.wxml
+++ b/pages/bargain/bargainDatail/bargainDatail.wxml
@@ -1,5 +1,6 @@
-
+
+
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index 5ec38d2..0c10011 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -21,7 +21,7 @@
- 分享有礼
+
diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss
index bc54d76..c0e0003 100644
--- a/pages/coupon/detail/index.wxss
+++ b/pages/coupon/detail/index.wxss
@@ -79,21 +79,18 @@ button::after {
right: 28rpx;
top: 27rpx;
width: 108rpx;
+ height: 180rpx;
+ /* display: flex;
+ flex-direction:column; */
}
.fenxiang image {
width:48rpx;
height: 48rpx;
- position: absolute;
- top: 0;
- right: 16rpx;
}
.gift{
color: #3C3C3C;
font-size: 20rpx;
- position: absolute;
- top: 50rpx;
- right: 0;
}
.user-motto {