diff --git a/pages/home/index/index.js b/pages/home/index/index.js
index a37925e..9467483 100644
--- a/pages/home/index/index.js
+++ b/pages/home/index/index.js
@@ -41,9 +41,11 @@ Component({
onRestart: function () {
if (!this.data.firstShow) {
this.setData({
- height: app.globalData.safeFragmentHeight,
+ height: (app.globalData.safeFragmentHeight + app.globalData.statusBarHeight - 100),
+ CustomBar: app.globalData.CustomBar,
userInfo: app.globalData.userInfo
})
+ console.log(this.data.height)
if (app.globalData.userInfo && app.globalData.userInfo.memberExpiredAt) {
this.setData({
'userInfo.memberExpiredAt': app.globalData.userInfo.memberExpiredAt.memberExpiredAt
diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml
index 0e42e92..386fdb0 100644
--- a/pages/home/index/index.wxml
+++ b/pages/home/index/index.wxml
@@ -2,7 +2,7 @@
-
+
@@ -206,128 +206,6 @@
-
-
-
-
diff --git a/pages/home/index/index.wxss b/pages/home/index/index.wxss
index 447ce20..2fdceaf 100644
--- a/pages/home/index/index.wxss
+++ b/pages/home/index/index.wxss
@@ -120,8 +120,8 @@
width: 300rpx;
height: 37rpx;
position: absolute;
- margin-top: -4rpx;
- top: 34rpx;
+ margin-top: -10rpx;
+ top: 32rpx;
left: 231rpx;
}
@@ -130,7 +130,6 @@
font-size: 24rpx;
color: #E7E1BE;
letter-spacing: 1rpx;
- line-height: 33rpx;
}
.vipRightImg {
@@ -161,7 +160,7 @@
.boderLine {
width: 100%;
height: 1rpx;
- border-bottom: 1rpx solid rgb(235, 235, 235);
+ border-bottom: 1rpx solid #f3f3f3;
position: absolute;
top: 72rpx;
}
@@ -170,7 +169,7 @@
.zt {
width: 100%;
height: 1158rpx;
- padding: 20rpx 32rpx 32rpx 32rpx;
+ padding: 20rpx 32rpx 0rpx 32rpx;
/*上右下左*/
}
@@ -370,7 +369,7 @@
border: 1px solid rgba(0, 0, 0, 0.50);
border-radius: 18.75rpx;
border-radius: 18.75rpx;
- padding-top: 6.5rpx;
+ line-height: 38rpx;
}
@@ -414,7 +413,7 @@
color: #007AFF;
letter-spacing: 1px;
text-align: center;
- padding-top: 8rpx;
+ line-height: 50rpx;
}
.dmArea3-left-inco {
@@ -437,10 +436,10 @@
}
.dmArea4 {
- height: 569rpx;
width: 686rpx;
background-color: white;
margin-top: 20rpx;
+ margin-bottom: 20rpx;
border-radius: 10rpx;
border-radius: 10rpx;
position: relative;
@@ -467,13 +466,12 @@
.fxztb {
font-size: 26rpx;
padding: 0;
- background-color: transparent;
- border: none;
- outline: none;
- background-color: unset;
- background-color: transparent;
+ background-color: #fff;
+}
+.fxztb::after{
+ border: none;
}
.dmArea4Content{
margin-top: 15rpx;
-}
\ No newline at end of file
+}
diff --git a/pages/withdrawal/balance/index.js b/pages/withdrawal/balance/index.js
index 43593d2..19ae149 100644
--- a/pages/withdrawal/balance/index.js
+++ b/pages/withdrawal/balance/index.js
@@ -17,7 +17,8 @@ Page({
wx.hideLoading()
this.setData({
accountMoney: result.data.accountMoney,
- frozenMoney: math.minus(result.data.accountMoney, result.data.frozenMoney)
+ frozenMoney: math.minus(result.data.accountMoney, result.data.frozenMoney),
+ CustomBar:app.globalData.CustomBar
})
}).catch(err => {
wx.hideLoading()
diff --git a/pages/withdrawal/balance/index.wxml b/pages/withdrawal/balance/index.wxml
index 9e996bb..41074f5 100644
--- a/pages/withdrawal/balance/index.wxml
+++ b/pages/withdrawal/balance/index.wxml
@@ -1,7 +1,7 @@
-
+
@@ -13,7 +13,7 @@
我的余额(元)
{{formate.numberFormat(accountMoney)}}
- 提现中的金额:{{formate.numberFormat(frozenMoney)}}
+ 提现中的金额:{{formate.numberFormat(frozenMoney)||0.00}}
diff --git a/pages/withdrawal/balance/index.wxss b/pages/withdrawal/balance/index.wxss
index 2ea3aab..f5fedfe 100644
--- a/pages/withdrawal/balance/index.wxss
+++ b/pages/withdrawal/balance/index.wxss
@@ -9,7 +9,6 @@
width: 750rpx;
height: 128rpx;
position: absolute;
- top: 0rpx;
padding: 32rpx;
}