From 8bf38ab4593c390b439d200adc009c34a67ce8c2 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Thu, 10 Jul 2025 23:48:03 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=94=B6=E7=9B=8A=E6=98=8E=E7=BB=86):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A048=E5=B0=8F=E6=97=B6=E5=90=8E=E5=88=B0?=
 =?UTF-8?q?=E8=B4=A6=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E5=8F=8A=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在收益明细列表中添加状态显示，用于展示48小时后到账的信息
- 优化wallet.vue和promotion-profit-detail.vue中的状态样式，统一使用flex布局
- 调整状态文本的显示样式，使其更美观统一
---
 pages/subcomponent/promotion-profit-detail.vue | 411 ++++++++++++++-----------
 pages/subcomponent/wallet.vue                  |   7 +-
 2 files changed, 229 insertions(+), 189 deletions(-)

diff --git a/pages/subcomponent/promotion-profit-detail.vue b/pages/subcomponent/promotion-profit-detail.vue
index 39d6b8e..eba7fad 100644
--- a/pages/subcomponent/promotion-profit-detail.vue
+++ b/pages/subcomponent/promotion-profit-detail.vue
@@ -1,194 +1,231 @@
 <template>
-  <view class="profit-detail-container">
-    <!-- 顶部导航栏 -->
-    <view class="nav-bar">
-      <view class="back" @tap="goBack">
-        <uni-icons type="left" size="20"></uni-icons>
-      </view>
-      <text class="title">收益明细</text>
-    </view>
-    <view class="main-content">
-      <view class="profit-list-card">
-        <view class="profit-item" v-for="(item, idx) in profits" :key="idx">
-          <image class="avatar" :src="item.avatar" mode="aspectFill" />
-          <view class="profit-info">
-            <view class="profit-name-date">
-              <view class="profit-name">{{ item.name }}</view>
-              <view class="profit-date">{{ item.date }}</view>
-            </view>
-          </view>
-          <view class="profit-type">{{ item.type }}</view>
-          <text class="profit-amount">+¥{{ item.amount }}</text>
-        </view>
-        <view v-if="isLoading" style="text-align:center;color:#bbb;padding:20rpx;">加载中...</view>
-        <view v-else-if="!hasMore && profits.length > 0" style="text-align:center;color:#bbb;padding:20rpx;">没有更多了</view>
-      </view>
-    </view>
-  </view>
+	<view class="profit-detail-container">
+		<!-- 顶部导航栏 -->
+		<view class="nav-bar">
+			<view class="back" @tap="goBack">
+				<uni-icons type="left" size="20"></uni-icons>
+			</view>
+			<text class="title">收益明细</text>
+		</view>
+		<view class="main-content">
+			<view class="profit-list-card">
+				<view class="profit-item" v-for="(item, idx) in profits" :key="idx">
+					<image class="avatar" :src="item.avatar" mode="aspectFill" />
+					<view class="profit-info">
+						<view class="profit-name-date">
+							<view class="profit-name">{{ item.name }}</view>
+							<view class="profit-date">{{ item.date }}</view>
+						</view>
+						<!-- 添加2小时后到账状态 -->
+						<view class="status" v-if="item.state == 0">
+							<text class="status-text">48小时后到账</text>
+						</view>
+					</view>
+					<view class="profit-type">{{ item.type }}</view>
+					<text class="profit-amount">+¥{{ item.amount }}</text>
+				</view>
+				<view v-if="isLoading" style="text-align:center;color:#bbb;padding:20rpx;">加载中...</view>
+				<view v-else-if="!hasMore && profits.length > 0" style="text-align:center;color:#bbb;padding:20rpx;">
+					没有更多了</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      profits: [],
-      pageNo: 1,
-      pageSize: 10,
-      hasMore: true,
-      isLoading: false
-    }
-  },
-  onLoad() {
-    this.pageNo = 1;
-    this.hasMore = true;
-    this.fetchProfits();
-  },
-  onReachBottom() {
-    if (this.hasMore && !this.isLoading) {
-      this.fetchProfits(true);
-    }
-  },
-  methods: {
-    goBack() {
-      uni.navigateBack();
-    },
-    fetchProfits(isLoadMore = false) {
-      if (this.isLoading || (!this.hasMore && isLoadMore)) return;
-      this.isLoading = true;
-      const token = uni.getStorageSync('token') || '';
-      this.$api && this.$api('income', {
-        key: token,
-        pageNo: this.pageNo,
-        pageSize: this.pageSize
-      }, res => {
-        this.isLoading = false;
-        if (res.code === 200 && res.result && res.result.records) {
-          const newList = res.result.records.map(item => ({
-            avatar: item.formUser?.headImage || '',
-            name: item.formUser?.name || '',
-            date: (item.createTime || '').slice(5, 10),
-            type: item.title,
-            amount: item.formUser.price
-          }));
-          if (isLoadMore) {
-            this.profits = this.profits.concat(newList);
-          } else {
-            this.profits = newList;
-          }
-          // 分页判断
-          this.hasMore = (res.result.current * res.result.size) < res.result.total;
-          if (this.hasMore) {
-            this.pageNo = res.result.current + 1;
-          }
-        }
-      });
-    }
-  }
-}
+	export default {
+		data() {
+			return {
+				profits: [],
+				pageNo: 1,
+				pageSize: 10,
+				hasMore: true,
+				isLoading: false
+			}
+		},
+		onLoad() {
+			this.pageNo = 1;
+			this.hasMore = true;
+			this.fetchProfits();
+		},
+		onReachBottom() {
+			if (this.hasMore && !this.isLoading) {
+				this.fetchProfits(true);
+			}
+		},
+		methods: {
+			goBack() {
+				uni.navigateBack();
+			},
+			fetchProfits(isLoadMore = false) {
+				if (this.isLoading || (!this.hasMore && isLoadMore)) return;
+				this.isLoading = true;
+				const token = uni.getStorageSync('token') || '';
+				this.$api && this.$api('income', {
+					key: token,
+					pageNo: this.pageNo,
+					pageSize: this.pageSize
+				}, res => {
+					this.isLoading = false;
+					if (res.code === 200 && res.result && res.result.records) {
+						const newList = res.result.records.map(item => ({
+							avatar: item.formUser?.headImage || '',
+							name: item.formUser?.name || '',
+							date: (item.createTime || '').slice(5, 10),
+							type: item.title,
+							amount: item.money,
+							state: item.state || 0 // 添加状态字段，默认为0表示未到账
+						}));
+						if (isLoadMore) {
+							this.profits = this.profits.concat(newList);
+						} else {
+							this.profits = newList;
+						}
+						// 分页判断
+						this.hasMore = (res.result.current * res.result.size) < res.result.total;
+						if (this.hasMore) {
+							this.pageNo = res.result.current + 1;
+						}
+					}
+				});
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-.profit-detail-container {
-  min-height: 100vh;
-  background: #f7f7f7;
-}
-.nav-bar {
-  display: flex;
-  align-items: center;
-  height: calc(150rpx + var(--status-bar-height));
-  padding: 0 32rpx;
-  padding-top: var(--status-bar-height);
-  background: #fff;
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  z-index: 999;
-  box-sizing: border-box;
-  box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.03);
-  .back {
-    padding: 20rpx;
-    margin-left: -20rpx;
-  }
-  .title {
-    flex: 1;
-    text-align: center;
-    font-size: 34rpx;
-    font-weight: 500;
-    color: #222;
-  }
-}
-.main-content {
-  margin-top: calc(150rpx + var(--status-bar-height));
-  margin-bottom: 40rpx;
-  min-height: 100vh;
-  overflow-y: auto;
-  width: 100vw;
-  box-sizing: border-box;
-}
-.profit-list-card {
-  background: #fff;
-  border-radius: 40rpx;
-  margin: 0 32rpx 32rpx 32rpx;
-  padding: 0 0 0 0;
-  box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.03);
-}
-.profit-item {
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-  padding: 28rpx 36rpx 28rpx 36rpx;
-  border-bottom: 2rpx solid #f3f3f3;
-  &:last-child {
-    border-bottom: none;
-  }
-}
-.avatar {
-  width: 60rpx;
-  height: 60rpx;
-  border-radius: 50%;
-  margin-right: 24rpx;
-  object-fit: cover;
-  background: #f5f5f5;
-}
-.profit-info {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  min-width: 120rpx;
-}
-.profit-name-date {
-  display: flex;
-  flex-direction: column;
-}
-.profit-name {
-  font-size: 28rpx;
-  color: #222;
-  font-weight: 500;
-}
-.profit-date {
-  font-size: 22rpx;
-  color: #b3b3b3;
-  font-weight: 400;
-  margin-top: 2rpx;
-}
-.profit-type {
-  flex: 1;
-  text-align: center;
-  font-family: PingFang SC;
-font-weight: 400;
-font-size: 14px;
-line-height: 100%;
-letter-spacing: 0%;
-  color: #4c4c4c;
-  font-weight: 400;
-}
-.profit-amount {
-  font-size: 28rpx;
-  color: #ff8917;
-  font-weight: 500;
-  margin-left: 12rpx;
-  min-width: 80rpx;
-  text-align: right;
-}
-</style> 
\ No newline at end of file
+	.profit-detail-container {
+		min-height: 100vh;
+		background: #f7f7f7;
+	}
+
+	.nav-bar {
+		display: flex;
+		align-items: center;
+		height: calc(150rpx + var(--status-bar-height));
+		padding: 0 32rpx;
+		padding-top: var(--status-bar-height);
+		background: #fff;
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 999;
+		box-sizing: border-box;
+		box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.03);
+
+		.back {
+			padding: 20rpx;
+			margin-left: -20rpx;
+		}
+
+		.title {
+			flex: 1;
+			text-align: center;
+			font-size: 34rpx;
+			font-weight: 500;
+			color: #222;
+		}
+	}
+
+	.main-content {
+		margin-top: calc(150rpx + var(--status-bar-height));
+		margin-bottom: 40rpx;
+		min-height: 100vh;
+		overflow-y: auto;
+		width: 100vw;
+		box-sizing: border-box;
+	}
+
+	.profit-list-card {
+		background: #fff;
+		border-radius: 40rpx;
+		margin: 0 32rpx 32rpx 32rpx;
+		padding: 0 0 0 0;
+		box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.03);
+	}
+
+	.profit-item {
+		display: flex;
+		align-items: center;
+		justify-content: flex-start;
+		padding: 28rpx 36rpx 28rpx 36rpx;
+		border-bottom: 2rpx solid #f3f3f3;
+
+		&:last-child {
+			border-bottom: none;
+		}
+	}
+
+	.avatar {
+		width: 60rpx;
+		height: 60rpx;
+		border-radius: 50%;
+		margin-right: 24rpx;
+		object-fit: cover;
+		background: #f5f5f5;
+	}
+
+	.profit-info {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		min-width: 120rpx;
+	}
+
+	.profit-name-date {
+		display: flex;
+		flex-direction: column;
+	}
+
+	.profit-name {
+		font-size: 28rpx;
+		color: #222;
+		font-weight: 500;
+	}
+
+	.profit-date {
+		font-size: 22rpx;
+		color: #b3b3b3;
+		font-weight: 400;
+		margin-top: 2rpx;
+	}
+
+	// 添加状态样式，参考wallet.vue
+	.status {
+		padding: 4rpx 8rpx;
+		background: #FFB74D;
+		border-radius: 8rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 8rpx;
+		width: fit-content;
+
+		.status-text {
+			font-size: 22rpx;
+			color: #fff;
+		}
+	}
+
+	.profit-type {
+		flex: 1;
+		text-align: center;
+		font-family: PingFang SC;
+		font-weight: 400;
+		font-size: 14px;
+		line-height: 100%;
+		letter-spacing: 0%;
+		color: #4c4c4c;
+		font-weight: 400;
+	}
+
+	.profit-amount {
+		font-size: 28rpx;
+		color: #ff8917;
+		font-weight: 500;
+		margin-left: 12rpx;
+		min-width: 80rpx;
+		text-align: right;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/subcomponent/wallet.vue b/pages/subcomponent/wallet.vue
index 3159049..8a4f2af 100644
--- a/pages/subcomponent/wallet.vue
+++ b/pages/subcomponent/wallet.vue
@@ -651,6 +651,8 @@ export default {
 
             .record-left {
                 flex: 1;
+				display: flex;
+				align-items: center;
 
                 .type {
                     font-size: 28rpx;
@@ -659,11 +661,12 @@ export default {
                 }
 
                 .status {
-                    display: inline-block;
                     padding: 4rpx 8rpx;
                     background: #FFB74D;
                     border-radius: 8rpx;
-                    margin-top: 8rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
 
                     .status-text {
                         font-size: 22rpx;