From 0d4530e16275d747bc0a83073a3c3e5b761e2a86 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Sun, 21 Jan 2024 21:32:46 +0800
Subject: [PATCH] =?UTF-8?q?add=E7=89=A9=E6=B5=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logistiCard/logistiBriefCard.vue          |   3 +-
 pages.json                                    |   2 +-
 pages/oaHome/accountLog.vue                   | 122 ++++++++++++++++--
 pages/oaHome/oaHome.vue                       |   2 +-
 4 files changed, 114 insertions(+), 15 deletions(-)

diff --git a/components/logistiComptent/logistiCard/logistiBriefCard.vue b/components/logistiComptent/logistiCard/logistiBriefCard.vue
index 227c265..f4c5796 100644
--- a/components/logistiComptent/logistiCard/logistiBriefCard.vue
+++ b/components/logistiComptent/logistiCard/logistiBriefCard.vue
@@ -27,7 +27,8 @@
 			</view>
 		</view>
 		<view class="foot">
-			<!-- <text>商品数量: 共计 <text :style="{color:goodsInfo.status==0?'#FF8056':'#2B63E3'}">6</text>件</text> -->
+			<text>商品数量: 共计 <text
+					:style="{color:goodsInfo.status==0?'#FF8056':'#2B63E3'}">{{goodsInfo.product_count}}</text>件</text>
 			<text></text>
 			<view class="detail-btn">
 				查看详情
diff --git a/pages.json b/pages.json
index d98cf32..e2400e8 100644
--- a/pages.json
+++ b/pages.json
@@ -35,7 +35,7 @@
 			"style": {
 				"navigationBarTitleText": "收益明细",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#0122C7",
+				"navigationBarBackgroundColor": "#2B63E3",
 				"navigationBarTextStyle": "white"
 			}
 		},
diff --git a/pages/oaHome/accountLog.vue b/pages/oaHome/accountLog.vue
index f2a7fe8..8658743 100644
--- a/pages/oaHome/accountLog.vue
+++ b/pages/oaHome/accountLog.vue
@@ -1,8 +1,49 @@
 <template>
-	<view class="card">
-		<u-tag :text="item.remark" type="success" plain v-for="item,index in orderList" :key='index' class="li"></u-tag>
-		<u-loadmore :status="status" />
+	<view class="">
+		<view class="head">
+
+			<view class="money">
+				收益明细（元）
+				<view class="" style="margin-top: 35rpx;font-size: 35rpx;">
+					￥ {{money}}
+				</view>
+			</view>
+		</view>
+
+		<view class="cont">
+			<!-- <u-tag :text="item.remark" type="success" plain v-for="item,index in orderList" :key='index' class="li"></u-tag> -->
+
+
+			<view class="tit">
+				收益明细
+			</view>
+			<view class="card" v-for="item,index in orderList" :key='index'>
+				<view class="card-top">
+					<view class="">
+						<!-- 	2024-01-2 16:20:34 -->
+						{{item.create_time}}
+					</view>
+					<view class="" style="color: #6A92EB;">
+						<!-- 任务收益金额增加 -->
+						{{item.type_desc}}
+					</view>
+				</view>
+				<view class="card-top" style="margin-top: 30rpx;">
+					<view class="tit" style="font-size: 28rpx;">
+						<!-- 2024-01-2 16:20:34 -->
+						{{item.remark}}
+					</view>
+					<view class="">
+						<!-- 任务收益金额增加 -->
+						{{item.change_amount_desc}}
+					</view>
+				</view>
+			</view>
+
+			<u-loadmore :status="status" />
+		</view>
 	</view>
+
 </template>
 
 <script>
@@ -17,6 +58,7 @@
 				status: "loadmore",
 				page_no: 2,
 				page_size: 20,
+				money: ""
 			}
 		},
 		methods: {
@@ -31,6 +73,9 @@
 		mounted() {
 			this.getFirstOrderLogList()
 		},
+		onLoad(option) {
+			this.money = option.money
+		},
 		onReachBottom() {
 			if (this.flag) return
 			let {
@@ -57,17 +102,70 @@
 </script>
 
 <style lang="scss" scoped>
-	.card {
-		width: 690rpx;
-		margin: 30rpx auto;
-		background-color: #fff;
-		padding: 20rpx;
-		border-radius: 29rpx;
+	.head {
+		width: 750rpx;
+		background-color: #2B63E3;
+		height: 200rpx;
+		position: relative;
 
-		.li {
-			margin: 20rpx;
-			font-size: 28rpx;
+		.money {
+			width: 670rpx;
+			background-color: rgba(255, 255, 255, .2);
+			box-shadow: 0.5rpx 0.5rpx 200rpx 0.5rpx rgba(0, 0, 0, 0.1);
+			height: 220rpx;
+			margin: 0 auto;
+			border-radius: 20rpx;
+			position: absolute;
+			left: 50%;
+			top: 100%;
+			transform: translate(-50%, -50%);
+			backdrop-filter: blur(50rpx);
+			color: white;
+			padding: 20rpx;
 
 		}
 	}
+
+	.cont {
+		// width: 690rpx;
+		margin: 120rpx auto;
+		padding: 20rpx;
+
+		.tit {
+			position: relative;
+			padding-left: 20rpx;
+			font-size: 30rpx;
+			color: #1A1A1A;
+			font-weight: bold;
+
+		}
+
+		.tit::before {
+			content: "";
+			position: absolute;
+			top: 50%;
+			transform: translateY(-50%);
+			left: 0;
+			width: 6rpx;
+			/* 左边框的宽度 */
+			height: 25rpx;
+			border-radius: 20rpx;
+			background-color: #2B63E3;
+		}
+
+		.card {
+			background-color: #fff;
+			padding: 20rpx;
+			border-radius: 20rpx;
+			margin-top: 20rpx;
+
+			.card-top {
+				display: flex;
+				justify-content: space-between;
+			}
+		}
+
+
+
+	}
 </style>
\ No newline at end of file
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index d3b55c5..1b8c6fc 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -319,7 +319,7 @@
 						unit: "￥",
 						event: () => {
 							uni.navigateTo({
-								url: '/pages/oaHome/accountLog'
+								url: `/pages/oaHome/accountLog?money=${this.myOaInfo.user_money}`
 							})
 						}
 					},