From 5c17680287794df51631306d7cf51f32a3066442 Mon Sep 17 00:00:00 2001
From: huziyuan <huziyuan@qniao.cn>
Date: Tue, 2 Feb 2021 21:38:12 +0800
Subject: [PATCH] =?UTF-8?q?UI=E9=80=82=E9=85=8D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/index/index.js           |   4 +-
 pages/home/index/index.wxml         | 124 +---------------------------
 pages/home/index/index.wxss         |  26 +++---
 pages/withdrawal/balance/index.js   |   3 +-
 pages/withdrawal/balance/index.wxml |   4 +-
 pages/withdrawal/balance/index.wxss |   1 -
 6 files changed, 20 insertions(+), 142 deletions(-)

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 @@
 
 <scroll-view scroll-y style="height: {{height}}rpx;">
 	<view class="topArea">
-		<view class="heradImg">
+		<view class="heradImg" style="top:{{CustomBar + 32}}rpx">
 			<wux-image width="{{78}}" height="{{78}}" wux-class="image" shape="circle" src="{{avatarUrl}}" bindtap="toUserInfo">
 				<image style="width:156rpx;height:156rpx;border-radio:30px" slot="loading" src="/assets/myinfo/user-icon.png"></image>
 			</wux-image>
@@ -206,128 +206,6 @@
 		</view>
 
 	</view>
-	<!-- <view class="dmArea">
-		<text class="daAreaTietleText">代卖订单</text>
-		<text style="float:right">查看更多订单></text>
-		<view class="boderLine">
-		</view>
-		<view class="dmAreaConten" id="agent50" is-link bindtap="toPage">
-			<view class="sonConten1">
-				<view class="iconArea">
-					<image class="iconArea" src="/assets/myinfo/dyy.png"></image>
-				</view>
-				<text>待预约</text>
-			</view>
-			<view class="sonConten" id="agent51" is-link bindtap="toPage">
-				<view class="iconArea">
-					<image class="iconArea" src="/assets/myinfo/bz9.png"></image>
-				</view>
-				<text>待送货</text>
-			</view>
-			<view class="sonConten" id="agent53" is-link bindtap="toPage">
-				<view class="iconArea">
-					<image class="iconArea" src="/assets/myinfo/bz12.png"></image>
-				</view>
-				<text>结算中</text>
-			</view>
-			<view class="sonConten" id="agent54" is-link bindtap="toPage">
-				<view class="iconArea">
-					<image class="iconArea" src="/assets/myinfo/bz11.png"></image>
-				</view>
-				<text>已完成</text>
-			</view>
-			<view class="sonConten" id="agent55" is-link bindtap="toPage">
-				<view class="iconArea">
-					<image class="iconArea" src="/assets/myinfo/bz10.png"></image>
-				</view>
-				<text>已关闭</text>
-			</view>
-		</view>
-	</view> -->
-
-	<!-- <view class="dmArea2">
-		<view id="balance" is-link bindtap="toPage">
-			<text class="daAreaTietleText">我的钱包</text>
-			<text class="dmArea2Text">进入钱包></text>
-		</view>
-		<view class="boderLine">
-		</view>
-		<view class="dmAreaConten2">
-			<view class="moneyTextArea1" id="balance" is-link bindtap="toPage">
-				<text style="font-family: PingFangSC-Medium;font-size: 40rpx;color: rgba(0,0,0,0.85)letter-spacing: 0;text-align: center;">{{formate.numberFormat(accountMoney)}}\n</text>
-				<text style="font-family: PingFangSC-Regular;font-size: 26rpx;color: rgba(0,0,0,0.65);letter-spacing: 0;margin-left:10rpx">我的余额</text>
-			</view>
-			<view class="moneyTextArea2" id="balance" is-link bindtap="toPage">
-				<text style="font-family: PingFangSC-Medium;font-size: 40rpx;color: rgba(0,0,0,0.85)letter-spacing: 0;text-align: center;">￥{{formate.numberFormat(frozenMoney)}}\n</text>
-				<text style="font-family: PingFangSC-Regular;font-size: 26rpx;color: rgba(0,0,0,0.65);letter-spacing: 0;">提现中的金额</text>
-			</view>
-			<view class="moneyTextArea3" id="toMyMoney" is-link bindtap="toPage">
-				<view class="btnView"><text style="font-size: 8px;color: rgba(0,0,0,0.85);">查看账单</text></view>
-				<text style="font-family: PingFangSC-Regular;font-size: 26rpx;color: rgba(0,0,0,0.65);letter-spacing: 0;margin-top:25rpx;margin-left:15rpx">我的账单</text>
-			</view>
-		</view>
-	</view>
-
-	<view class="dmArea3" id="shop" is-link bindtap="toPage">
-		<view style="width:300rpx;height:28rpx;margin-top:15rpx;float:left">
-			<image style="width:28rpx;height:28rpx;margin-top:5rpx" src="/assets/myinfo/fb.png"></image>
-			<text wx:if="{{!userInfo}}" style="font-size: 26rpx;color: rgba(0,0,0,0.85);margin-left:15rpx">赶紧登陆赚钱吧</text>
-			<text wx:if="{{userInfo && userInfo.hasStore==1}}" style="font-size: 26rpx;color: rgba(0,0,0,0.85);margin-left:15rpx">赶紧发布商品赚钱吧</text>
-			<text wx:if="{{userInfo && userInfo.hasStore==0}}" style="font-size: 26rpx;color: rgba(0,0,0,0.85);margin-left:15rpx">超多人想买，快来开店赚钱</text>
-		</view>
-		<view style="width:120rpx;float:right;margin-right:41rpx">
-			<view wx:if="{{!userInfo}}" class="btnView2"><text style="font-size: 10px;color: rgba(0,0,0,0.85);">立即登录</text></view>
-			<view wx:if="{{userInfo && userInfo.hasStore==1}}" class="btnView2"><text style="font-size: 10px;color: rgba(0,0,0,0.85);">进入店铺</text></view>
-			<view wx:if="{{userInfo && userInfo.hasStore==0}}" class="btnView2"><text style="font-size: 10px;color: rgba(0,0,0,0.85);">申请开店</text></view>
-		</view>
-	</view>
-	<view class="dmArea4">
-		<view>
-			<text class="daAreaTietleText ">其他工具</text>
-		</view>
-		<view class="boderLine">
-		</view>
-
-		<view class="dmAreaConten">
-			<view class="dmArea4sonConten1" id="bidding" is-link bindtap="toPage">
-				<view class="dmArea4iconArea">
-					<image class="dmArea4iconAreaIMG" src="/assets/myinfo/wdbj.png"></image>
-				</view>
-				<text class="otherText">我的报价</text>
-			</view>
-			<view class="dmArea4sonConten2">
-				<view class="dmArea4iconArea" id="ordering" is-link bindtap="toPage">
-					<image class="dmArea4iconAreaIMG" src="/assets/myinfo/jydd.png"></image>
-				</view>
-				<text class="otherText">交易订单</text>
-			</view>
-			<view class="dmArea4sonConten2">
-				<view class="dmArea4iconArea" id="integral" is-link bindtap="toPage">
-					<image class="dmArea4iconAreaIMG" src="/assets/myinfo/wdjf.png"></image>
-				</view>
-				<text class="otherText">我的积分</text>
-			</view>
-			<view class="dmArea4sonConten2">
-				<view class="dmArea4iconArea" id="myCus" is-link bindtap="toPage">
-					<image class="dmArea4iconAreaIMG" src="/assets/myinfo/wdkf.png"></image>
-				</view>
-				<text class="otherText">我的客服</text>
-			</view>
-			<view class="dmArea4sonConten1">
-				<view class="dmArea4iconArea" id="adress" is-link bindtap="toPage">
-					<image class="dmArea4iconAreaIMG" src="/assets/myinfo/shdz.png"></image>
-				</view>
-				<text class="otherText">收货地址</text>
-			</view>
-			<view class="dmArea4sonConten2">
-				<view class="dmArea4iconArea" id="qnLogistic" is-link bindtap="toPage">
-					<image class="dmArea4iconAreaIMG" src="/assets/myinfo/qnwl.png"></image>
-				</view>
-				<text class="otherText">千鸟物流</text>
-			</view>
-		</view>
-	</view> -->
-
 </scroll-view>
 <wux-dialog id="wux-dialog" />
 
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 @@
 <!--pages/withdrawal/balance/index.wxml-->
 <wxs module="formate" src="../../../pages/formate.wxs"></wxs>
 <view class="topArea">
-	<view class="topHeadArea">
+	<view class="topHeadArea" style="top:{{CustomBar-32}}rpx">
 		<view class="topHeadAreaLeft" id="toRt" bindtap="toPage">
 			<image class="dhImg" src="/assets/myinfo/rtWhite.png"></image>
 		</view>
@@ -13,7 +13,7 @@
 	<view class="midArea">
 		<view class="view1">我的余额（元）</view>
 		<view class="view2">{{formate.numberFormat(accountMoney)}}</view>
-		<view class="view3">提现中的金额：{{formate.numberFormat(frozenMoney)}}</view>
+		<view class="view3">提现中的金额：{{formate.numberFormat(frozenMoney)||0.00}}</view>
 		<view class="view4" id="toTx" bindtap="toPage"><button class="view4Btr">提现</button></view>
 	</view>
 
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;
 }