From 7a7884abf5b8ed80474f6bf742c8296af5d2178b Mon Sep 17 00:00:00 2001
From: limqhz <lmq540344226@163.com>
Date: Thu, 9 Feb 2023 17:38:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/budget/index.js          | 60 ++++++++++++++++++++--------------
 pages/budget/index.wxml        | 17 ++++++----
 pages/index/index.js           |  5 +--
 pages/index/index.wxml         |  2 +-
 pages/settings/expend/index.js |  5 +--
 pages/settings/income/index.js |  5 +--
 utils/api.js                   |  9 +++++
 7 files changed, 59 insertions(+), 44 deletions(-)

diff --git a/pages/budget/index.js b/pages/budget/index.js
index 6f07827..332336d 100644
--- a/pages/budget/index.js
+++ b/pages/budget/index.js
@@ -1,33 +1,50 @@
+const app = getApp()
 Page({
     data: {
+        sumBudget: "0.00",
+        sumUsed: "0.00",
+        sumBalance: "0.00",
+
         showSetBudget : false,
-        mainMoney: "200.00",
         changeType: "main",
-        changeItem: 0,
+        currentId: -1,
         currentMoney: "0.00",
         priceError: false,
-        payTypeList : [
-            {"id":1,"name":"娱乐","money":"2000.00"},
-            {"id":2,"name":"干饭","money":""},
-            {"id":3,"name":"游戏","money":"2000.00"},
-            {"id":4,"name":"其它","money":"400"}
-        ],
+        payTypeList : [],
     },
     onLoad: function (options) {
 
+    },
+    onShow() {
+        this.updateBudget();
+    },
+    updateBudget(){
+        app.$api.getBudget().then(res => {
+            if (res.data){
+                let sumBudget = res.data.sumBudget
+                let sumUsed = res.data.sumUsed
+                let sumBalance = res.data.sumBalance
+                let payTypeList = res.data.payTypeList
+                this.setData({sumBudget,sumUsed,sumBalance,payTypeList})
+            }
+        })
     },
     changeBudget(e) {
         let {type,id} = e.currentTarget.dataset
         let tCurrentMoney = 0.00;
         if (type == 'count'){
-            tCurrentMoney = this.data.mainMoney
+            tCurrentMoney = this.data.sumBudget
         }else {
-            tCurrentMoney = this.data.payTypeList[id - 1].money;
+            this.data.payTypeList.forEach(item => {
+                if (item.id == id){
+                    tCurrentMoney = item.budget
+                }
+            })
         }
         this.setData({
             showSetBudget: true,
             changeType: type,
-            changeItem: id,
+            currentId: id,
             currentMoney: tCurrentMoney
         })
     },
@@ -51,19 +68,14 @@ Page({
             })
             return;
         }
-        if (this.data.changeType == 'count') {
-            this.setData({
-                mainMoney: this.data.currentMoney
-            })
-        }else {
-            let cPayTypeList = this.data.payTypeList
-            let cPayType = cPayTypeList[this.data.changeItem - 1]
-            cPayType.money = this.data.currentMoney;
-            this.setData({
-                payTypeList : cPayTypeList
-            })
-        }
-        this.closeDialog()
+        app.$api.editBudget({
+            expendId:this.data.currentId,
+            budget:this.data.currentMoney
+        }).then(res=>{
+            if(res){
+                this.closeDialog();
+            }
+        })
     },
     closeDialog() {
         this.setData({
diff --git a/pages/budget/index.wxml b/pages/budget/index.wxml
index 5fcfd7c..8ead535 100644
--- a/pages/budget/index.wxml
+++ b/pages/budget/index.wxml
@@ -4,24 +4,27 @@
             <view bind:tap="changeBudget" data-type="count" class="inline_box font_big">总预算<t-icon name="tools"/></view>
         </view>
         <view class="pay_look">
-            <text class="center_look font_big">{{ mainMoney }}</text>
+            <text class="center_look font_big">{{ sumBudget }}</text>
         </view>
         <view class="balance_look">
-            <text>当月使用: {{ 900.00 }}</text>
-            <text>预算剩余: {{ 1200.00 }}</text>
+            <text>当月使用: {{ sumUsed }}</text>
+            <text>预算剩余: {{ sumBalance }}</text>
         </view>
     </view>
 </view>
 <t-cell wx:for="{{payTypeList}}" wx:key="index"
-        title="{{item.name}}"
+        title="{{item.expendName}}"
         align="top"
-        image="/image/bill/3.png"
-        note="{{item.money}}"
+        image="{{item.expendIcon}}"
+        note="{{item.budget}}"
         bind:tap="changeBudget"
         data-type="item"
         data-id="{{item.id}}"
 >
-    <t-progress wx:if="{{item.money}}" slot="description" percentage="{{25}}" />
+    <view wx:if="{{item.money}}" slot="description">
+        <t-progress percentage="{{25}}" />
+        <text>已使用:{{item.used}}</text>
+    </view>
     <text class="error_msg" wx:else slot="description">未设置预算</text>
 </t-cell>
 <t-dialog
diff --git a/pages/index/index.js b/pages/index/index.js
index b77e648..27eff6c 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -2,10 +2,7 @@ const app = getApp()
 Page({
     data: {
         progress: 89,
-        todayList: [
-            {"moneyName":"电脑","billType":"INCOME","date":"01-06","accountName":"银行卡","money":"4500.00"},
-            {"moneyName":"狗粮","billType":"EXPEND","date":"01-06","accountName":"支付宝","money":"35.00"},
-        ]
+        todayList: []
     },
     onLoad: function (options) {
     },
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 964b428..61d8b8a 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -12,7 +12,7 @@
 </view>
 <view class="space_box font_small">
     <text>当月预算消费情况</text>
-    <view bind:tap="modifyBudget" class="inline_box"><t-icon name="tools" size="28rpx"/>调整</view>
+    <view bind:tap="modifyBudget" class="inline_box"><t-icon name="money-circle" size="28rpx"/>查看</view>
 </view>
 <view class="padding_box">
     <t-progress theme="plump" percentage="{{progress}}" status="{{progress > 80 ? 'error' : 'success' }}" />
diff --git a/pages/settings/expend/index.js b/pages/settings/expend/index.js
index 39ef5fd..b16fb44 100644
--- a/pages/settings/expend/index.js
+++ b/pages/settings/expend/index.js
@@ -1,10 +1,7 @@
 const app = getApp();
 Page({
     data: {
-        payList: [
-            {"name":"薪资","money":"89310.00","icon":"/image/bill/0.png"},
-            {"name":"红包","money":"0.23","icon":"/image/bill/2.png"}
-        ]
+        payList: []
     },
     onLoad: function (options) {
 
diff --git a/pages/settings/income/index.js b/pages/settings/income/index.js
index 5f48203..b5b2b95 100644
--- a/pages/settings/income/index.js
+++ b/pages/settings/income/index.js
@@ -1,10 +1,7 @@
 const app = getApp();
 Page({
     data: {
-        incomeList: [
-            {"name":"薪资","money":"89310.00","icon":"/image/bill/0.png"},
-            {"name":"红包","money":"0.23","icon":"/image/bill/2.png"}
-        ]
+        incomeList: []
     },
     onShow() {
         app.$api.getSettings().then(setting => {
diff --git a/utils/api.js b/utils/api.js
index c9f2e75..8b201d2 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -298,4 +298,13 @@ export default {
   deleteBill(params) {
     return fetchPost('/user/bill/del/' + params,null,true,false);
   },
+  /**
+   * 预算处理
+   */
+  getBudget(){
+    return fetchPost('/user/budget',null,true,false);
+  },
+  editBudget(params){
+    return fetchPost('/user/budget/edit',params,true,false);
+  }
 }