From b285937ac365622f83327901b2f0e0d5c1391c8b Mon Sep 17 00:00:00 2001
From: huziyuan <huziyuan@qniao.cn>
Date: Tue, 2 Feb 2021 22:47:34 +0800
Subject: [PATCH] -----

---
 pages/home/index/index.js           |  4 +---
 pages/index/index.js                | 10 ++++------
 pages/withdrawal/balance/index.js   |  5 ++++-
 pages/withdrawal/balance/index.wxml | 21 ++++++++++++++-------
 pages/withdrawal/balance/index.wxss |  3 ++-
 5 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/pages/home/index/index.js b/pages/home/index/index.js
index 9467483..e02e025 100644
--- a/pages/home/index/index.js
+++ b/pages/home/index/index.js
@@ -137,9 +137,7 @@ Component({
       } 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'
-        })
+        util.navigateTo('/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'
diff --git a/pages/index/index.js b/pages/index/index.js
index c5bc2f3..b1f2694 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -45,7 +45,7 @@ Page({
         name: '我的'
       }
     ],
-    pageIndex: 2,
+    pageIndex: 1,
     safeBottom: app.globalData.safeBottom,
     inited: false,
     path: null,
@@ -170,16 +170,14 @@ Page({
       pconfig.header = { 'Authorization': 'QNT ' + result.data.token }
       mconfig.header = { 'Authorization': 'QNT ' + result.data.token }
       storage.put('isTokenHaveStatus', true)
-      this.dataset({
-        isTokenHaveStatus:true
-      })
       // 登录流程完成；
       if(!util.isEmpty(result.data.userToken)){
         this.handleUserToken(result.data.userToken)
         return
-      } 
+      }
       getBaseInfo().then(result => {
-        app.globalData.userInfo = result.data 
+        app.globalData.userInfo = result.data
+        console.log(app.globalData.userInfo)
         wx.hideLoading()
         this.defaultIndex()
       }).catch(err => {
diff --git a/pages/withdrawal/balance/index.js b/pages/withdrawal/balance/index.js
index 19ae149..7d0cb9e 100644
--- a/pages/withdrawal/balance/index.js
+++ b/pages/withdrawal/balance/index.js
@@ -2,6 +2,7 @@
 import { getBalanceInfo } from "../../api/payment"
 const math = require('../../../utils/math')
 const util = require('../../../utils/util')
+const app = getApp()
 
 Page({
   /**
@@ -18,7 +19,9 @@ Page({
       this.setData({
         accountMoney: result.data.accountMoney,
         frozenMoney: math.minus(result.data.accountMoney, result.data.frozenMoney),
-        CustomBar:app.globalData.CustomBar
+        StatusBar: app.globalData.StatusBar || 40,
+        CustomBar: app.globalData.CustomBar || (app.globalData.isIos ? 64 : 80),
+        Custom: app.globalData.Custom
       })
     }).catch(err => {
       wx.hideLoading()
diff --git a/pages/withdrawal/balance/index.wxml b/pages/withdrawal/balance/index.wxml
index 41074f5..f78c610 100644
--- a/pages/withdrawal/balance/index.wxml
+++ b/pages/withdrawal/balance/index.wxml
@@ -1,16 +1,12 @@
 <!--pages/withdrawal/balance/index.wxml-->
 <wxs module="formate" src="../../../pages/formate.wxs"></wxs>
+
 <view class="topArea">
-	<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>
-		<view class="topText">我的钱包</view>
-	</view>
+	<view class="topHeadArea"></view>
 	<view>
 		<image class="vipBjImg2" src="/assets/myinfo/vipTopBj.png"></image>
 	</view>
-	<view class="midArea">
+	<view class="midArea" style="top:{{CustomBar + 10}}px">
 		<view class="view1">我的余额（元）</view>
 		<view class="view2">{{formate.numberFormat(accountMoney)}}</view>
 		<view class="view3">提现中的金额：{{formate.numberFormat(frozenMoney)||0.00}}</view>
@@ -27,6 +23,17 @@
 
 </view>
 
+<view class="cu-custom" style="height:{{CustomBar}}px;z-index: 99;">
+	<view class="cu-bar fixed" style="height:{{CustomBar}}px;padding-top:{{StatusBar}}rpx;border-bottom:none">
+		<view id="toRt" class="action" bindtap="toPage">
+			<text class="weui_goback" style="color:white"></text>
+		</view>
+		<view class="content" style="top:{{StatusBar}}rpx;color:black;font-size:36rpx">
+			<view slot="content" class="text-white">我的钱包</view>
+		</view>
+	</view>
+</view>
+
 <!-- <view class="bg-white" style="padding: 48rpx;border-bottom:2rpx solid #eee">
   <view class="text-black text-sg">我的余额（元）</view>
   <view class="text-black text-sl text-price" style="margin-top:12rpx">{{formate.numberFormat(accountMoney)}}</view>
diff --git a/pages/withdrawal/balance/index.wxss b/pages/withdrawal/balance/index.wxss
index f5fedfe..a26ff52 100644
--- a/pages/withdrawal/balance/index.wxss
+++ b/pages/withdrawal/balance/index.wxss
@@ -20,13 +20,14 @@
 }
 
 .topHeadAreaLeft {
-  width: 48rpx;
+  width: 100rpx;
   height: 100%;
   position: absolute;
   top: 0rpx;
   left: 0rpx;
   padding-left: 20rpx;
   padding-top: 60rpx;
+  z-index: 103;
 }
 
 .topText {