diff --git a/pages/account/detail/index.js b/pages/account/detail/index.js
index 4c3d627..f407dcd 100644
--- a/pages/account/detail/index.js
+++ b/pages/account/detail/index.js
@@ -33,9 +33,9 @@ Page({
}).then(res => {
if (res.data){
let incomeList = res.data.incomeList;
- let payList = res.data.incomeList;
- let expendBalance = res.data.expendBalance;
- let incomeBalance = res.data.incomeBalance;
+ let payList = res.data.payList;
+ let expendBalance = res.data.expendBalance ? res.data.expendBalance : 0;
+ let incomeBalance = res.data.incomeBalance ? res.data.incomeBalance : 0;
this.setData({
incomeList,payList,expendBalance,incomeBalance
})
diff --git a/pages/account/detail/index.wxml b/pages/account/detail/index.wxml
index 1616971..58899aa 100644
--- a/pages/account/detail/index.wxml
+++ b/pages/account/detail/index.wxml
@@ -11,8 +11,8 @@
- 支出{{expendMoney}}
- 收入{{incomeMoney}}
+ 支出{{expendBalance}}
+ 收入{{incomeBalance}}
@@ -21,24 +21,24 @@
diff --git a/pages/bill/index.wxml b/pages/bill/index.wxml
index a4110c8..3f1a052 100644
--- a/pages/bill/index.wxml
+++ b/pages/bill/index.wxml
@@ -1,7 +1,7 @@
- {{name}}
+ 账单金额
{{money > 0 ? "+" + money : money}}
diff --git a/pages/settings/account/index.js b/pages/settings/account/index.js
index 560ff1f..88cd32f 100644
--- a/pages/settings/account/index.js
+++ b/pages/settings/account/index.js
@@ -1,13 +1,8 @@
const app = getApp();
Page({
data: {
- cashAccountList : [
- {"name":"现金","money":"2000.00"},
- {"name":"银行卡","money":"30500.03"}
- ],
- oweAccountList : [
- {"name":"信用卡","money":"-200.00"},
- ],
+ cashAccountList : [],
+ oweAccountList : [],
},
onShow: function () {
app.$api.getSettings().then(setting => {