From 98fcab711a454ad8531765395ac1ff341eb24b68 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 25 Apr 2024 15:10:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=8E=A8=E5=B9=BF?=
 =?UTF-8?q?=E4=BA=BA=E7=BB=9F=E8=AE=A1=20=E6=9A=82=E6=97=B6=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=20=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=A7=A3=E7=BB=91?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=20=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=8E=A8?=
 =?UTF-8?q?=E5=B9=BF=E4=B8=AD=E5=BF=83=20=E8=8F=9C=E5=8D=95=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E4=B8=80=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/users/promoter-list/index.vue    | 132 +++++++++++++------------
 pages/users/user_spread_user/index.vue |   6 +-
 2 files changed, 71 insertions(+), 67 deletions(-)

diff --git a/pages/users/promoter-list/index.vue b/pages/users/promoter-list/index.vue
index afa69ec..3499f25 100644
--- a/pages/users/promoter-list/index.vue
+++ b/pages/users/promoter-list/index.vue
@@ -20,7 +20,7 @@
 				<button class='iconfont icon-sousuo2' @click="submitForm"></button>
 			</view> -->
 			<view class='list'>
-				<view class="sortNav acea-row row-middle">	
+				<view class="sortNav acea-row row-middle">
 					<view class="sortItem" @click='setSort("spread_count ASC")' v-if="sort == 'spread_count DESC'">团队排序
 						<image :src="domain+'/static/diy/sort1'+keyColor+'.png'"></image>
 					</view>
@@ -54,10 +54,12 @@
 						<view class="picTxt acea-row row-between-wrapper">
 							<view class='pictrue'>
 								<image :src='item.avatar ? item.avatar : "/static/images/f.png"'></image>
+                <view class="icon-text" v-if="item.is_temporary">暂</view>
 							</view>
 							<view class='text'>
 								<view class='name line1'>{{item.nickname}}</view>
-								<view>加入时间: {{item.spread_time}}</view>
+								<view class="text-time">加入时间: {{item.spread_time}}</view>
+                <view class="text-time" v-if="item.is_temporary">解绑时间: {{item.spread_limit}}</view>
 							</view>
 						</view>
 						<view class="right">
@@ -67,7 +69,7 @@
 						</view>
 					</view>
 				</block>
-				
+
 			</view>
 		</view>
 		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
@@ -75,12 +77,7 @@
 </template>
 
 <script>
-
-	import {
-		spreadPeople,
-		getUserInfo,
-		spreadInfo
-	} from '@/api/user.js';
+	import {spreadPeople, spreadInfo} from '@/api/user.js';
 	import { mapGetters } from "vuex";
 	import authorize from '@/components/Authorize';
 	import { HTTP_REQUEST_URL } from '@/config/app';
@@ -110,7 +107,7 @@
 				isShowAuth: false, //是否隐藏授权
 				userInfo:{},
 				times: [],
-				
+        config: {},
 			};
 		},
 		computed: mapGetters(['isLogin','uid','viewColor','keyColor']),
@@ -138,7 +135,7 @@
 		methods: {
 			getUserInfo(){
 				spreadInfo().then(res => {
-					this.userInfo = res.data
+					this.userInfo = res.data;
 				});
 			},
 			onLoadFun: function(e) {
@@ -180,7 +177,7 @@
 					this.keyword = '';
 					this.sort = '';
 					this.status = false;
-					
+
 					this.$set(this, 'recordList', []);
 					this.userSpreadNewList();
 				}
@@ -271,7 +268,7 @@
 			padding: 0 30rpx;
 			border-radius: 30rpx;
 			background-color: #FFFFFF;
-			font-size: 26rpx;	
+			font-size: 26rpx;
 		}
 		.iconfont {
 			margin-right: 10rpx;
@@ -281,7 +278,7 @@
 		.placeholder {
 			font-size: 26rpx;
 			color: #999999;
-		}	
+		}
 		.input {
 			flex: 1;
 		}
@@ -294,17 +291,13 @@
 		color: #282828;
 		border-bottom: 1px solid #eee;
 	}
-
 	.promoter-list .nav .item.on {
 		border-bottom: 5rpx solid var(--view-theme);
 		color: var(--view-theme);
 	}
-
-	
 	.promoter-list .list {
 		margin-top: 12rpx;
 	}
-
 	.promoter-list .list .sortNav {
 		background-color: #fff;
 		height: 76rpx;
@@ -312,67 +305,78 @@
 		color: #333;
 		font-size: 28rpx;
 	}
-
 	.promoter-list .list .sortNav .sortItem {
 		text-align: center;
 		flex: 1;
 	}
-
 	.promoter-list .list .sortNav .sortItem image {
 		width: 24rpx;
 		height: 24rpx;
 		margin-left: 6rpx;
 		vertical-align: -3rpx;
 	}
-
 	.promoter-list .list .item {
+    padding: 15rpx 20rpx;
 		background-color: #fff;
 		border-bottom: 1px solid #eee;
-		height: 152rpx;
-		padding: 0 30rpx 0 20rpx;
 		font-size: 24rpx;
 		color: #666;
-	}
+    .picTxt {
+      width: calc(100% - 150rpx);
 
-	.promoter-list .list .item .picTxt {
-		width: 440rpx;
-	}
-
-	.promoter-list .list .item .picTxt .pictrue {
-		width: 106rpx;
-		height: 106rpx;
-		border-radius: 50%;
-	}
-
-	.promoter-list .list .item .picTxt .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 50%;
-		border: 3rpx solid #fff;
-		box-shadow: 0 0 10rpx #aaa;
-		box-sizing: border-box;
-	}
-
-	.promoter-list .list .item .picTxt .text {
-		width: 304rpx;
-		font-size: 24rpx;
-		color: #666;
-	}
-
-	.promoter-list .list .item .picTxt .text .name {
-		font-size: 28rpx;
-		color: #333;
-		margin-bottom: 13rpx;
-	}
-
-	.promoter-list .list .item .right {
-		width: 240rpx;
-		text-align: right;
-		font-size: 22rpx;
-		color: #333;
-	}
-
-	.promoter-list .list .item .right .num{
-		margin-right: 7rpx;
+      .pictrue {
+        width: 106rpx;
+        height: 106rpx;
+        border-radius: 50%;
+        position: relative!important;
+        image {
+          width: 100%;
+          height: 100%;
+          border-radius: 50%;
+          border: 3rpx solid #fff;
+          box-shadow: 0 0 10rpx #aaa;
+          box-sizing: border-box;
+        }
+        .icon-text{
+          position: absolute;
+          top: 0;
+          right: 0;
+          background-color: #f2e6e8;
+          color: #894f4c;
+          width: 35rpx;
+          height: 35rpx;
+          text-align: center;
+          line-height: 35rpx;
+          border-radius: 50%;
+        }
+      }
+      .text {
+        width: calc(100% - 106rpx);
+        padding-left: 15rpx;
+        font-size: 24rpx;
+        color: #666;
+        .name {
+          height: 50rpx;
+          line-height: 50rpx;
+          font-size: 28rpx;
+          color: #333;
+          text-align: left;
+        }
+        .text-time{
+          height: 40rpx;
+          line-height: 40rpx;
+          text-align: left;
+        }
+      }
+    }
+    .right {
+      width: 150rpx;
+      text-align: right;
+      font-size: 22rpx;
+      color: #333;
+      .num{
+        margin-right: 7rpx;
+      }
+    }
 	}
 </style>
diff --git a/pages/users/user_spread_user/index.vue b/pages/users/user_spread_user/index.vue
index 6bc7690..c9b5f3a 100644
--- a/pages/users/user_spread_user/index.vue
+++ b/pages/users/user_spread_user/index.vue
@@ -37,15 +37,15 @@
           <view>推广名片</view>
         </view>
         <view class='item acea-row row-center-wrapper row-column' @click="goToPage('/pages/users/promoter-list/index')">
-          <text class='iconfont icon-erweima'></text>
+          <text class='iconfont icon-tongji'></text>
           <view>推广人统计</view>
         </view>
         <view class='item acea-row row-center-wrapper row-column' @click="goToPage('/pages/users/user_spread_money/index?type=2')">
-          <text class='iconfont icon-erweima'></text>
+          <text class='iconfont icon-mingxi'></text>
           <view>佣金明细</view>
         </view>
         <view class='item acea-row row-center-wrapper row-column' @click="goToPage('/pages/users/promoter-order/index')">
-          <text class='iconfont icon-erweima'></text>
+          <text class='iconfont icon-dingdanguanli'></text>
           <view>推广人订单</view>
         </view>
         <!--<view class='item acea-row row-center-wrapper row-column' @click="goToPage('/pages/users/promoter_rank/index')">