diff --git a/pages/integralmall/index.wxml b/pages/integralmall/index.wxml
index 349802b..8304e3c 100644
--- a/pages/integralmall/index.wxml
+++ b/pages/integralmall/index.wxml
@@ -8,7 +8,7 @@
暂无数据
-
+
热门好礼
diff --git a/pages/integralmall/index.wxss b/pages/integralmall/index.wxss
index 48dcbaf..c1c3991 100644
--- a/pages/integralmall/index.wxss
+++ b/pages/integralmall/index.wxss
@@ -281,7 +281,7 @@ image{
margin: 0 auto;
border-radius:15rpx;
box-sizing: border-box;
- margin-top: 320rpx;
+ margin-top: 20rpx;
}
.no-data{
width: 690rpx;
diff --git a/pages/main/index.js b/pages/main/index.js
index 77d7c3e..935b38d 100644
--- a/pages/main/index.js
+++ b/pages/main/index.js
@@ -279,7 +279,7 @@ Page({
levelName: res.data.levelName,
upgradePercent: res.data.upgradePercent,
upgradeScore: res.data.upgradeScore,
- credit: res.data.credit,
+ credit: res.data.credit ? res.data.credit:0,
score: res.data.score
})
if (res.data.nickName) {
@@ -441,16 +441,14 @@ Page({
token: token,
}
}).then(res => {
- console.log(res.data+"eeee");
that.setData({
- weappShareTitle: res.data.weappShareTitle,
- weappShareCoverImg: res.data.weappShareCoverImg,
+ weappShareTitle: res.data.weappShareTitle ? res.data.weappShareTitle:null,
+ weappShareCoverImg: res.data.weappShareCoverImg ? res.data.weappShareCoverImg:null,
});
})
- .catch(err => {
+ .catch(err => {
- })
- ;
+ });
},
/**
* banner