diff --git a/pages/home/index/index.js b/pages/home/index/index.js
index 73d15c1..3da0b07 100644
--- a/pages/home/index/index.js
+++ b/pages/home/index/index.js
@@ -44,6 +44,11 @@ Component({
height: app.globalData.safeFragmentHeight,
userInfo: app.globalData.userInfo
})
+ if (app.globalData.userInfo && app.globalData.userInfo.memberExpiredAt) {
+ this.setData({
+ 'userInfo.memberExpiredAt': app.globalData.userInfo.memberExpiredAt.memberExpiredAt
+ })
+ }
}
this.fetchUserInfo()
this.data.firstShow = true
@@ -82,11 +87,16 @@ Component({
userInfo: app.globalData.userInfo,
userName: nickname
})
+ if(this.data.userInfo.isVIP==1){
+ this.setData({
+ 'userInfo.memberExpiredAt':util.formatDate(new Date(app.globalData.userInfo.memberExpiredAt), 'Y-M-D')
+ })
+ }
})
getBalanceInfo().then(result => {
this.setData({
accountMoney: math.minus(result.data.accountMoney, result.data.frozenMoney),
- frozenMoney:result.data.frozenMoney
+ frozenMoney: result.data.frozenMoney
})
})
getMessageNumber().then(result => {
@@ -118,22 +128,32 @@ Component({
util.navigateTo('/pages/home/setting/index')
} else if (e.currentTarget.id == 'tovip') {
util.navigateTo('/pages/ztbvip/index')
- }else if (e.currentTarget.id == 'myCus') {
+ } else if (e.currentTarget.id == 'myCus') {
util.navigateTo('/pages/home/service/index')
- }else if (e.currentTarget.id == 'qnLogistic') {
+ } else if (e.currentTarget.id == 'qnLogistic') {
util.navigateTo('/pages/html/logistics/index')
} else if (e.currentTarget.id == 'toMyMoney') {
util.navigateTo('/pages/bank/bill/index')
} else if (e.currentTarget.id == 'agent50') {
- wx.navigateTo({ url: '/pages/agent/order/index?status=50&tabIndex=1' })
+ wx.navigateTo({
+ url: '/pages/agent/order/index?status=50&tabIndex=1'
+ })
} else if (e.currentTarget.id == 'agent51') {
- wx.navigateTo({ url: '/pages/agent/order/index?status=51&tabIndex=2' })
+ wx.navigateTo({
+ url: '/pages/agent/order/index?status=51&tabIndex=2'
+ })
} else if (e.currentTarget.id == 'agent53') {
- wx.navigateTo({ url: '/pages/agent/order/index?status=53&tabIndex=3' })
+ wx.navigateTo({
+ url: '/pages/agent/order/index?status=53&tabIndex=3'
+ })
} else if (e.currentTarget.id == 'agent54') {
- wx.navigateTo({ url: '/pages/agent/order/index?status=54&tabIndex=4' })
+ wx.navigateTo({
+ url: '/pages/agent/order/index?status=54&tabIndex=4'
+ })
} else if (e.currentTarget.id == 'agent55') {
- wx.navigateTo({ url: '/pages/agent/order/index?status=55&tabIndex=5' })
+ wx.navigateTo({
+ url: '/pages/agent/order/index?status=55&tabIndex=5'
+ })
}
},
toUserInfo: function () {
diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml
index b939dae..64eb38a 100644
--- a/pages/home/index/index.wxml
+++ b/pages/home/index/index.wxml
@@ -7,18 +7,18 @@
-
- {{userName}}\n
+
+
+ {{userInfo.realName}}
+
+
+
{{userInfo.mobile}}
点击登录\n
登陆解锁更多功能
-
-
-
-
@@ -38,7 +38,7 @@
VIP会员
- {{userInfo.memberExpiredAt}}
+ 到期时间：{{userInfo.memberExpiredAt}}
立即开通会员 尊享特权
@@ -48,11 +48,15 @@
- 开通会员
+ 立即续费
+ 开通会员
- 代卖订单
+
+ 代卖订单
+ 查看更多订单>
+
@@ -88,7 +92,7 @@
-
+
我的钱包
进入钱包>
@@ -102,7 +106,7 @@
提现中的金额
- 查看账单
+ 查看账单
我的账单
@@ -122,7 +126,10 @@
- 其他工具
+
+ 其他工具
+
+
diff --git a/pages/home/index/index.wxss b/pages/home/index/index.wxss
index eec0fa4..5b34024 100644
--- a/pages/home/index/index.wxss
+++ b/pages/home/index/index.wxss
@@ -36,7 +36,6 @@
top: 96rpx;
padding: 32rpx;
width: 100%;
- height: 170rpx;
overflow: hidden;
}
@@ -44,6 +43,7 @@
position: absolute;
top: 70rpx;
left: 208rpx;
+ width: 400rpx;
}
.textType1 {
@@ -245,14 +245,14 @@
}
.btnView {
- width: 150rpx;
- height: 50rpx;
+ width: 100rpx;
+ height: 38rpx;
background: #FFFFFF;
border: 1px solid rgba(0, 0, 0, 0.50);
- border-radius: 10rpx;
- border-radius: 10rpx;
- padding: 5rpx 28rpx 5rpx 28rpx;
+ border-radius: 18.75rpx;
+ border-radius: 18.75rpx;
text-align: center;
+ margin-left: 18rpx;
}
.dmArea3 {
@@ -290,14 +290,14 @@
.dmArea4sonConten1 {
float: left;
- width: 110rpx;
+ width: 120rpx;
height: 154rpx;
}
.dmArea4sonConten2 {
float: left;
margin-left: 42rpx;
- width: 110rpx;
+ width: 120rpx;
height: 154rpx;
}
@@ -310,4 +310,7 @@
.dmArea4iconAreaIMG {
width: 68rpx;
height: 68rpx;
+}
+.boderLine{
+ border-bottom:1px solid r;
}
\ No newline at end of file