From 8c6fe410167513ebd9eea5e31e310301a8924f11 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 19 Aug 2023 19:08:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subpkg/archives/archives.vue |  7 ++++---
 subpkg/finance/finance.vue   | 15 +++++++++------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/subpkg/archives/archives.vue b/subpkg/archives/archives.vue
index 6437dd8..e311524 100644
--- a/subpkg/archives/archives.vue
+++ b/subpkg/archives/archives.vue
@@ -223,12 +223,13 @@
           });
         }
 				else {
-          res = await informationList({
+          let params = {
           	page: this.loadConfig.page,
           	limit: this.loadConfig.limit,
           	user_id: that.user_id,
-            is_update: this.current
-          })
+          };
+          this.task_id > 0 ? params.is_update = this.current:null;
+          res = await informationList(params);
         }
 				this.loadConfig.status = "loadmore"
 				if (res.data.length < this.loadConfig.limit) {
diff --git a/subpkg/finance/finance.vue b/subpkg/finance/finance.vue
index 01a9c24..efed93e 100644
--- a/subpkg/finance/finance.vue
+++ b/subpkg/finance/finance.vue
@@ -26,7 +26,7 @@
 					<text style="margin-right: 20rpx;">账户总金额(元)</text><uni-icons @click="updateEye()"
 						:type="eyeType?'eye-filled':'eye-slash-filled'" color="#fff"></uni-icons>
 				</view>
-				<view class="price" v-show="eyeType">{{userInfo.user_money||0.00}}元</view>
+				<view class="price" v-show="eyeType">{{userInfo.day_money_count?userInfo.day_money_count.toFixed(2):'0.00'}}元</view>
 				<view class="price" v-show="!eyeType">****元</view>
 				<view class="bubble">
 					<!-- <image src="../../static/img/contract/bubble.png"></image> -->
@@ -43,7 +43,7 @@
 				<u-line direction="col" length="40%" color="#999999FF"></u-line>
 				<view class="item">
 					<view>收益金额(元)</view>
-					<view class="num" v-show="eyeType">{{userInfo.income||0.00}}</view>
+					<view class="num" v-show="eyeType">{{userInfo.deposit||0.00}}</view>
 					<view class="num" v-show="!eyeType">****</view>
 				</view>
 			</view>
@@ -201,10 +201,13 @@
 		onShow() {
 			// console.log(this.userInfo);
 			if (this.user_id == 0) {
-				this.userInfo = this.$store.state.app.userInfo;
+				// this.userInfo = this.$store.state.app.userInfo;
+        userInfo().then((res)=>{
+          this.$store.commit('setUserInfo', res.data);
+          this.userInfo = res.data;
+        })
 			} else {
 				this.OtherUserInfo()
-
 			}
 		},
 		computed: {
@@ -214,7 +217,6 @@
 		},
 		onBackPress() {
 			this.loadBill()
-
 		},
 		methods: {
 			navTo(url) {
@@ -289,13 +291,13 @@
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
+				flex: 1;
 			color: #fff;
 			padding: 10rpx 28rpx;
 
 			.accont {
 				// background-color: red;
 				display: flex;
-				width: 22vw;
 				justify-content: space-between;
 				vertical-align: bottom;
 				line-height: 44px;
@@ -309,6 +311,7 @@
 				font-size: 28rpx;
 				font-weight: 500;
 				color: #FFFFFF;
+        
 
 				.name {
 					margin: 0 17.5rpx;