From d2438497011dd793c54ed5d9553dba9517b16979 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Sat, 29 Jun 2024 19:47:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                    | 10 +++++++++-
 pages/index/currentPoints.vue |  3 ++-
 pages/index/index.vue         |  4 ++--
 pages/my/index.vue            |  7 ++++---
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/pages.json b/pages.json
index 2a87776..14ffd1f 100644
--- a/pages.json
+++ b/pages.json
@@ -357,7 +357,15 @@
 					"navigationBarTitleText": "打赏明细",
 					"enablePullDownRefresh": false
 				}
-			},{
+			},
+			{
+				"path": "wallet/myshouyidetail",
+				"style": {
+					"navigationBarTitleText": "收益明细",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
 				"path": "help/helpDetail",
 				"style": {
 					"navigationBarTitleText": "帮助详情",
diff --git a/pages/index/currentPoints.vue b/pages/index/currentPoints.vue
index ae75bc1..171d7df 100644
--- a/pages/index/currentPoints.vue
+++ b/pages/index/currentPoints.vue
@@ -131,7 +131,7 @@
 				</view>
 				<view class="mian-list" @click="goOder(item)" v-for="(item,index) in ddczList" :key="index">
 					<view class="mian-list-top">
-						<view class="mian-list-top-biao">已完成</view>
+						<view class="mian-list-top-biao">{{item.status=='3'?'已完成':'待评价'}}</view>
 						<view class="mian-list-top-time">
 							<span>预约时间: </span>
 							<span>{{item.serveTime}}</span>
@@ -230,6 +230,7 @@
 					{name:'业绩积分',id:'0'},
 					{name:'时长积分',id:'1'},
 					{name:'储值积分',id:'2'},
+					{name:'充值积分',id:'3'},
 				],
 				tapNum:0,
 			}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9fdfee7..ff90c9a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -333,10 +333,10 @@
 					<image src="../../static/index/order_1.png" style="width: 70rpx;height: 70rpx;"></image>
 					<view class="tongji-text">紧急报警</view>
 				</view>
-				<view class="text-center" @click="goNav('/my/dashang/index')">
+				<!-- <view class="text-center" @click="goNav('/my/dashang/index')">
 					<image src="../../static/index/order_9.png" style="width: 70rpx;height: 70rpx;"></image>
 					<view class="tongji-text">打赏明细</view>
-				</view>
+				</view> -->
 			</view>
 			<!-- <view class="flex justify-between margin-top" style="border: 1rpx solid #cccccc;background-color: #e1f5ea; border-radius: 20rpx;">
 				<view class="guanlibox" @click="goDetail(1)">
diff --git a/pages/my/index.vue b/pages/my/index.vue
index ce9db23..1234a77 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -72,20 +72,21 @@
 							</view>
 							<view class="flex align-center justify-between" style="width: 100%;">
 								<view class="" style="text-align: center;width: 23%;"
-									@click="goNav('/my/wallet/mymoneydetail')">
+									@click="goNav('/my/wallet/myshouyidetail?fundType=1')">
 									<view class="margin-top-xs wode-view">
 										<text class="money_text1">{{ dailyEarnings ? dailyEarnings : '0' }}</text>
 									</view>
 									<view style="color: #fff;font-size: 26rpx;margin-top: 5px;">当日收益</view>
 								</view>
-								<view class="" style="text-align: center;width: 23%;">
+								<view class="" style="text-align: center;width: 23%;"
+									@click="goNav('/my/wallet/myshouyidetail?fundType=2')">
 									<view class="margin-top-xs wode-view">
 										<text class="money_text1">{{ earnings ? earnings : '0' }}</text>
 									</view>
 									<view style="color: #fff;font-size: 26rpx;margin-top: 5px;">当期收益</view>
 								</view>
 								<view class="" style="text-align: center;width: 23%;"
-									@click="goNav('/my/wallet/mymoneydetail')">
+									@click="goNav('/my/wallet/myshouyidetail?fundType=3')">
 									<view class="margin-top-xs wode-view">
 										<text
 											class="money_text1">{{ currentMonthsIncome ? currentMonthsIncome : '0' }}</text>