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 @@
+
-
-
-
-
- 我的钱包
-
+
-
+
我的余额(元)
{{formate.numberFormat(accountMoney)}}
提现中的金额:{{formate.numberFormat(frozenMoney)||0.00}}
@@ -27,6 +23,17 @@
+
+
+
+
+
+
+ 我的钱包
+
+
+
+