diff --git a/assets/myinfo/dbzgl.png b/assets/myinfo/dbzgl.png
deleted file mode 100644
index 0ad15cf..0000000
Binary files a/assets/myinfo/dbzgl.png and /dev/null differ
diff --git a/assets/myinfo/dflb.png b/assets/myinfo/dflb.png
deleted file mode 100644
index ea42bc1..0000000
Binary files a/assets/myinfo/dflb.png and /dev/null differ
diff --git a/assets/myinfo/incon13.png b/assets/myinfo/incon13.png
deleted file mode 100644
index b3d4efa..0000000
Binary files a/assets/myinfo/incon13.png and /dev/null differ
diff --git a/assets/myinfo/rtWhite.png b/assets/myinfo/rtWhite.png
deleted file mode 100644
index 793fff5..0000000
Binary files a/assets/myinfo/rtWhite.png and /dev/null differ
diff --git a/pages/home/index/index.js b/pages/home/index/index.js
index 5d9f148..fe552b7 100644
--- a/pages/home/index/index.js
+++ b/pages/home/index/index.js
@@ -11,11 +11,13 @@ Component({
addGlobalClass: true,
multipleSlots: true
},
+ properties: {
+ height: { type: Number, value: 0 }
+ },
/**
* 页面的初始数据
*/
data: {
- height: app.globalData.safeFragmentHeight,
firstShow: false,
userInfo: null,
avatarUrl: '/assets/myinfo/user-icon.png',
@@ -71,6 +73,9 @@ Component({
})
},
handUserInfo: function(){
+ if(!app.globalData.userInfo){
+ return
+ }
var nickname = ''
if (app.globalData.userInfo.isAuth) {
nickname = app.globalData.userInfo.realName.substring(0, 14)
@@ -86,8 +91,7 @@ Component({
if(app.globalData.isVIP == 1 && app.globalData.userInfo.memberExpiredAt){
app.globalData.userInfo.memberExpiredAt = util.formatDate(new Date(app.globalData.userInfo.memberExpiredAt.replace(/\-/g, "/")), 'Y-M-D')
}
- this.setData({ height: (app.globalData.safeFragmentHeight + app.globalData.statusBarHeight - 100),
- CustomBar: app.globalData.CustomBar, avatarUrl: app.globalData.userInfo.avatarUrl, userInfo: app.globalData.userInfo })
+ this.setData({ CustomBar: app.globalData.CustomBar, avatarUrl: app.globalData.userInfo.avatarUrl, userInfo: app.globalData.userInfo })
},
fetchUserInfo: function () {
if (!app.globalData.token) {
diff --git a/pages/home/index/index.wxss b/pages/home/index/index.wxss
index f6eafdb..ca7ed38 100644
--- a/pages/home/index/index.wxss
+++ b/pages/home/index/index.wxss
@@ -141,17 +141,8 @@
right: 56rpx;
top: -34rpx;
}
-
-
-
-.dmArea2-bottom {
- width: 100%;
- padding: 56rpx 50rpx 30rpx 50rpx;
- justify-content: space-between
-}
-
.dmArea2-bottom-content {
width: 100%;
display: flex;
@@ -178,13 +169,6 @@
margin-top: 7rpx;
}
-.dmArea3-left {
- width: 380rpx;
- height: 100%;
- float: left;
- padding-top: 7rpx;
-}
-
.dmArea3-right {
width: 120rpx;
height: 50rpx;
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index e2bc44d..302a94c 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -9,7 +9,7 @@
-
+