From 34a6d1cdecf091cdb7ab5dbda11c9be7bacc8c8c Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Sun, 5 Jan 2025 14:29:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=94=80=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bundle/pages/user_spread/user_spread.vue | 108 ++++++++++++++---------
 1 file changed, 66 insertions(+), 42 deletions(-)

diff --git a/bundle/pages/user_spread/user_spread.vue b/bundle/pages/user_spread/user_spread.vue
index 3c429bb..101d5ad 100644
--- a/bundle/pages/user_spread/user_spread.vue
+++ b/bundle/pages/user_spread/user_spread.vue
@@ -15,13 +15,18 @@
 						</view>
 						<view class="avatar-tag white xxs text-center m-b-10" v-if="distributionInfo.level_name">
 							{{distributionInfo.level_name}}</view>
-						<view class="xs flex">
+						<view class="xs flex bold">
 							上级分销商：{{userInfo.leader.nickname ? userInfo.leader.nickname :  '东龙汇'}}
 							<view v-if="!userInfo.leader.nickname"
 								class="br60 white write-btn flex row-center m-l-30 xxs" @tap="showInvitePop">填写
 							</view>
 						</view>
 					</view>
+					<view class="flex service">
+						<view class="m-r-10">整合资源</view>
+						<view class="m-r-10">流量变现</view>
+						<view class="m-r-10">专业服务</view>
+					</view>
 				</view>
 			</view>
 
@@ -244,42 +249,37 @@
 				<!-- 已申请 -->
 				<view v-if="vipState==2" class="user-vip">
 					<view class="user-assets-box">
-						<view class="user-assets-header flex row-between">
-							<view class="flex nr bold" style="line-height: 80rpx;color: #8F430E;">
-								可提现佣金：
-								<price-format weight="bold" :first-size="36" :subscript-size="26" :second-size="36"
-									:price="distributionInfo.able_withdrawal" :color="colorConfig.primary" />
-							</view>
-							<navigator hover-class="none" class="primary-btn white flex row-center"
-								url="/bundle/pages/user_withdraw/user_withdraw">立即提现</navigator>
-						</view>
 						<view class="user-assets-content flex  flex-wrap">
-							<!-- <view class="user-item flex-col col-center">
-								<tool-tip v-if="false" class="m-t-20" id="today-profit" content="今日预估收益金额"
-									style="position: absolute;right: -66rpx;"></tool-tip>
-								<view class="nr user-assets-name flex" style="color: #8F430E">
-									今日预估收益 -->
-									<!-- <u-icon class="ml10" name="question-circle" size="30rpx" color="#D88D5A" /> -->
-				<!-- 				</view>
-								<view class="assets m-l-20">
+							<view class="user-item flex-col col-center">
+								<view class="nr user-assets-name flex" style="color: #000">
+									今日收入
+								</view>
+								<view class="assets">
 									<price-format weight="bold" :first-size="36" :subscript-size="26" :second-size="36"
 										:price="distributionInfo.today_earnings" :color="colorConfig.primary" />
 								</view>
-							</view> -->
-			<!-- 				<view class="user-item flex-col col-center">
-								<view class="nr user-assets-name flex" style="color: #8F430E">
-									本月预估收益 -->
-									<!-- <u-icon class="ml10" name="question-circle" size="30rpx" color="#D88D5A" /> -->
-			<!-- 					</view>
-								<view class="assets m-l-20">
+							</view>
+							<view class="user-item flex-col col-center">
+								<view class="nr user-assets-name flex lg" style="color: #000">
+									本月收入
+								</view>
+								<view class="assets">
 									<price-format weight="bold" :first-size="36" :subscript-size="26" :second-size="36"
 										:price="distributionInfo.month_earnings" :color="colorConfig.primary" />
 								</view>
-							</view> -->
-							<view class="user-item flex-col col-center">
-								<view class="nr user-assets-name flex" style="color: #8F430E">
-									累计获得收益
-									<!-- <u-icon class="ml10" name="question-circle" size="30rpx" color="#D88D5A" /> -->
+							</view>
+							<view class="user-item flex-col col-center lg">
+								<view class="nr user-assets-name flex" style="color: #000">
+									本年收入
+								</view>
+								<view class="assets">
+									<price-format weight="bold" :first-size="36" :subscript-size="26" :second-size="36"
+										:price="distributionInfo.month_earnings" :color="colorConfig.primary" />
+								</view>
+							</view>
+							<view class="user-item flex-col col-center lg">
+								<view class="nr user-assets-name flex" style="color: #000">
+									累计收益
 								</view>
 								<view class="assets">
 									<price-format weight="bold" :first-size="36" :subscript-size="26" :second-size="36"
@@ -287,6 +287,20 @@
 								</view>
 							</view>
 						</view>
+						
+						<view class="user-assets-header flex row-between m-t-20" style="padding: 0 30rpx;">
+							<view class="nr" style="line-height: 40rpx;color: #000;">
+								<view>
+									可提现佣金
+								</view>
+								<price-format weight="bold" :first-size="36" :subscript-size="26" :second-size="36"
+									:price="distributionInfo.able_withdrawal" :color="colorConfig.primary"/>
+							</view>
+							<view >
+								<navigator hover-class="none" class="primary-btn white flex row-center"
+									url="/bundle/pages/user_withdraw/user_withdraw">立即提现</navigator>
+							</view>
+						</view>
 					</view>
 					<view class="mt20 fans-msg-box flex row-between bg-white md">
 						<router-link class="flex-1" to="/bundle/pages/user_spread_store/user_spread_store">
@@ -966,11 +980,14 @@
 </script>
 <style lang="scss">
 	.user-spread {
-		background-image: url(../../static/spread_top_bg.png);
-		background-repeat: no-repeat;
-		background-size: 100% auto;
+		// background-image: url(../../static/spread_top_bg.png);
+		// background-repeat: no-repeat;
+		// background-size: 100% auto;
+		background-color: #000;
+		height: 300rpx;
 
 		.header {
+			position: relative;
 
 			.user-info {
 				.user-avatar {
@@ -979,11 +996,11 @@
 
 				.avatar-tag {
 					display: inline-block;
-					background-color: #F79C0C;
-					border: 1rpx solid #FFFFFF;
+					background-color: #E1C38E;
 					border-radius: 100rpx;
 					line-height: 32rpx;
-					padding: 0 10rpx;
+					padding: 4rpx 16rpx;
+					color: #000;
 				}
 
 				.user-message {
@@ -993,6 +1010,13 @@
 						background-color: #FF838D;
 					}
 				}
+				
+				.service {
+					position: absolute;
+					top: 20rpx;
+					right: 0;
+					color: #fff;
+				}
 			}
 		}
 
@@ -1004,10 +1028,10 @@
 					background-color: #fff;
 					border-radius: 20rpx;
 					padding: 10rpx 20rpx 22rpx;
-					background: linear-gradient(90deg, #FBEFDB 0%, #FED09E 100%);
+					// background: linear-gradient(90deg, #FBEFDB 0%, #FED09E 100%);
+					background: #E1C38E;
 
 					.user-assets-header {
-						border-bottom: 1rpx dashed #8F430E;
 						padding-bottom: 4rpx;
 
 						.primary-btn {
@@ -1026,14 +1050,14 @@
 							position: relative;
 
 							.user-assets-name {
-								text-align: left;
-								align-self: flex-start;
+								// text-align: left;
+								align-self: center;
 							}
 
 							.assets {
 								margin-top: 14rpx;
-								text-align: left;
-								align-self: flex-start;
+								// text-align: left;
+								align-self: center;
 							}
 						}
 					}